[evolution] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Spanish translation
Date: Mon, 2 Nov 2009 12:39:17 +0000 (UTC)
commit 7dd6b50577340538a870e4c4131cbe5181b9f807
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Mon Nov 2 13:39:09 2009 +0100

    Updated Spanish translation

 po/es.po |17960 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 9582 insertions(+), 8378 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 4dc14b6..dc70ec5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,14 +10,14 @@
 # Pablo Gonzalo del Campo <pablodc bigfoot com>,2003 (revisiÃ³n).
 # Francisco Javier F. Serrador <serrador cvs gnome org>, 2003, 2004, 2005, 2006.
 # Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007, 2008, 2009.
-#: ../shell/main.c:631
+#: ../shell/main.c:529
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2009-08-09 21:29+0000\n"
-"PO-Revision-Date: 2009-08-10 20:00+0200\n"
+"POT-Creation-Date: 2009-10-30 16:02+0000\n"
+"PO-Revision-Date: 2009-11-02 13:37+0100\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -26,314 +26,6 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "libreta de direcciones de Evolution"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "Contacto nuevo"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "Lista de contactos nueva"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "la carpeta de la libreta de direcciones actual %s tiene %d tarjeta"
-msgstr[1] "la carpeta de la libreta de direcciones actual %s tiene %d tarjetas"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "Abrir"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Lista de contactos: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Contacto: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "minitarjeta de Evolution"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "Tiene alertas."
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "Tiene repeticiones."
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "Es una reuniÃ³n."
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Acontecimiento de calendario: El resumen es %s."
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "Acontecimiento de calendario: Sin resumen."
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "vista de acontecimientos del calendario"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "Obtener el foco"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "Cita nueva"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "Acontecimiento nuevo para todo el dÃa"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "ReuniÃ³n nueva"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "Ir a hoy"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "Ir a una fecha"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-msgid "a table to view and select the current time range"
-msgstr "una tabla para ver y seleccionar el rango de tiempo actual"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Tiene %d acontecimiento."
-msgstr[1] "Tiene %d acontecimientos."
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "No tiene acontecimientos."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Vista de la semana laboral: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Vista diaria: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "vista de calendario para una semana laboral"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "vista de calendario para uno o mÃ¡s dÃas"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%A, %e 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.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%a, %e de %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%a, %e de %b de %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%e de %B de %Y"
-
-#. 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.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%e de %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Calendario de GNOME"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "barra de bÃºsqueda"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "barra de bÃºsqueda del calendario de Evolution"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "BotÃ³n de salto"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "Pulse aquÃ para buscar mÃ¡s acontecimientos."
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Vista mensual: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Vista semanal: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "vista de calendario para un mes"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "vista de calendario para una o mÃ¡s semanas"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emergente"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "emerger un descendiente"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "empezar a editar esta celda"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "cambiar"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "cambiar la celda"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "expande la fila en el ETree que contiene esta celda"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "contraer"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "contrae la fila en el ETree que contiene esta celda"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "Celda de la tabla"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "pulse para aÃ±adir"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "pulsar"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "ordenar"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%e de %B de %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendario: desde %s a %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "elemento de calendario de Evolution"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "BotÃ³n combo"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "Activar predeterminados"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "MenÃº emergente"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -416,7 +108,7 @@ msgstr "No es posible autenticar con el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
 msgid "Failed to delete contact"
 msgstr "FallÃ³ al borrar el contacto"
 
@@ -539,7 +231,7 @@ msgstr ""
 "Los contactos para {0} no estarÃ¡n disponibles hasta que Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:517
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -563,8 +255,7 @@ msgid "_Use as it is"
 msgstr "_Usar tal cual es"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:137
 msgid "{0}"
 msgstr "{0}"
 
@@ -573,688 +264,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:595
 msgid "Default Sync Address:"
 msgstr "DirecciÃ³n de sincr. predeterminada:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1618
+#: ../addressbook/conduit/address-conduit.c:1619
 msgid "Could not load address book"
 msgstr "No se pudo cargar la libreta de direcciones"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1696
+#: ../addressbook/conduit/address-conduit.c:1699
 msgid "Could not read pilot's Address application block"
 msgstr "No es posible leer el bloque de la aplicaciÃ³n de Direcciones del Pilot"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "C_ontactos"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificados"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure contacts and autocompletion here"
-msgstr "Configure los contactos y el autocompletado aquÃ"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "Contactos"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "Libreta de direcciones de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "DirecciÃ³n emergente en la libreta de direcciones de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Control de gestiÃ³n de certificados S/MIME de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuraciÃ³n de preferencias de carpetas de Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "Gestione sus certificados S/MIME aquÃ"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "En este equipo"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "En servidores LDAP"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "Privado"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "Crea un contacto nuevo"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "Crea una lista de contactos nueva"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "Libreta de direcciones nueva"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Libreta de _direcciones"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "Crea una libreta de direcciones nueva"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "FallÃ³ al actualizar la configuraciÃ³n de la libreta o las carpetas."
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que Evolution sÃ³lo conectarÃ¡ con su "
-"servidor LDAP si su servidor LDAP soporta SSL."
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que Evolution sÃ³lo conectarÃ¡ con su "
-"servidor LDAP si su servidor LDAP soporta TLS."
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que su servidor no soporta ni SSL ni TLS. "
-"Esto significa que su conexiÃ³n serÃ¡ insegura, y que usted serÃ¡ vulnerable a "
-"fallos de seguridad."
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "Base"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "Copiar la li_breta localmente para trabajar desconectado"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Este es el puerto del servidor LDAP al que Evolution intentarÃ¡ conectarse. "
-"Se ha proporcionado una lista de puertos estÃ¡ndar. Pregunte a su "
-"administrador del sistema quÃ© puerto deberÃa especificar."
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Este es el mÃ©todo que usarÃ¡ Evolution para autenticarle a usted.  Note que "
-"establecer esto a Â«DirecciÃ³n de correo-eÂ» requiere acceso anÃ³nimo a su "
-"servidor ldap."
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"El Ã¡mbito de bÃºsqueda define hasta quÃ© profundidad desea que la bÃºsqueda se "
-"extienda a lo largo de un Ã¡rbol de directorios. Un Ã¡mbito de bÃºsqueda de "
-"Â«subÂ» incluirÃ¡ todas las entradas por debajo de su base de bÃºsqueda. Un "
-"Ã¡mbito de Â«unoÂ» sÃ³lo incluirÃ¡ las entradas un nivel bajo su base."
-
-#: ../addressbook/gui/component/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "General"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "InformaciÃ³n del servidor"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "AutenticaciÃ³n"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Detalles"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "BÃºsqueda"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "Descargando"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "Propiedades de la libreta de direcciones"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "Migrandoâ?¦"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando Â«%sÂ»:"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "ConfiguraciÃ³n de autocompletado"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquÃa de las carpetas de contactos de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El formato de los contactos de listas de correo ha cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"La forma en que Evolution almacena algunos nÃºmeros de telÃ©fono ha cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Los archivos del registro de cambios y los mapas Palm Sync de Evolution han "
-"cambiado.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus datos Pilot Syncâ?¦"
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renombrar la carpeta Â«%sÂ» a:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "Renombrar carpeta"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "Libreta de direcciones _nueva"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "Guardar como vCardâ?¦"
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Renombrarâ?¦"
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Borrar"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propiedades"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "Selector de origen de contactos"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accediendo al servidor LDAP anÃ³nimamente"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "No es posible autenticar.\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Introduzca la contraseÃ±a para %s (usuario %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Introduzca contraseÃ±a"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Longitud del autocompletado"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "XML EFolderList para la lista de URI de completado"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "XML EFolderList para la lista de URI de completado."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"PosiciÃ³n del panel vertical, entre las vistas de tarjeta y la vista de lista "
-"y el panel de vista previa, en pÃxeles."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Mostrar el nombre autocompletado con la direcciÃ³n"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "Mostrar el panel de vista previa"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"El nÃºmero de caracteres que deben teclearse antes de que Evolution intente "
-"autocompletar."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"URI para la carpeta usada por Ãºltima vez en el diÃ¡logo de selecciÃ³n de "
-"nombres"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"URI para la carpeta usada por Ãºltima vez en el diÃ¡logo de selecciÃ³n de "
-"nombres."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "PosiciÃ³n del panel vertical"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Indica si se debe forzar el mostrado de la direcciÃ³n de corre-e con el "
-"nombre autocompletado del contacto en la entrada."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "Indica si se muestra el panel de vista previa."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "Autocompletado"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "_Siempre mostrar la direcciÃ³n del contacto autocompletado"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-msgid "Date/Time Format"
-msgstr "Formato de la fecha y hora"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-msgid "Table column:"
-msgstr "Columna de tabla:"
-
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "Buscar en las libretas de direcciones"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>AutenticaciÃ³n</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Descarga</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>BÃºsqueda</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"AnÃ³nimamente\n"
-"Usando direcciÃ³n de correo-e\n"
-"Usando nombre distinguido (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "_Examinar esta libreta hasta llegar al final"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-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:18
-msgid "Lo_gin:"
-msgstr "_Inicio de sesiÃ³n:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"Uno\n"
-"Sub"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"Cifrado SSL\n"
-"Cifrado TLS\n"
-"Sin cifrado"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "Filtro de bÃºsqueda"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "_Base de bÃºsqueda:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "_Filtro de bÃºsqueda:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"El filtro de bÃºsqueda es el tipo de los objetos que buscar. Si no se "
-"modifica, la bÃºsqueda predeterminada se realizarÃ¡ sobre la clase de objetos "
-"de tipo Â«personÂ»."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "Bases de bÃºsqueda soportadas"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"La base de BÃºsqueda es el nombre distintivo (ND) de la entrada donde las "
-"bÃºsquedas empezarÃ¡n. Si deja esto en blanco, la bÃºsqueda empezarÃ¡ en la raÃz "
-"del Ã¡rbol de directorios."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Este es el nombre completo del servidor LDAP. Por ejemplo, Â«ldap.miempresa."
-"comÂ»."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Este es el mÃ¡ximo nÃºmero de entradas para descargar.  Si pone este nÃºmero "
-"demasiado alto ralentizarÃ¡ su libreta de direcciones."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Este nombre que identificarÃ¡ este servidor en la lista de carpetas de "
-"Evolution. Es sÃ³lo para poder mostrarlo en pantalla. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "LÃmite de _descarga:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "_Buscar bases de bÃºsqueda posibles"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "MÃ©todo de _inicio de sesiÃ³n:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "_Nombre:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "_Puerto:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "Ã?_mbito de bÃºsqueda:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "_Tiempo de expiraciÃ³n:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "Usar _conexiÃ³n segura:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "tarjetas"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:286
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:720
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "minutos"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>Correo-e</b>"
@@ -1302,16 +325,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorÃasâ?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1264
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1332,10 +355,10 @@ msgid "Nic_kname:"
 msgstr "Apo_do:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:565
 msgid "Notes"
 msgstr "Notas"
 
@@ -1364,9 +387,9 @@ msgid "_Birthday:"
 msgstr "_CumpleaÃ±os:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.c:824
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -1449,10 +472,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_CÃ³digo postal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:61
@@ -1460,13 +481,13 @@ msgid "Name"
 msgstr "Nombre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1284
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
 #: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
@@ -1474,105 +495,118 @@ msgstr "Nombre"
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:538
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:536
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:534
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "Skype"
 msgstr "Skype"
 
 #. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../modules/mail/e-mail-shell-migrate.c:957
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
 msgid "Home"
 msgstr "Domicilio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:445
+#: ../calendar/gui/e-calendar-view.c:1603
 msgid "Other"
 msgstr "Otro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:537
+msgid "Error adding contact"
+msgstr "Error al aÃ±adir el contacto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+msgid "Error modifying contact"
+msgstr "Error al modificar el contacto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+msgid "Error removing contact"
+msgstr "Error al eliminar el contacto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Source Book"
 msgstr "Libro origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
 msgid "Required Fields"
 msgstr "Campos requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
 msgid "Changed"
 msgstr "Modificados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1580,79 +614,56 @@ msgstr ""
 "Los datos del contacto son invÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â«%sÂ» tiene un formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ«%sÂ» tiene un formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ«%sÂ» estÃ¡ vacÃo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
 msgid "Invalid contact."
 msgstr "Contacto invÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
 msgid "Contact Quick-Add"
 msgstr "AÃ±adir contacto rÃ¡pido"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
 msgid "_Full name"
 msgstr "Nombre _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "E_mail"
 msgstr "_Correo-e"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "_Select Address Book"
 msgstr "_Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Â¿Seguro que quiere\n"
-"borrar la lista de contactos (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Â¿Seguro que quiere\n"
-"borrar estas listas de contactos?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
+#| msgid "Seychelles"
+msgid "Shell"
+msgstr "Shell"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"Â¿Seguro que quiere\n"
-"borrar el contacto (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Â¿Seguro que quiere\n"
-"borrar estos contactos?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+msgid "The EShell singleton"
+msgstr "El Â«singletonÂ» EShell"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid ""
@@ -1708,49 +719,58 @@ msgid "<b>Members</b>"
 msgstr "<b>Miembros</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
-msgid "Select..."
-msgstr "Seleccionarâ?¦"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al enviar correo-e a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../mail/mail-config.glade.h:157
+msgid "_Select..."
+msgstr "_Seleccionarâ?¦"
+
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 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:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:954
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1182
+msgid "Error adding list"
+msgstr "Error al aÃ±adir la lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1196
+msgid "Error modifying list"
+msgstr "Error al modificar la lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1210
+msgid "Error removing list"
+msgstr "Error al eliminar la lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1254
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Book"
 msgstr "Libro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1274
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
@@ -1792,65 +812,77 @@ msgstr ""
 "en esta carpeta.  Â¿Quiere aÃ±adirlo de todos modos?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "Co_mbinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../addressbook/gui/widgets/eab-contact-display.c:510
+#: ../addressbook/gui/widgets/eab-contact-display.c:515
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:786
 #: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Correo-e"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Sin contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
-msgid "Query"
-msgstr "Consulta"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:460
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
+msgid "Query"
+msgstr "Consulta"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#| msgid "Search Filter"
+msgid "Search Interrupted"
+msgstr "BÃºsqueda interrumpida"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:645
+#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
+#: ../modules/calendar/e-memo-shell-content.c:597
+#: ../modules/calendar/e-task-shell-content.c:620
+#: ../widgets/table/e-table-click-to-add.c:505
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
@@ -1862,112 +894,107 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "El nombre empieza por"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+#, fuzzy
+#| msgid "Select View: %s"
+msgid "Shell View"
+msgstr "Seleccionar vista: %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
 msgid "Source"
 msgstr "Fuente"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "Tipo"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "Guardar como vCardâ?¦"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "Contacto _nuevoâ?¦"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete these contact lists?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "_Lista de contactos nuevaâ?¦"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete this contact list?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "G_uardar como vCardâ?¦"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact list (%s)?"
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar la lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "_Reenviar contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete these contacts?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "_Reenviar contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "Enviar un _mensaje al contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact (%s)?"
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar el contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "Enviar un _mensaje a la lista"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
+msgid "Save as vCard..."
+msgstr "Guardar como vCardâ?¦"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "Enviar un _mensaje a los contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
+#, fuzzy, c-format
+#| msgid ""
+#| "Opening %d contact will open %d new window as well.\n"
+#| "Do you really want to display this contact?"
+#| msgid_plural ""
+#| "Opening %d contacts will open %d new windows as well.\n"
+#| "Do you really want to display all of these contacts?"
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Abrir %d contacto abrirÃ¡ %d ventana nueva tambiÃ©n.\n"
+"Â¿Quiere realmente mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "Im_primir"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "_Copiar a la libreta de direccionesâ?¦"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "Mo_ver a la libreta de direccionesâ?¦"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "_Pegar"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "Cualquier categorÃa"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+msgid "_Don't Display"
+msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "No coincidente"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+msgid "Display _All Contacts"
+msgstr "Mostrar t_odos los contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "Assistant"
 msgstr "Secretario"
 
@@ -1997,7 +1024,6 @@ msgstr "TelÃ©fono del coche"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2005,7 +1031,7 @@ msgid "Categories"
 msgstr "CategorÃas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Company"
 msgstr "Empresa"
 
@@ -2054,22 +1080,22 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Mobile Phone"
 msgstr "TelÃ©fono mÃ³vil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
 msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
 msgid "Note"
 msgstr "Nota"
 
@@ -2098,14 +1124,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Spouse"
 msgstr "CÃ³nyuge"
 
@@ -2124,6 +1149,7 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:519
 msgid "Title"
 msgstr "Tratamiento"
 
@@ -2138,8 +1164,7 @@ msgstr "Sitio web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
-#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-click-to-add.c:519
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-container.c:995
@@ -2153,8 +1178,7 @@ msgstr "Anchura"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-click-to-add.c:526
 #: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
@@ -2185,11 +1209,11 @@ msgstr "Modelo del texto"
 msgid "Max field name length"
 msgstr "Longitud mÃ¡x. del campo"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "Anchura de columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -2199,7 +1223,7 @@ msgstr ""
 "\n"
 "Buscando contactosâ?¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -2213,7 +1237,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquÃ para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:185
 msgid ""
 "\n"
 "\n"
@@ -2227,7 +1251,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquÃ para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -2237,7 +1261,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2247,7 +1271,7 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
 msgid "Adapter"
 msgstr "Adaptador"
 
@@ -2260,7 +1284,7 @@ msgid "Home Email"
 msgstr "Correo-e de casa"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "Otro correo-e"
 
@@ -2272,230 +1296,287 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en el navegador"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "libreta de direcciones de Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "_Copiar direcciÃ³n del enlace"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "Contacto nuevo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "_Enviar un mensaje nuevo aâ?¦"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "Lista de contactos nueva"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "la carpeta de la libreta de direcciones actual %s tiene %d tarjeta"
+msgstr[1] "la carpeta de la libreta de direcciones actual %s tiene %d tarjetas"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Abrir"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Lista de contactos: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Contacto: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "minitarjeta de Evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
 msgid "Copy _Email Address"
 msgstr "Copiar direcciÃ³n de _correo-e"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../widgets/misc/e-web-view.c:330
+msgid "_Send New Message To..."
+msgstr "_Enviar un mensaje nuevo aâ?¦"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:206
+#: ../widgets/misc/e-web-view.c:303
+msgid "_Copy Link Location"
+msgstr "_Copiar direcciÃ³n del enlace"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#: ../widgets/misc/e-web-view.c:313
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en el navegador"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:309
+#: ../addressbook/gui/widgets/eab-contact-display.c:320
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:753
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Profession"
 msgstr "ProfesiÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "Position"
 msgstr "PosiciÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Video Chat"
 msgstr "Charla por vÃdeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:329
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 #: ../plugins/hula-account-setup/camel-hula-listener.c:372
 #: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Home Page"
 msgstr "PÃ¡gina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Web Log"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:116
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../calendar/gui/e-calendar-view.c:1895
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:958
+#: ../plugins/email-custom-header/email-custom-header.c:333
+msgid "Personal"
+msgstr "Privado"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:771
 msgid "Job Title"
 msgstr "Puesto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "PÃ¡gina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Diario web"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Ã?xito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "La libreta de direcciones no existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "No hay definido un contacto para sÃ mismo"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Contacto no encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "Ya existe el ID del contacto"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/e-cal-component-preview.c:201
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2614
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "No es posible cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "FallÃ³ en la autenticaciÃ³n"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "AutenticaciÃ³n requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS no disponible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "No existe ese origen"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "No disponible en modo desconectado"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "Otro error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "VersiÃ³n del servidor invÃ¡lida"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "MÃ©todo de autenticaciÃ³n no soportado"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2506,7 +1587,7 @@ msgstr ""
 "uso desconectado. Cargue la libreta de direcciones una vez que estÃ© en modo "
 "conectado para descargar su contenido"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:114
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2515,7 +1596,7 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "existe y que tiene permisos para acceder a ella."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:126
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2524,7 +1605,7 @@ msgstr ""
 "LDAP en Evolution debe tener instalado un paquete Evolution con LDAP "
 "activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2532,11 +1613,11 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Esto significa que ha "
 "introducido un URI errÃ³neo o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid "Detailed error message:"
 msgstr "Detalle del mensaje de error:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2549,7 +1630,7 @@ msgstr ""
 "aumente el lÃmite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -2561,71 +1642,22 @@ msgstr ""
 "Haga su bÃºsqueda mÃ¡s especÃfica o aumente el lÃmite de tiempo en las\n"
 "opciones del servidor de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "El backend para esta libreta de direcciones rehusÃ³ a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completÃ³ con Ã©xito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "Error al aÃ±adir la lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "Error al aÃ±adir el contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "Error al modificar la lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "Error al modificar el contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "Error al eliminar la lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "Error al eliminar el contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Abrir %d contacto abrirÃ¡ %d ventana nueva tambiÃ©n.\n"
-"Â¿Quiere realmente mostrar este contacto?"
-msgstr[1] ""
-"Abrir %d contactos abrirÃ¡ %d ventanas nuevas tambiÃ©n.\n"
-"Â¿Quiere realmente mostrar todos estos contactos?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "_No mostrar"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "Mostrar t_odos los contactos"
-
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2634,82 +1666,58 @@ msgstr ""
 "%s ya existe\n"
 "Â¿Quiere sobreescribirlo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:256
+#: ../addressbook/gui/widgets/eab-gui-util.c:259
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:342
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:456
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:598
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:600
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:603
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "vCards mÃºltiples"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard para %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "InformaciÃ³n de contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "InformaciÃ³n de contacto de %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "Consultando la libreta de direccionesâ?¦"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-ldif-importer.c:511
 #: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Importandoâ?¦"
 
@@ -2737,11 +1745,11 @@ msgstr "VSC o Tab de Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:678
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
 
@@ -2826,6 +1834,29 @@ msgstr "En modo normal, no hay necesidad de la opciÃ³n de tamaÃ±o."
 msgid "Unhandled error"
 msgstr "Error no tratado"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accediendo al servidor LDAP anÃ³nimamente"
+
+#: ../addressbook/util/addressbook.c:208
+#: ../plugins/groupwise-features/camel-gw-listener.c:530
+msgid "Failed to authenticate.\n"
+msgstr "No es posible autenticar.\n"
+
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:510
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduzca la contraseÃ±a para %s (usuario %s)"
+
+#: ../addressbook/util/addressbook.c:223
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Introduzca contraseÃ±a"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -3227,11 +2258,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarÃ¡n disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:305
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -3240,7 +2271,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:136
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
@@ -3253,154 +2284,70 @@ msgstr "_Enviar notificaciÃ³n"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de dÃas mÃºltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/calendar/calendar-conduit.c:1517
+#: ../calendar/conduits/calendar/calendar-conduit.c:1518
+#: ../calendar/conduits/memo/memo-conduit.c:811
+#: ../calendar/conduits/memo/memo-conduit.c:812
+#: ../calendar/conduits/todo/todo-conduit.c:1011
+#: ../calendar/conduits/todo/todo-conduit.c:1012
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "No es posible leer informaciÃ³n de la aplicaciÃ³n de calendario del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:905
+#: ../calendar/conduits/memo/memo-conduit.c:908
 msgid "Could not read pilot's Memo application block"
 msgstr "No es posible leer los datos de la aplicaciÃ³n Memo del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:952
+#: ../calendar/conduits/memo/memo-conduit.c:955
 msgid "Could not write pilot's Memo application block"
 msgstr "No es posible escribir los datos de la aplicaciÃ³n Memo del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1095
+#: ../calendar/conduits/todo/todo-conduit.c:1098
 msgid "Could not read pilot's ToDo application block"
 msgstr "No es posible leer los datos de la aplicaciÃ³n ToDo del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1140
+#: ../calendar/conduits/todo/todo-conduit.c:1143
 msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicaciÃ³n ToDo del Pilot"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2549
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, calendario y lista de tareas aquÃ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario y tareas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuraciÃ³n del calendario de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de mensajes de planificaciÃ³n del calendario de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de calendario/tareas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Componente de Calendario de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Componente de Notas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Componente de Tareas de Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "_Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tareas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Calendarios"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tareas"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servicio de notificaciÃ³n por alerta del Calendario de Evolution"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/calendar-weather/calendar-weather.c:515
 #: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:296
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -3415,10 +2362,10 @@ msgstr "Descartar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/e-itip-control.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1022
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -3431,14 +2378,11 @@ msgid "_Dismiss"
 msgstr "_Descartar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../shell/e-shell-window-actions.c:1627
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -3451,32 +2395,44 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../modules/addressbook/ldap-config.glade.h:43
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "minutos"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "No hay descripciÃ³n disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "No hay informaciÃ³n del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1666
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
 #: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3488,7 +2444,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrarÃ¡ un diÃ¡logo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3505,22 +2461,10 @@ msgstr ""
 "\n"
 "Â¿EstÃ¡ seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "No es posible inicializar Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr ""
-"No es posible crear la fÃ¡brica del servicio de la alerta de notificaciÃ³n, "
-"quizÃ¡ ya se estÃ© ejecutandoâ?¦"
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "hora invÃ¡lida"
@@ -3559,7 +2503,7 @@ msgid "Alarm programs"
 msgstr "Programas de alerta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberÃ¡ mostrarse el error en la barra de estado."
@@ -3684,42 +2628,50 @@ msgstr ""
 "de 0 a 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
 "minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "Hora de la Ãºltima alerta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel mÃ¡s allÃ¡ del cuÃ¡l el mensaje se debe registrar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URL del servidor para publicaciÃ³n de disponibilidad."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "LÃnea de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la lÃnea de Marcus Bains de la vista de dÃa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la lÃnea de Marcus Bains de la barra de tiempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -3727,39 +2679,55 @@ msgstr ""
 "MÃ¡ximo nÃºmero de zonas horarias usadas recientemente para recordar en la "
 "lista Â«day_second_zonesÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "MÃ¡ximo nÃºmero de zonas horarias usadas recientemente para recordar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Memo layout style"
+msgstr "Estilo de _respuesta:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#, fuzzy
+#| msgid "Month view vertical pane position"
+msgid "Memo preview pane position (vertical)"
+msgstr "PosiciÃ³n del panel vertical en la vista mensual"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃ³n del panel horizontal de la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "PosiciÃ³n del panel vertical en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "NÃºmero de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃºmero de unidades para determinar cuÃ¡ndo ocultar tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -3767,7 +2735,7 @@ msgstr ""
 "PosiciÃ³n del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no estÃ¡ en la vista mensual, en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3775,7 +2743,19 @@ msgstr ""
 "PosiciÃ³n del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -3783,15 +2763,7 @@ msgstr ""
 "PosiciÃ³n del panel vertical, entre las listas del calendario el calendario "
 "del navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"PosiciÃ³n del la hoja vertical, entre la lista de tareas y el la hoja de "
-"vista previa de tareas, en pÃxeles."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3799,7 +2771,7 @@ msgstr ""
 "PosiciÃ³n de la hoja vertical, entre la vista y el navegador del calendario y "
 "la lista de tareas en la vista mensual, en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -3808,95 +2780,95 @@ msgstr ""
 "calendario y la lista de tareas cuando no estÃ¡ en la vista mensual, en "
 "pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "Lista de tareas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sean ejecutados por las alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "Directorio donde guardar los sonidos de las alertas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "Desplazar la vista mensual una semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo Â«ConfirmarÂ» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar el campo Â«RolÂ» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar las horas de finalizaciÃ³n de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Mostrar el campo de categorÃas en el editor de acontecimientos/reuniones/"
 "tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar el visor de la alerta en una bandeja de notificaciÃ³n"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
-msgstr "Mostrar el panel de vista previa"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the memo preview pane"
+msgstr "Mostrar el panel de vista previa de las notas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "Mostrar el panel de vista previa."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the task preview pane"
+msgstr "Mostrar el panel de vista previa de las tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Mostrar los nÃºmeros de las semanas en las Vistas diaria y Vista de la semana "
 "laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los nÃºmeros de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -3904,15 +2876,25 @@ msgstr ""
 "Muestra la segunda zona horaria en la Vista diaria, si estÃ¡ establecido. El "
 "valor es similar al usado en la clave Â«timezoneÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr "Estilo de distribuciÃ³n de las tareas"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (horizontal)"
+msgstr "Vista previa del panel de posiciÃ³n de las tareas (horizontal)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (vertical)"
+msgstr "Vista previa del panel de posiciÃ³n de las tareas (vertical)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
-msgstr "PosiciÃ³n del panel vertical de tareas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -3922,7 +2904,7 @@ msgstr ""
 "reemplaza por la parte del usuario de la direcciÃ³n de correo y %d se "
 "reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -3931,11 +2913,25 @@ msgstr ""
 "calendario, como una localizaciÃ³n sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"AmÃ©rica/Nueva York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "La segunda zona horaria para una Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -3943,19 +2939,19 @@ msgstr ""
 "Esto puede tener tres valores posibles. Â«0Â» para errores. Â«1Â» para avisos. Â«2Â» "
 "para mensajes de depuraciÃ³n."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la Ãºltima alerta sonÃ³, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -3963,68 +2959,72 @@ msgstr ""
 "Transparencia de los acontecimientos en las vistas del calendario, un valor "
 "entre 0 (transparente) y 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI del calendario resaltado (Â«primarioÂ»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI de la lista de notas resaltada (Â«primariaÂ»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI de la lista de tareas resaltada (Â«primariaÂ»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuÃ¡ndo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "Usar la hora del sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "PosiciÃ³n del panel vertical"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indica si se debe usar o no la bandeja de notificaciÃ³n para mostrar alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmaciÃ³n al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmaciÃ³n al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4032,299 +3032,110 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sÃ¡bado y "
 "al domingo en el mismo espacio que un dÃa laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalizaciÃ³n de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la lÃnea Marcus Bains (lÃnea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«ConfirmarÂ» en el editor de acontecimiento/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«CategorÃasÂ» en el editor de acontecimientos/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«RolÂ» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«EstadoÂ» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«Zona horariaÂ» en el editor de "
 "acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo Â«TipoÂ» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indica si debe mostrar los nÃºmeros de la semana en la Vista diaria y en la "
 "Vista de la semana laboral."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indica si debe mostrar los nÃºmeros de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "DÃas laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "Hora de finalizaciÃ³n de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "Minuto de finalizaciÃ³n de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
-#: ../calendar/gui/cal-editor-utils.c:100
-#| msgid "Invalid contact."
+#: ../calendar/gui/cal-editor-utils.c:102
 msgid "Invalid object"
 msgstr "Objeto no vÃ¡lido"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "La descripciÃ³n contiene"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "CategorÃa es"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "El lugar contiene"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "Tareas de los prÃ³ximos 7 dÃas"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "Tareas activas"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "Tareas fuera de plazo"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "Tareas completadas"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "Tareas con adjuntos"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "Citas activas"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "Citas de los prÃ³ximos 7 dÃas"
-
-#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
-
-#: ../calendar/gui/calendar-commands.c:331
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Esta operaciÃ³n borrarÃ¡ permanentemente todos los acontecimientos marcados "
-"mÃ¡s antiguos que el tiempo seleccionado. Si continÃºa, no podrÃ¡ recuperar "
-"esos acontecimientos."
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "Purgar acontecimientos anteriores a"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:288
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:722
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "dÃas"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "En la web"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "MeteorologÃa"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "CumpleaÃ±os y aniversarios"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "Calendario _nuevo"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "_Copiarâ?¦"
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "_Hacer esto disponible para su uso desconectado"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "_No hacer esto disponible sin conexiÃ³n"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "FallÃ³ al actualizar calendarios."
-
-#: ../calendar/gui/calendar-component.c:1089
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"No es posible abrir el calendario Â«%sÂ» para crear acontecimientos y reuniones"
-
-#: ../calendar/gui/calendar-component.c:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "Selector de origen del calendario"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "Cita nueva"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Cita"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "Crea una cita nueva"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "ReuniÃ³n nueva"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "_ReuniÃ³n"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "Crea una solicitud de reuniÃ³n nueva"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "Cita nueva para todo el dÃa"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Cita para todo el _dÃa"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "Crea una cita nueva para todo el dÃa"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "Calendario nuevo"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Cale_ndario"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "Crea un calendario nuevo"
-
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Vista diaria"
@@ -4366,16 +3177,16 @@ msgstr "CategorÃa"
 msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:336
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
@@ -4398,8 +3209,8 @@ msgstr "Existen"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:722
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/publish-calendar/publish-calendar.c:724
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Location"
 msgstr "Lugar"
 
@@ -4408,20 +3219,20 @@ msgstr "Lugar"
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
+#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Recurrence"
 msgstr "RepeticiÃ³n"
 
@@ -4430,7 +3241,7 @@ msgstr "RepeticiÃ³n"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Summary"
 msgstr "Resumen"
 
@@ -4459,42 +3270,26 @@ msgstr "es"
 msgid "is not"
 msgstr "no es"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "Error al abrir el calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "MÃ©todo no soportado al abrir el calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "Permiso denegado para abrir el calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:627
 msgid "Edit Alarm"
 msgstr "Editar alerta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Mostrar una alerta emergente"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo-e"
@@ -4616,35 +3411,41 @@ msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-day-view-time-item.c:798
+#: ../calendar/gui/e-itip-control.c:1159 ../filter/e-filter-rule.c:739
+#: ../mail/em-account-editor.c:916 ../mail/em-account-editor.c:1725
+#: ../modules/mail/e-mail-junk-hook.c:88
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:390
+#: ../plugins/itip-formatter/itip-formatter.c:2226
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1559
+#: ../widgets/misc/e-dateedit.c:1776
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "Ninguno"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "Seleccionarâ?¦"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Time and date:"
 msgstr "Fecha y hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
 msgid "Date only:"
 msgstr "SÃ³lo fecha:"
 
@@ -4723,11 +3524,23 @@ msgid "Display alarms in _notification area only"
 msgstr "Mostrar alarmas sÃ³lo en el Ã¡rea de _notificaciÃ³n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "viernes"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:81
+#: ../modules/addressbook/addressbook-config.c:1046
+#: ../modules/addressbook/ldap-config.glade.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "General"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
@@ -4739,8 +3552,8 @@ msgstr ""
 "dÃas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "lunes"
 
@@ -4763,7 +3576,7 @@ msgstr ""
 "domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:101
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -4773,8 +3586,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "sÃ¡bado"
 
@@ -4811,8 +3624,8 @@ msgstr ""
 "semana laboral"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "domingo"
 
@@ -4830,8 +3643,8 @@ msgid "Template:"
 msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "jueves"
 
@@ -4845,8 +3658,8 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "martes"
 
@@ -4855,8 +3668,8 @@ msgid "Use s_ystem time zone"
 msgstr "Usar la zona horaria del s_istema"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "miÃ©rcoles"
 
@@ -4945,6 +3758,20 @@ msgstr "antes de cada cita"
 msgid "Type:"
 msgstr "Tipo:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:542
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:149
+#: ../modules/addressbook/ldap-config.glade.h:36
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Nombre:"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
@@ -5049,239 +3876,236 @@ msgstr "%s  No ha realizado cambios, Â¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validaciÃ³n: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2386
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2390
 msgid " (Completed "
 msgstr " (Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2392
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2397
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2399
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
+#: ../calendar/gui/dialogs/comp-editor.c:238
 msgid "Could not save attachments"
 msgstr "No se pudieron guardar los adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:501
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:596
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:603
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ³n: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:605
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:618
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:634
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:788
 msgid "Keep original item?"
 msgstr "Â¿Mantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:992
 msgid "Click here to close the current window"
 msgstr "Pulse aquÃ para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:999
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
+#: ../calendar/gui/dialogs/comp-editor.c:1006
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to view help available"
 msgstr "Pulse aquÃ para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
+#: ../calendar/gui/dialogs/comp-editor.c:1020
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to save the current window"
 msgstr "Pulse aquÃ para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1048
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1055
 msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1634
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../shell/e-shell-window-actions.c:1641
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1676
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../composer/e-composer-actions.c:277
 msgid "_Attachment..."
 msgstr "_Adjuntoâ?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Click here to attach a file"
 msgstr "Pulse aquÃ para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Categories"
 msgstr "_CategorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la Â«Zona horariaÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Pu_blic"
 msgstr "PÃº_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Classify as public"
 msgstr "Clasificar como pÃºblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "R_ole Field"
 msgstr "Campo Â«_RolÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo Â«RolÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo Â«ConfirmarÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo Â«EstadoÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1186
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo Â«Tipo de participanteÂ»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../composer/e-composer-private.c:68
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:473
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Guardar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2013
+#: ../calendar/gui/dialogs/comp-editor.c:2062
+#: ../calendar/gui/dialogs/comp-editor.c:2944
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualizaciÃ³n por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2912 ../mail/em-utils.c:361
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versiÃ³n actual."
 
@@ -5354,7 +4178,6 @@ msgid "Contacts..."
 msgstr "Contactosâ?¦"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
@@ -5414,96 +4237,83 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃ³n de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:292
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:752
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "El acontecimiento no se puede editar porque es de sÃ³lo lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:756
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "El acontecimiento no se puede editar completamente porque no es el "
 "organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:768
+#: ../calendar/gui/dialogs/event-page.c:2691
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.c:831
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:878
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:880
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1070
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1073
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1244
+#: ../calendar/gui/dialogs/memo-page.c:657
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "La fecha de inicio estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1254
 msgid "End date is wrong"
 msgstr "La fecha de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1277
 msgid "Start time is wrong"
 msgstr "La hora de inicio estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1284
 msgid "End time is wrong"
 msgstr "La hora de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1446
+#: ../calendar/gui/dialogs/memo-page.c:698
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/memo-page.c:704
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "_AÃ±adir "
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2564
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario Â«%sÂ»."
@@ -5514,35 +4324,35 @@ msgstr "No es posible abrir el calendario Â«%sÂ»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2608
+#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/task-page.c:1720
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ actuando en nombre de <b>%s</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2910
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dÃa antes de la cita"
 msgstr[1] "%d dÃas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2973
+#: ../calendar/gui/dialogs/event-page.c:2916
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2979
+#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2992
+#: ../calendar/gui/dialogs/event-page.c:2935
 msgid "Customize"
 msgstr "Personalizar"
 
@@ -5561,7 +4371,7 @@ msgid "Attendee_s..."
 msgstr "_Participantesâ?¦"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Participantes"
 
@@ -5591,9 +4401,7 @@ msgid "_Description:"
 msgstr "_DescripciÃ³n:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../plugins/calendar-weather/calendar-weather.c:363
 msgid "_Location:"
 msgstr "_Lugar:"
 
@@ -5604,8 +4412,7 @@ msgstr "_Hora:"
 #: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../mail/mail-config.glade.h:166 ../mail/mail-dialogs.glade.h:21
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
 "a\n"
@@ -5622,27 +4429,27 @@ msgstr ""
 "durante\n"
 "hasta"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2535
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "La nota no se puede editar porque es de sÃ³lo lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "La nota no se puede editar completamente porque no es el organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:874
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2185
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2268
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
 
@@ -5698,15 +4505,15 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repeticiÃ³n es invÃ¡lida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "La fecha de finalizaciÃ³n de la repeticiÃ³n es anterior al inicio del "
@@ -5714,7 +4521,7 @@ msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "en"
 
@@ -5722,7 +4529,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "primer"
 
@@ -5731,7 +4538,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "segundo"
 
@@ -5739,7 +4546,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "tercer"
 
@@ -5747,7 +4554,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "cuarto"
 
@@ -5755,7 +4562,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fifth"
 msgstr "quinto"
 
@@ -5763,13 +4570,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "last"
 msgstr "Ãºltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -5777,7 +4584,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -5785,7 +4592,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -5793,45 +4600,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 msgstr "dÃa"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "AÃ±adir excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selecciÃ³n que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "Modificar excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selecciÃ³n que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -5892,12 +4699,12 @@ msgstr "Enviar mis alarmas con este evento"
 msgid "Notify new attendees _only"
 msgstr "Notificar sÃ³l_o a los participantes"
 
-#: ../calendar/gui/dialogs/task-details-page.c:376
-#: ../calendar/gui/dialogs/task-details-page.c:396
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "La fecha de terminaciÃ³n es errÃ³nea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
@@ -5963,15 +4770,15 @@ msgid "Click to change or view the status details of the task"
 msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "Opciones de _envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:335
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:338
 msgid "Task Details"
 msgstr "Detalles"
 
@@ -5988,11 +4795,11 @@ msgstr "La tarea no se puede editar completamente porque no es el organizador"
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:809
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errÃ³nea"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1677
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en Â«%sÂ»."
@@ -6089,131 +4896,107 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "I_mportar"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "Seleccionar un calendario"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "Seleccionar una lista de tareas"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "I_mportar al calendario"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "I_mportar a las tareas"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
-#, c-format
-msgid "Click to open %s"
-msgstr "Pulse para abrir %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:110 ../filter/e-filter-rule.c:653
 msgid "Untitled"
 msgstr "Sin tÃtulo"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "Fecha de inicio:"
+#: ../calendar/gui/e-cal-component-preview.c:116
+#| msgid "Categories"
+msgid "Categories:"
+msgstr "CategorÃas:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "DescripciÃ³n:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "PÃ¡gina web:"
-
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
+#: ../calendar/gui/e-cal-component-preview.c:151
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:158
+#: ../calendar/gui/e-cal-component-preview.c:169
+msgid "Start Date:"
+msgstr "Fecha de inicio:"
+
+#: ../calendar/gui/e-cal-component-preview.c:180
 msgid "Due Date:"
 msgstr "Fecha de vencimiento:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:191
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:808
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2608
 msgid "In Progress"
 msgstr "En proceso"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2611 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Completed"
 msgstr "Terminado"
 
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/e-cal-component-preview.c:205
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:729
+#: ../calendar/gui/e-calendar-table.c:218
+#: ../calendar/gui/e-calendar-table.c:229
+#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2605
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:216
 msgid "Priority:"
 msgstr "Prioridad:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:218
+#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1081
 msgid "High"
 msgstr "Alta"
 
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:220
+#: ../calendar/gui/e-cal-model.c:1274 ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1079
 msgid "Low"
 msgstr "Baja"
 
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-itip-control.c:1219
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:64
+msgid "Description:"
+msgstr "DescripciÃ³n:"
+
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Web Page:"
+msgstr "PÃ¡gina web:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Created"
 msgstr "Creado"
 
@@ -6233,17 +5016,17 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-calendar-table.c:776
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-calendar-table.c:777
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Busy"
 msgstr "Ocupada"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6253,209 +5036,165 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1280
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "SÃ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1280
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
+#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:522
+#: ../shell/e-shell.c:720
+#| msgid "Exchange Settings"
+msgid "Shell Settings"
+msgstr "ConfiguraciÃ³n de Shell"
+
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:523
+#: ../shell/e-shell.c:721
+#| msgid "Autocompletion Settings"
+msgid "Application-wide settings"
+msgstr ""
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
+#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
+#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:1226 ../plugins/itip-formatter/itip-formatter.c:459
+#: ../plugins/itip-formatter/itip-formatter.c:2251
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1276
 msgid "Recurring"
 msgstr "RepeticiÃ³n"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1278
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-calendar-table.c:335
+#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
 msgid "* No Summary *"
 msgstr "* Sin resumen *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
 msgid "Start: "
 msgstr "Empieza: "
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
 msgid "Due: "
 msgstr "Vence: "
 
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:748
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:749
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:750
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:751
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:752
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:753
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:754
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:755
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:756
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
+#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:2009
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:424
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view.c:426
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../calendar/gui/e-calendar-table.c:1108
+#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
+#: ../calendar/gui/e-calendar-table.c:1403
+#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "Guardar comoâ?¦"
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "_Tarea nueva"
-
-#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "Abrir pÃ¡gina _web"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "Guardar _comoâ?¦"
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "_Imprimirâ?¦"
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "C_ortar"
-
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "_Asignar tarea"
-
-#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Reenviar como iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "_Marcar como terminado"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Marcar tareas seleccionadas como terminadas"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "_Marcar como incompleto"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Marcar tareas seleccionadas como incompletas"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "_Borrar las tareas seleccionadas"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Pulse para aÃ±adir una tarea"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Terminado"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Pulse para aÃ±adir una tarea"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Terminado"
@@ -6470,7 +5209,7 @@ msgstr "Fecha de vencimiento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -6481,150 +5220,79 @@ msgstr "Fecha de inicio"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
+#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Estado"
 
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "Moviendo elementos"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "Copiando elementos"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "_Cita nuevaâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "Acont_ecimiento nuevo para todo el dÃa"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "_ReuniÃ³n nueva"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "Vista act_ual"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "Seleccionar _hoy"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "_Seleccionar fechaâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "_Imprimirâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "Cop_iar al calendarioâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "Mo_ver al calendarioâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "_Delegar reuniÃ³nâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "_Concertar una reuniÃ³nâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "Reenviar como i_Calendarâ?¦"
-
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "_Responder"
-
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "Responder a _todos"
-
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "Hacer esta repeticiÃ³n _movible"
-
-#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "Borrar esta _repeticiÃ³n"
-
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "Borrar tod_as las repeticiones"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1598
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2239
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2245
 msgid "Declined"
 msgstr "Rehusado"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2248
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1602
 msgid "Needs action"
 msgstr "Necesita una acciÃ³n"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2567
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1794
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %e/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %e/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6637,12 +5305,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:747
+#: ../calendar/gui/e-day-view-time-item.c:760
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:781
 msgid "Show the second time zone"
 msgstr "Muestra la segunda zona horaria"
 
@@ -6652,48 +5320,73 @@ msgstr "Muestra la segunda zona horaria"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1701
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
+#. 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/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:881
+msgid "%a %d %b"
+msgstr "%a, %e 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-top-item.c:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:917
+msgid "%d %b"
+msgstr "%e de %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/print.c:824
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/print.c:826
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2309
+#: ../calendar/gui/e-day-view.c:2625
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:767
 msgid "Yes. (Complex Recurrence)"
 msgstr "SÃ. (RepeticiÃ³n compuesta)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:784
 #, 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:788
+#: ../calendar/gui/e-itip-control.c:797
 #, 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:795
+#: ../calendar/gui/e-itip-control.c:804
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6701,35 +5394,35 @@ msgstr[0] "Cada semana en "
 msgstr[1] "Cada %d semanas el "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:815
 msgid " and "
 msgstr " y "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:824
 #, c-format
 msgid "The %s day of "
 msgstr "El %s dÃa de "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:840
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:851
 #, 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:854
+#: ../calendar/gui/e-itip-control.c:863
 #, 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:867
+#: ../calendar/gui/e-itip-control.c:876
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6737,36 +5430,36 @@ msgstr[0] "un total de %d vez"
 msgstr[1] "un total de %d veces"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:887
 msgid ", ending on "
 msgstr ", terminando en "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Starts"
 msgstr "Empieza"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:923
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:963
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
 msgid "iCalendar Information"
 msgstr "InformaciÃ³n de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1021
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -6777,7 +5470,7 @@ msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1144
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6785,12 +5478,12 @@ msgstr ""
 "<br> Revise la siguiente informaciÃ³n y seleccione una acciÃ³n del menÃº de "
 "abajo."
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../calendar/gui/e-itip-control.c:1196
+#: ../plugins/itip-formatter/itip-formatter.c:2242
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1274
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -6798,273 +5491,275 @@ msgstr ""
 "La reuniÃ³n ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
 #, 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:1354
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Information"
 msgstr "InformaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1369
 #, 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:1362
+#: ../calendar/gui/e-itip-control.c:1371
 #, 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:1363
+#: ../calendar/gui/e-itip-control.c:1372
 msgid "Meeting Proposal"
 msgstr "Propuesta de reuniÃ³n"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reuniÃ³n existente."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update"
 msgstr "ActualizaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
 #, 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:1375
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualizaciÃ³n de la reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1391
 #, 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:1383
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Reply"
 msgstr "Respuesta de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ha cancelado una reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Cancelation"
 msgstr "CancelaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1527
 #, 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:1402
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reuniÃ³n errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1438
 #, 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:1430
+#: ../calendar/gui/e-itip-control.c:1439
 msgid "Task Information"
 msgstr "InformaciÃ³n de la tarea"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1446
 #, 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:1439
+#: ../calendar/gui/e-itip-control.c:1448
 #, 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:1440
+#: ../calendar/gui/e-itip-control.c:1449
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> desea aÃ±adirse a una tarea existente."
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update"
 msgstr "ActualizaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
 #, 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:1452
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Update Request"
 msgstr "Solicitud de actualizaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1468
 #, 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:1460
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Cancelation"
 msgstr "CancelaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
 #, 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:1504
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Information"
 msgstr "InformaciÃ³n de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1517
 #, 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:1509
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1522
 #, 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:1514
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1528
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1604
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1663
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sÃ³lo contiene solicitudes no soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1696
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario vÃ¡lido"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1734
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Update complete\n"
 msgstr "ActualizaciÃ³n terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2010
 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:2018
+#: ../calendar/gui/e-itip-control.c:2027
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta respuesta no es de un participante. Â¿Desea aÃ±adirlo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2045
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado del participante no pudo actualizarse debido a un estado invÃ¡lido\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2069
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2076
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2164
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo enviarse.\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2290
 msgid "Choose an action:"
 msgstr "Elija una acciÃ³n:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-meeting-list-view.c:586
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2359
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2383
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2384
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2385
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rehusar"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2410
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaciÃ³n de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2434
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2458
 msgid "Send Latest Information"
 msgstr "Enviar la Ãºltima informaciÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2482
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -7096,89 +5791,89 @@ msgstr "Organizador:"
 msgid "Server Message:"
 msgstr "Mensaje del servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:975
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:976
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:990
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:992
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:993
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Necesita acciÃ³n"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:544
+#: ../calendar/gui/e-meeting-list-view.c:541
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 msgid "In Process"
 msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2272
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7187,7 +5882,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2303
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7197,67 +5892,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "No Information"
 msgstr "Sin informaciÃ³n"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "A_ttendees..."
 msgstr "_Participantesâ?¦"
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _only working hours"
 msgstr "Mostrar _sÃ³lo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:609
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliaciÃ³n"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:639
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:657
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:672
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:689
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:762
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:799
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -7285,100 +5980,189 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Miembro"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "_Borrar las notas seleccionadas"
+#: ../calendar/gui/e-memo-table.c:647
+#: ../modules/calendar/e-cal-shell-content.c:453
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view.c:279
+msgid "Memos"
+msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pulse aquÃ para aÃ±adir una nota"
 
-#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Seleccione la zona horaria"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1682
+msgid "%d %B"
+msgstr "%e de %B"
+
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "Tiene alertas."
+
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "Tiene repeticiones."
+
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "Es una reuniÃ³n."
+
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Error en %s:\n"
-" %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "Acontecimiento de calendario: El resumen es %s."
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "Cargando notas"
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "Acontecimiento de calendario: Sin resumen."
+
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "vista de acontecimientos del calendario"
 
-#: ../calendar/gui/e-memos.c:897
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "Obtener el foco"
+
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "Cita nueva"
+
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "Acontecimiento nuevo para todo el dÃa"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "ReuniÃ³n nueva"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "Ir a hoy"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "Go to Date"
+msgstr "Ir a una fecha"
+
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
+msgid "a table to view and select the current time range"
+msgstr "una tabla para ver y seleccionar el rango de tiempo actual"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Opening memos at %s"
-msgstr "Abriendo notas en %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Tiene %d acontecimiento."
+msgstr[1] "Tiene %d acontecimientos."
 
-#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "Borrando los objetos seleccionadosâ?¦"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "No tiene acontecimientos."
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "Cargando tareas"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Vista de la semana laboral: %s. %s"
 
-#: ../calendar/gui/e-tasks.c:1052
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "Abriendo tareas en %s"
+msgid "Day View: %s. %s"
+msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "Terminando tareasâ?¦"
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "vista de calendario para una semana laboral"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "Compactando"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "vista de calendario para uno o mÃ¡s dÃas"
 
-#: ../calendar/gui/e-timezone-entry.c:124
-msgid "Select Timezone"
-msgstr "Seleccione la zona horaria"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:877
+msgid "%A %d %b %Y"
+msgstr "%A, %e de %b de %Y"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
-msgid "%d %B"
-msgstr "%e de %B"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:884
+#: ../modules/calendar/e-cal-shell-view-private.c:890
+#: ../modules/calendar/e-cal-shell-view-private.c:893
+msgid "%a %d %b %Y"
+msgstr "%a, %e de %b de %Y"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "Vista _personalizada"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../modules/calendar/e-cal-shell-view-private.c:921
+#: ../modules/calendar/e-cal-shell-view-private.c:928
+#: ../modules/calendar/e-cal-shell-view-private.c:931
+msgid "%d %b %Y"
+msgstr "%e de %B de %Y"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "_Guardar vista personalizada"
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Calendario de GNOME"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "_Definir vistasâ?¦"
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "BotÃ³n de salto"
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "Pulse aquÃ para buscar mÃ¡s acontecimientos."
+
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "Cargando citas de %s"
+msgid "Month View: %s. %s"
+msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Cargando tareas de %s"
+msgid "Week View: %s. %s"
+msgstr "Vista semanal: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "vista de calendario para un mes"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "vista de calendario para una o mÃ¡s semanas"
+
+#: ../calendar/gui/gnome-cal.c:1945
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Cargando notas en %s"
+msgid "Loading appointments at %s"
+msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#: ../calendar/gui/gnome-cal.c:2031
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:4012
-msgid "Purging"
-msgstr "Compactando"
-
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid ""
 "January\n"
@@ -7415,32 +6199,32 @@ msgstr "Seleccionar fecha"
 msgid "_Select Today"
 msgstr "_Seleccionar hoy"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "InformaciÃ³n del acontecimiento"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 msgid "Task information"
 msgstr "InformaciÃ³n de la tarea"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "InformaciÃ³n de la nota"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "InformaciÃ³n de disponibilidad"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "InformaciÃ³n de calendario"
 
@@ -7448,7 +6232,7 @@ msgstr "InformaciÃ³n de calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -7457,7 +6241,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -7469,7 +6253,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rehusado"
@@ -7478,7 +6262,7 @@ msgstr "Rehusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -7486,7 +6270,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -7494,7 +6278,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7502,7 +6286,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -7510,434 +6294,230 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:801
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ³n de disponibilidad (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:809
 msgid "iCalendar information"
 msgstr "InformaciÃ³n de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "Debe ser un participante en el acontecimiento."
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "Lista de notas _nueva"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d nota"
-msgstr[1] "%d notas"
-
-#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d seleccionado"
-msgstr[1] ", %d seleccionados"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "Fallo al actualizar las notas."
-
-#: ../calendar/gui/memos-component.c:739
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
+#: ../calendar/gui/itip-utils.c:829
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"No es posible abrir la lista de notas Â«%sÂ» para crear acontecimientos y "
-"reuniones"
-
-#: ../calendar/gui/memos-component.c:752
-msgid "There is no calendar available for creating memos"
-msgstr "No hay un calendario disponible para crear notas"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "Selector de origen de notas"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "Nota nueva"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "_Nota"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "Nota nueva compartida"
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, error: "
+msgstr "No se pudo reservar un recurso, error: "
 
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "Nota _compartida"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "Crea una nota compartida nueva"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "Lista de notas nueva"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "_Lista de notas"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "Crea una lista de notas nueva"
-
-#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "Imprimir notas"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquÃa de las carpetas de tareas de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquÃa de las carpetas de calendario de Evolution ha cambiado "
-"desde Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"No es posible migrar la configuraciÃ³n antigua desde evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "No es posible migrar el calendario Â«%sÂ»"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "No es posible migrar las tareas en Â«%sÂ»"
+#: ../calendar/gui/itip-utils.c:985
+msgid "You must be an attendee of the event."
+msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Th"
 msgstr "Ju"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Fr"
 msgstr "Vi"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2531
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2533
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2558
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2581
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2621
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2635
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2650
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2661
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2674
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2685
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "Lista de tareas _nueva"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d tarea"
-msgstr[1] "%d tareas"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr "Fallo al actualizar las tareas."
-
-#: ../calendar/gui/tasks-component.c:735
-#, 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 acontecimientos y "
-"reuniones"
-
-#: ../calendar/gui/tasks-component.c:748
-msgid "There is no calendar available for creating tasks"
-msgstr "No hay un calendario disponible para crear tareas"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "Selector de origen de tareas"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "Tarea nueva"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "_Tarea"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "Crea una tarea nueva"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "Nueva tarea asignada"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Tarea _asignada"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "Crea una tarea nueva asignada"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "Lista de tareas nueva"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Lista de ta_reas"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "Crea una lista de tareas nueva"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"Esta operaciÃ³n borrarÃ¡ permanentemente todos las tareas marcados como "
-"terminadas. Si continÃºa, no podrÃ¡ recuperar esas tareas.\n"
-"\n"
-"Â¿Borrar realmente esas tareas?"
-
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "No me preguntes otra vez."
-
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "Imprimir tareas"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7964,8 +6544,8 @@ msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1747
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -7989,11 +6569,11 @@ msgstr "Archivos vCalendar (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Acontecimientos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente del calendario de Evolution"
 
@@ -9546,182 +8126,168 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-autosave.c:444
-msgid "Unable to retrieve message from editor"
-msgstr "No se pudo obtener el mensaje del editor"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:78
 msgid "Untitled Message"
 msgstr "Mensaje sin tÃtulo"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:200
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-memo-shell-view-actions.c:495
+#: ../modules/calendar/e-task-shell-view-actions.c:622
+msgid "Save as..."
+msgstr "Guardar comoâ?¦"
+
+#: ../composer/e-composer-actions.c:279
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:284
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:286
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:291
 msgid "_Print..."
 msgstr "_Imprimirâ?¦"
 
-#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:298
 msgid "Print Pre_view"
 msgstr "Vist_a previa de impresiÃ³n"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:307
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:312
 msgid "Save _As..."
 msgstr "Guardar _comoâ?¦"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:314
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:319
 msgid "Save as _Draft"
 msgstr "Guardar como _borrador"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:321
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:326 ../composer/e-composer-private.c:194
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:328
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "Insertar opciones de envÃo"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "_Mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Abrir la ventana del mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:342
 msgid "Character _Encoding"
 msgstr "_CodificaciÃ³n de caracteres"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:349
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:359
 msgid "PGP _Encrypt"
 msgstr "Cif_rar con PGP"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:361
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar este mensaje con PGP"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:367
 msgid "PGP _Sign"
 msgstr "_Firmar con PGP"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:369
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con su clave GPG"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:375
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensaje"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:377
 msgid "Set the message priority to high"
 msgstr "Establecer la prioridad del mensaje a alta"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:383
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar confirmaciÃ³n de lectura"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:385
 msgid "Get delivery notification when your message is read"
 msgstr "Obtener notificaciÃ³n de entrega cuando su mensaje sea leÃdo"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:391
 msgid "S/MIME En_crypt"
 msgstr "C_ifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:393
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar este mensaje con su certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:399
 msgid "S/MIME Sig_n"
 msgstr "Fi_rmar con S/MIME"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:401
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:407
 msgid "_Bcc Field"
 msgstr "Campo Â«Cc_oÂ»"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:409
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«CcoÂ»"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:415
 msgid "_Cc Field"
 msgstr "Campo Â«_CcÂ»"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:417
 msgid "Toggles whether the CC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«CcÂ»"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:423
 msgid "_From Field"
 msgstr "Campo Â«_DeÂ»"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:425
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Conmutador que indica si se muestra el selector Â«DeÂ»"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:431
 msgid "_Reply-To Field"
 msgstr "Campo Â«_Responder-aÂ»"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:433
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«Responder-aÂ»"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:476
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-# #En conflicto con _Mensaje
-#: ../composer/e-composer-header.c:120
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../composer/e-composer-header.c:123
-msgid "Hide"
-msgstr "Ocultar"
-
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
@@ -9738,80 +8304,81 @@ msgstr ""
 "Escriba las direcciones que recibirÃ¡n una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:949
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:299
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:954
+#: ../composer/e-composer-header-table.c:958
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
+# #En conflicto con _Mensaje
+#: ../composer/e-composer-header-table.c:969
+msgid "Show CC"
+msgstr "Mostrar Cc"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Cco"
+# #En conflicto con _Mensaje
+#: ../composer/e-composer-header-table.c:975
+msgid "Show BCC"
+msgstr "Mostrar Cco"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "Pulse aquÃ para la libreta de direcciones"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "Destino de publicaciÃ³n"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "Elija las carpetas en las que publicar el mensaje."
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquÃ para seleccionar carpetas en las que publicar"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:210
 msgid "Save draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-msg-composer.c:807
+#. Check buttons
+#: ../composer/e-msg-composer.c:190 ../mail/em-utils.c:146
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "_No mostrar otra vez este mensaje."
+
+#: ../composer/e-msg-composer.c:983
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9819,11 +8386,16 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1379
+#| msgid "Unable to retrieve message from editor"
+msgid "Unable to reconstruct message from autosave file"
+msgstr "No se pudo reconstruir el mensaje desde el archivo autoguardado"
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:2172
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3402
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9914,23 +8486,11 @@ msgstr ""
 "nuevo. La recuperaciÃ³n del mensaje le permitirÃ¡ continuar donde lo dejÃ³."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Opciones de envÃo sÃ³lo disponibles para cuentas Novell Groupwise y Microsoft "
-"Exchange."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "Opciones de envÃo no disponibles."
-
-#: ../composer/mail-composer.error.xml.h:19
 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."
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9938,7 +8498,7 @@ msgstr ""
 "Para adjuntar el contenido de este directorio, o adjunte individualmente "
 "cada archivo, o cree un archivador del directorio y adjÃºntelo."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9949,51 +8509,67 @@ msgstr ""
 "\n"
 "AsegÃºrese de que tiene la versiÃ³n correcta de gtkhtml y libgtkthml instalada."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr "No es posible activar el control de selecciÃ³n de direcciones."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "Se encontraron mensajes no terminados"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "No puede adjuntar el archivo Â«{0}Â» a este mensaje."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar una cuenta antes de poder escribir correo."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "_Continuar editando"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "_No recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "Guardar _borrador"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#| msgid "Calendar information"
+msgid "Calendar event notifications"
+msgstr "Notificaciones de acontecimientos del calendario"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#| msgid "Evolution Elm importer"
+msgid "Evolution Alarm Notify"
+msgstr "Notificador de alertas de Evolution"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:712
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:209
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Gestione su correo-e, contactos y calendario"
 
@@ -10005,70 +8581,147 @@ msgstr "tarjeta de direcciÃ³n"
 msgid "calendar information"
 msgstr "informaciÃ³n de calendario"
 
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Ã?rabe"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "BÃ¡ltico"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Chino"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "CirÃlico"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Griego"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "JaponÃ©s"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "TailandÃ©s"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Europeo occidental"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Europeo occidental, nuevo"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "tradicional"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "simplificado"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "visual"
+
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "MaÃ±ana"
 
-#: ../e-util/e-datetime-format.c:202
+#: ../e-util/e-datetime-format.c:204
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #, c-format
 msgid "%d days from now"
 msgstr "Dentro de %d dÃas"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 #, c-format
 msgid "%d days ago"
 msgstr "Hace %d dÃas"
 
-#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
-#: ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "Usar los valores predeterminados del sistema"
 
-#: ../e-util/e-datetime-format.c:494
+#: ../e-util/e-datetime-format.c:496
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "InformaciÃ³n de Evolution"
-
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Consulta de Evolution"
-
 #. setup a dummy error
-#: ../e-util/e-error.c:448
+#: ../e-util/e-error.c:451
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error interno, solicitado un error desconocido Â«%sÂ»"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "Componente"
-
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:172
+#, fuzzy
+#| msgid "Name of the component being logged"
+msgid "Name of the logger"
 msgstr "El nombre del componente que registrar"
 
+#: ../e-util/e-module.c:188
+#, fuzzy
+#| msgid "F_ilename:"
+msgid "Filename"
+msgstr "Nombre del _archivo:"
+
+#: ../e-util/e-module.c:189
+#, fuzzy
+#| msgid "Change the name of this folder"
+msgid "The filename of the module"
+msgstr "Cambia el nombre de esta carpeta"
+
 #: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "DepuraciÃ³n de sucesos"
@@ -10092,17 +8745,17 @@ msgid "Log Level"
 msgstr "Nivel de sucesos"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
+#: ../widgets/misc/e-dateedit.c:497
 msgid "Time"
 msgstr "Hora"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
+#: ../shell/e-shell-window-actions.c:1487
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -10126,14 +8779,15 @@ msgstr "Depurar"
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuraciÃ³n"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../e-util/e-plugin.c:292 ../filter/e-rule-editor.c:827
+#: ../modules/mail/em-composer-prefs.c:474
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:293
 msgid "Whether the plugin is enabled"
 msgstr "Indica si el complemento estÃ¡ activado"
 
@@ -10153,7 +8807,7 @@ msgstr ""
 "El sistema de impresiÃ³n no proporcionÃ³ ningÃºn detalle adicional acerca del "
 "error."
 
-#: ../e-util/e-signature.c:690
+#: ../e-util/e-signature.c:695
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
@@ -10181,254 +8835,311 @@ msgstr "El archivo existe Â«{0}Â»."
 msgid "Overwrite file?"
 msgstr "Â¿Sobreescribir archivo?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:135
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:139
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:189
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "_Importante"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "Error de GConf: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "_Trabajo"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "En adelante todos los errores sÃ³lo se mostrarÃ¡n en el terminal."
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "_Privado"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "Responder a"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "Ta_reas pendientes"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2186 ../mail/em-format-html.c:2250
+#: ../mail/em-format-html.c:2271 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "_MÃ¡s tarde"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
+#: ../mail/em-format-html.c:2187 ../mail/em-format-html.c:2256
+#: ../mail/em-format-html.c:2274 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Cco"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "_Nombre de la etiqueta:"
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:303 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "Asunto"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "Editar etiqueta"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2366
+#: ../modules/mail/em-mailer-prefs.c:1126
+msgid "Mailer"
+msgstr "Transporte"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "AÃ±adir etiqueta"
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1166
+msgid "-------- Forwarded Message --------"
+msgstr "--------- Mensaje reenviado --------"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "El nombre de la etiqueta no puede estar vacÃo."
+#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:433
+#: ../widgets/misc/e-dateedit.c:455
+msgid "Date"
+msgstr "Fecha"
 
-#: ../e-util/e-util-labels.c:367
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"Ya existe una etiqueta con el mismo nombre en el servidor. Renombre la "
-"etiqueta."
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cara"
+
+#: ../em-format/em-format.c:1320
 #, c-format
-msgid "GConf error: %s"
-msgstr "Error de GConf: %s"
+msgid "%s attachment"
+msgstr "%s adjunto"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "En adelante todos los errores sÃ³lo se mostrarÃ¡n en el terminal."
+#: ../em-format/em-format.c:1375
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
+
+#: ../em-format/em-format.c:1521
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message"
+msgstr "No es posible interpretar el mensaje PGP/MIME"
+
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:1699
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
+#: ../em-format/em-format.c:1848
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: ../em-format/em-format.c:1925
+msgid "Could not parse PGP message"
+msgstr "No es posible interpretar el mensaje PGP"
+
+#: ../em-format/em-format.c:1925
+msgid "Could not parse PGP message: Unknown error"
+msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
+
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "dentro de un segundo"
 msgstr[1] "dentro de %d segundos"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "dentro de un minuto"
 msgstr[1] "dentro de %d minutos"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %d horas"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "dentro de una hora"
 msgstr[1] "dentro de %d horas"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace un dÃa"
 msgstr[1] "hace %d dÃas"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "dentro de un dÃa"
 msgstr[1] "dentro de %d dÃas"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace una semana"
 msgstr[1] "hace %d semanas"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "dentro de una semana"
 msgstr[1] "dentro de %d semanas"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace un mes"
 msgstr[1] "hace %d meses"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "dentro de un mes"
 msgstr[1] "dentro de %d meses"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace un aÃ±o"
 msgstr[1] "hace %d aÃ±os"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de un aÃ±os"
 msgstr[1] "dentro de %d aÃ±os"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:117
 msgid "<click here to select a date>"
 msgstr "<pulse aquÃ para seleccionar una fecha>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:120 ../filter/e-filter-datespec.c:131
+#: ../filter/e-filter-datespec.c:142
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:127
 msgid "%d-%b-%Y"
 msgstr "%e/%b/%Y"
 
 # AquÃ time se refiere a fecha
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:271
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:181
+#, fuzzy
+#| msgid "Choose a file"
+msgid "Choose a File"
 msgstr "Elija un archivo"
 
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Prueba"
-
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:648
 msgid "R_ule name:"
 msgstr "Nombre de la _regla:"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:677
 msgid "Find items that meet the following conditions"
 msgstr "Buscar elementos que cumplen con estos criterios"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:711
 msgid "A_dd Condition"
 msgstr "AÃ±adir a_cciÃ³n"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:717
 msgid "If all conditions are met"
 msgstr "Si se cumplen todos los criterios"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:717
 msgid "If any conditions are met"
 msgstr "Si se cumple algÃºn criterio"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:719
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:739
 msgid "All related"
 msgstr "Todas las relacionadas"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:739
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:739
 msgid "Replies and parents"
 msgstr "Respuestas y antecesores"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:739
 msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:741
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1114 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:297
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:298
 msgid "Outgoing"
 msgstr "Saliente"
 
+#: ../filter/e-rule-editor.c:260
+msgid "Add Rule"
+msgstr "AÃ±adir regla"
+
+#: ../filter/e-rule-editor.c:343
+msgid "Edit Rule"
+msgstr "Editar regla"
+
+#: ../filter/e-rule-editor.c:837
+msgid "Rule name"
+msgstr "Nombre de la regla"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Error en la expresiÃ³n regular Â«{0}Â»."
@@ -10449,7 +9160,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -10545,200 +9256,838 @@ msgstr ""
 "el hora que especifique\n"
 "una fecha relativa al momento actual"
 
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "AÃ±adir regla"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1263
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Adjunto"
+msgstr[1] "Adjuntos"
 
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "Editar regla"
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Vista de icono"
 
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "Nombre de la regla"
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Vista de lista"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
+#: ../mail/e-mail-browser.c:665
+#, fuzzy
+#| msgid "Selection Mode"
+msgid "Shell Module"
+msgstr "Modo de selecciÃ³n"
+
+#: ../mail/e-mail-browser.c:666 ../mail/message-list.c:2511
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:676
+#, fuzzy
+#| msgid "Deleted"
+msgid "Show Deleted"
+msgstr "Borrado"
+
+#: ../mail/e-mail-browser.c:677
+#, fuzzy
+#| msgid "Forwarded messages"
+msgid "Show deleted messages"
+msgstr "Mensajes reenviados"
+
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+#| msgid "_Add to Address Book"
+msgid "_Add to Address Book..."
+msgstr "_AÃ±adir a la libreta de direcciones"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+#| msgid "_To this Address"
+msgid "_To This Address"
+msgstr "_A esta direcciÃ³n"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+#| msgid "_From this Address"
+msgid "_From This Address"
+msgstr "_Desde esta direcciÃ³n"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+#| msgid "Create _Search Folder"
+msgid "Create Search _Folder"
+msgstr "Crear carpeta de _bÃºsqueda"
+
+#: ../mail/e-mail-label-dialog.c:220
+#, fuzzy
+#| msgid "Label _Name:"
+msgid "_Label name:"
+msgstr "_Nombre de la etiqueta:"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_Importante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Trabajo"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Privado"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "Ta_reas pendientes"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_MÃ¡s tarde"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:552
+msgid "Add Label"
+msgstr "AÃ±adir etiqueta"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Editar etiqueta"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
+#| msgid ""
+#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Nota: El guiÃ³n bajo en el nombre de la etiqueta se usa como un identificador "
+"mnemÃ³nico en el menÃº."
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Color"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
+#: ../modules/mail/e-mail-shell-view-private.c:853
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+msgid "Drafts"
+msgstr "Borradores"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+msgid "Sent"
+msgstr "Correo enviado"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:539
+msgid "Templates"
+msgstr "Plantillas"
+
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:107
+#: ../modules/calendar/e-task-shell-view-actions.c:576
+#, fuzzy
+#| msgid "Do not ask me again."
+msgid "Do not ask me again"
+msgstr "No me preguntes otra vez."
+
+#: ../mail/e-mail-reader.c:216 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Copiar a la carpeta"
+
+#: ../mail/e-mail-reader.c:216 ../mail/em-folder-utils.c:381
+msgid "C_opy"
+msgstr "C_opiar"
+
+#: ../mail/e-mail-reader.c:605 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
+
+#: ../mail/e-mail-reader.c:605 ../mail/em-folder-utils.c:381
+msgid "_Move"
+msgstr "_Mover"
+
+#: ../mail/e-mail-reader.c:1083
+msgid "A_dd Sender to Address Book"
+msgstr "_AÃ±adir remitente a la libreta"
+
+#: ../mail/e-mail-reader.c:1085
+#, fuzzy
+#| msgid "Add Sender to Address Book"
+msgid "Add sender to address book"
+msgstr "AÃ±ade el remitente a la libreta de direcciones"
+
+#: ../mail/e-mail-reader.c:1090
+msgid "Check for _Junk"
+msgstr "Detectar _SPAM"
+
+#: ../mail/e-mail-reader.c:1092
+msgid "Filter the selected messages for junk status"
+msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
+
+#: ../mail/e-mail-reader.c:1099
+msgid "Copy selected messages to the clipboard"
+msgstr "Copiar los mensajes seleccionados al portapapeles"
+
+#: ../mail/e-mail-reader.c:1104
+msgid "_Copy to Folder..."
+msgstr "Copiar a la c_arpetaâ?¦"
+
+#: ../mail/e-mail-reader.c:1106
+msgid "Copy selected messages to another folder"
+msgstr "Copia mensajes seleccionados a otra carpeta"
+
+#: ../mail/e-mail-reader.c:1111
+msgid "_Delete Message"
+msgstr "_Borrar el mensaje"
+
+#: ../mail/e-mail-reader.c:1113
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar los mensajes seleccionados para borrar"
+
+#: ../mail/e-mail-reader.c:1118
+msgid "Filter on Mailing _List..."
+msgstr "Filtro segÃºn la _lista de correoâ?¦"
+
+#: ../mail/e-mail-reader.c:1120
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
+
+#: ../mail/e-mail-reader.c:1125
+msgid "Filter on _Recipients..."
+msgstr "Filtro segÃºn los _destinatariosâ?¦"
+
+#: ../mail/e-mail-reader.c:1127
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
+
+#: ../mail/e-mail-reader.c:1132
+msgid "Filter on Se_nder..."
+msgstr "Filtro segÃºn el _remitenteâ?¦"
+
+#: ../mail/e-mail-reader.c:1134
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crea una regla para filtrar los mensajes de este remitente"
+
+#: ../mail/e-mail-reader.c:1139
+msgid "Filter on _Subject..."
+msgstr "Filtro segÃºn el _asuntoâ?¦"
+
+#: ../mail/e-mail-reader.c:1141
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crea una regla para filtrar los mensajes con este asunto"
+
+# ColisiÃ³n en la A
+#: ../mail/e-mail-reader.c:1146
+msgid "A_pply Filters"
+msgstr "Aplicar _filtros"
+
+#: ../mail/e-mail-reader.c:1148
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplica filtros a los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:1153
+msgid "_Find in Message..."
+msgstr "B_uscar en el mensajeâ?¦"
+
+#: ../mail/e-mail-reader.c:1155
+msgid "Search for text in the body of the displayed message"
+msgstr "Busca un texto en el cuerpo del mensaje mostrado"
+
+#: ../mail/e-mail-reader.c:1160
+msgid "_Clear Flag"
+msgstr "_Quitar marca"
+
+#: ../mail/e-mail-reader.c:1162
+#, fuzzy
+#| msgid "Create a new task from the selected message"
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Crear una tarea nueva del mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:1167
+msgid "_Flag Completed"
+msgstr "Ma_rcar como terminado"
+
+#: ../mail/e-mail-reader.c:1169
+#, fuzzy
+#| msgid "Select all messages in the same thread as the selected message"
+msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
-"Configure las preferencias de correo incluyendo seguridad y visualizaciÃ³n de "
-"mensajes, aquÃ"
+"Selecciona todos los mensajes en la misma conversaciÃ³n que el mensaje "
+"seleccionado"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure la ortografÃa, firmas y el editor de mensajes aquÃ"
+#: ../mail/e-mail-reader.c:1174
+msgid "Follow _Up..."
+msgstr "Se_guimientoâ?¦"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquÃ"
+#: ../mail/e-mail-reader.c:1176
+#, fuzzy
+#| msgid "Flag selected messages for follow-up"
+msgid "Flag the selected messages for follow-up"
+msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "Configure sus conexiones de red aquÃ"
+#: ../mail/e-mail-reader.c:1181
+msgid "_Attached"
+msgstr "_Adjunto"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
+#: ../mail/e-mail-reader.c:1183 ../mail/e-mail-reader.c:1190
+msgid "Forward the selected message to someone as an attachment"
+msgstr "ReenvÃa a alguien el mensaje seleccionado como un adjunto"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuraciÃ³n de cuentas de correo de Evolution"
+#: ../mail/e-mail-reader.c:1188
+#, fuzzy
+#| msgid "_Forward as iCalendar"
+msgid "Forward As _Attached"
+msgstr "_Reenviar como iCalendar"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution"
+#: ../mail/e-mail-reader.c:1195
+msgid "_Inline"
+msgstr "_Incluido en lÃnea"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution"
+#: ../mail/e-mail-reader.c:1197 ../mail/e-mail-reader.c:1204
+msgid "Forward the selected message in the body of a new message"
+msgstr "ReenvÃa el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuraciÃ³n del redactor de correo de Evolution"
+#: ../mail/e-mail-reader.c:1202
+#, fuzzy
+#| msgid "_Forward style:"
+msgid "Forward As _Inline"
+msgstr "_Estilo de reenvÃo:"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
+#: ../mail/e-mail-reader.c:1209
+msgid "_Quoted"
+msgstr "_Citado"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Control de configuraciÃ³n de red de Evolution"
+#: ../mail/e-mail-reader.c:1211 ../mail/e-mail-reader.c:1218
+msgid "Forward the selected message quoted like a reply"
+msgstr "ReenvÃa el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Correo"
+#: ../mail/e-mail-reader.c:1216
+#, fuzzy
+#| msgid "_Forward style:"
+msgid "Forward As _Quoted"
+msgstr "_Estilo de reenvÃo:"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
+#: ../mail/e-mail-reader.c:1223
+msgid "_Load Images"
+msgstr "Cargar _imÃ¡genes"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
+#: ../mail/e-mail-reader.c:1225
+msgid "Force images in HTML mail to be loaded"
+msgstr "Fuerza la carga de imÃ¡genes en el correo HTML"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "Preferencias de red"
+#: ../mail/e-mail-reader.c:1230
+msgid "_Important"
+msgstr "_Importante"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "Co_rreo"
+#: ../mail/e-mail-reader.c:1232
+msgid "Mark the selected messages as important"
+msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "Reen_viar"
+#: ../mail/e-mail-reader.c:1237
+msgid "_Junk"
+msgstr "_SPAM"
+
+#: ../mail/e-mail-reader.c:1239
+msgid "Mark the selected messages as junk"
+msgstr "Marcar los mensajes seleccionados como SPAM"
+
+#: ../mail/e-mail-reader.c:1244
+msgid "_Not Junk"
+msgstr "No es SPA_M"
+
+#: ../mail/e-mail-reader.c:1246
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar los mensajes seleccionados como no SPAM"
+
+#: ../mail/e-mail-reader.c:1251
+msgid "_Read"
+msgstr "_LeÃdo"
+
+#: ../mail/e-mail-reader.c:1253
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar los mensajes seleccionados como leÃdos"
+
+#: ../mail/e-mail-reader.c:1258
+msgid "Uni_mportant"
+msgstr "N_o importante"
+
+#: ../mail/e-mail-reader.c:1260
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar los mensajes seleccionados como no importantes"
+
+#: ../mail/e-mail-reader.c:1265
+msgid "_Unread"
+msgstr "_No leÃdo"
+
+#: ../mail/e-mail-reader.c:1267
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar los mensajes seleccionados como no leÃdos"
+
+#: ../mail/e-mail-reader.c:1272
+msgid "_Edit as New Message..."
+msgstr "_Editar como un mensaje nuevoâ?¦"
+
+#: ../mail/e-mail-reader.c:1274
+msgid "Open the selected messages in the composer for editing"
+msgstr "Abre los mensajes seleccionados en el editor para editarlo"
+
+#: ../mail/e-mail-reader.c:1279
+msgid "Compose _New Message"
+msgstr "Redactar un mensaje _nuevo"
+
+#: ../mail/e-mail-reader.c:1281
+msgid "Open a window for composing a mail message"
+msgstr "Abre una ventana para escribir un mensaje de correo"
+
+#: ../mail/e-mail-reader.c:1286
+msgid "_Open in New Window"
+msgstr "_Abrir en una ventana nueva"
+
+#: ../mail/e-mail-reader.c:1288
+msgid "Open the selected messages in a new window"
+msgstr "Abre los mensajes seleccionados en una ventana nueva"
+
+#: ../mail/e-mail-reader.c:1293
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpetaâ?¦"
+
+#: ../mail/e-mail-reader.c:1295
+msgid "Move selected messages to another folder"
+msgstr "Mueve los mensajes seleccionados a otra carpeta"
+
+#: ../mail/e-mail-reader.c:1300
+msgid "_Next Message"
+msgstr "Mensaje _siguiente"
+
+#: ../mail/e-mail-reader.c:1302
+msgid "Display the next message"
+msgstr "Mostrar el mensaje siguiente"
+
+#: ../mail/e-mail-reader.c:1307
+msgid "Next _Important Message"
+msgstr "Mensaje siguiente _importante"
+
+#: ../mail/e-mail-reader.c:1309
+msgid "Display the next important message"
+msgstr "Mostrar el mensaje siguiente importante"
+
+#: ../mail/e-mail-reader.c:1314
+msgid "Next _Thread"
+msgstr "_ConversaciÃ³n siguiente"
+
+#: ../mail/e-mail-reader.c:1316
+msgid "Display the next thread"
+msgstr "Mostrar la siguiente conversaciÃ³n"
+
+#: ../mail/e-mail-reader.c:1321
+msgid "Next _Unread Message"
+msgstr "Mensaje siguiente _no leÃdo"
+
+#: ../mail/e-mail-reader.c:1323
+msgid "Display the next unread message"
+msgstr "Mostrar el siguiente mensaje no leÃdo"
+
+#: ../mail/e-mail-reader.c:1328
+msgid "_Previous Message"
+msgstr "Mensaje _anterior"
+
+#: ../mail/e-mail-reader.c:1330
+msgid "Display the previous message"
+msgstr "Mostrar el mensaje anterior"
+
+#: ../mail/e-mail-reader.c:1335
+msgid "Pr_evious Important Message"
+msgstr "Mensaje anterior i_mportante"
+
+#: ../mail/e-mail-reader.c:1337
+msgid "Display the previous important message"
+msgstr "Mostrar el anterior mensaje importante"
+
+#: ../mail/e-mail-reader.c:1342
+msgid "P_revious Unread Message"
+msgstr "Mensaje anterior n_o leÃdo"
+
+#: ../mail/e-mail-reader.c:1344
+msgid "Display the previous unread message"
+msgstr "Mostrar el anterior mensaje no leÃdo"
+
+#: ../mail/e-mail-reader.c:1351
+msgid "Print this message"
+msgstr "Imprime este mensaje"
+
+#: ../mail/e-mail-reader.c:1358
+msgid "Preview the message to be printed"
+msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1363
+msgid "Re_direct"
+msgstr "Re_dirigir"
+
+#: ../mail/e-mail-reader.c:1365
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
+
+#: ../mail/e-mail-reader.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "Responder a _todos"
+
+#: ../mail/e-mail-reader.c:1372
+#, fuzzy
+#| msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Responde a todos los destinatarios del mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:1377
+msgid "Reply to _List"
+msgstr "Responder a la _lista"
+
+#: ../mail/e-mail-reader.c:1379
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:1384
+#: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d mensajes adjuntos"
+#: ../mail/e-mail-reader.c:1386
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Adjunto"
-msgstr[1] "Adjuntos"
+#: ../mail/e-mail-reader.c:1391
+#, fuzzy
+#| msgid "Save as..."
+msgid "_Save as mbox..."
+msgstr "Guardar comoâ?¦"
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:607
-msgid "Icon View"
-msgstr "Vista de icono"
+#: ../mail/e-mail-reader.c:1393
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save selected messages as an mbox file"
+msgstr "Guarda los mensajes como un archivo de texto"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:608
-msgid "List View"
-msgstr "Vista de lista"
+#: ../mail/e-mail-reader.c:1398
+msgid "Search Folder from Mailing _List..."
+msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correoâ?¦"
+
+#: ../mail/e-mail-reader.c:1400
+#, fuzzy
+#| msgid "Create a Search Folder for this mailing list"
+msgid "Create a search folder for this mailing list"
+msgstr "Crea una carpeta de bÃºsqueda para esta lista de correo"
+
+#: ../mail/e-mail-reader.c:1405
+msgid "Search Folder from Recipien_ts..."
+msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatariosâ?¦"
+
+#: ../mail/e-mail-reader.c:1407
+#, fuzzy
+#| msgid "Create a Search Folder for these recipients"
+msgid "Create a search folder for these recipients"
+msgstr "Crea una carpeta de bÃºsqueda para estos destinatarios"
+
+#: ../mail/e-mail-reader.c:1412
+msgid "Search Folder from Sen_der..."
+msgstr "Carpeta de bÃºsqueda segÃºn el r_emitenteâ?¦"
+
+#: ../mail/e-mail-reader.c:1414
+#, fuzzy
+#| msgid "Create a Search Folder for this sender"
+msgid "Create a search folder for this sender"
+msgstr "Crea una carpeta de bÃºsqueda para este remitente"
+
+#: ../mail/e-mail-reader.c:1419
+msgid "Search Folder from S_ubject..."
+msgstr "Carpeta de bÃºsqueda segÃºn el a_suntoâ?¦"
+
+#: ../mail/e-mail-reader.c:1421
+#, fuzzy
+#| msgid "Create a Search Folder for this subject"
+msgid "Create a search folder for this subject"
+msgstr "Crea una carpeta de bÃºsqueda para este asunto"
+
+#: ../mail/e-mail-reader.c:1426
+msgid "Select _All Text"
+msgstr "Seleccionar _todo el texto"
+
+#: ../mail/e-mail-reader.c:1428
+msgid "Select all the text in a message"
+msgstr "Selecciona todo el texto de un mensaje"
+
+#: ../mail/e-mail-reader.c:1433
+msgid "_Message Source"
+msgstr "Me_nsaje en bruto"
+
+#: ../mail/e-mail-reader.c:1435
+msgid "Show the raw email source of the message"
+msgstr "Mostrar mensaje de correo-e en bruto"
+
+#: ../mail/e-mail-reader.c:1447
+msgid "_Undelete Message"
+msgstr "_Recuperar mensaje"
+
+#: ../mail/e-mail-reader.c:1449
+msgid "Undelete the selected messages"
+msgstr "Recupera los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:1454
+msgid "_Normal Size"
+msgstr "TamaÃ±o _normal"
+
+#: ../mail/e-mail-reader.c:1456
+msgid "Reset the text to its original size"
+msgstr "Restablecer el texto a su tamaÃ±o original"
+
+#: ../mail/e-mail-reader.c:1461
+msgid "_Zoom In"
+msgstr "_Ampliar"
+
+#: ../mail/e-mail-reader.c:1463
+msgid "Increase the text size"
+msgstr "Incrementar el tamaÃ±o del texto"
+
+#: ../mail/e-mail-reader.c:1468
+msgid "Zoom _Out"
+msgstr "_Reducir"
+
+#: ../mail/e-mail-reader.c:1470
+msgid "Decrease the text size"
+msgstr "Reduce el tamaÃ±o del texto"
+
+#: ../mail/e-mail-reader.c:1477
+msgid "Create R_ule"
+msgstr "Crear _regla"
+
+#: ../mail/e-mail-reader.c:1484
+msgid "Ch_aracter Encoding"
+msgstr "C_odificaciÃ³n de caracteres"
+
+#: ../mail/e-mail-reader.c:1491
+#, fuzzy
+#| msgid "F_orward As..."
+msgid "F_orward As"
+msgstr "Reenviar _comoâ?¦"
+
+#: ../mail/e-mail-reader.c:1498
+msgid "_Go To"
+msgstr "_Ir a"
+
+#: ../mail/e-mail-reader.c:1505
+#, fuzzy
+#| msgid "Mar_k as"
+msgid "Mar_k As"
+msgstr "Mar_car como"
+
+#: ../mail/e-mail-reader.c:1512
+msgid "_Message"
+msgstr "_Mensaje"
+
+#: ../mail/e-mail-reader.c:1519
+msgid "_Zoom"
+msgstr "_Ampliar"
+
+#: ../mail/e-mail-reader.c:1540
+msgid "Mark for Follo_w Up..."
+msgstr "Marcar para se_guimientoâ?¦"
+
+#: ../mail/e-mail-reader.c:1548
+msgid "Mark as _Important"
+msgstr "Marcar como imp_ortante"
+
+#: ../mail/e-mail-reader.c:1552
+msgid "Mark as _Junk"
+msgstr "Marcar como _SPAM"
+
+#: ../mail/e-mail-reader.c:1556
+msgid "Mark as _Not Junk"
+msgstr "Marcar como no _SPAM"
+
+#: ../mail/e-mail-reader.c:1560
+msgid "Mar_k as Read"
+msgstr "Marcar como _leÃdo"
+
+#: ../mail/e-mail-reader.c:1564
+#, fuzzy
+#| msgid "Mark as Un_important"
+msgid "Mark as Uni_mportant"
+msgstr "Marcar como no imp_ortante"
+
+#: ../mail/e-mail-reader.c:1568
+msgid "Mark as _Unread"
+msgstr "Marcar como no _leÃdo"
+
+#: ../mail/e-mail-reader.c:1604
+msgid "_Caret Mode"
+msgstr "Activar cu_rsor"
+
+#: ../mail/e-mail-reader.c:1606
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
+
+#: ../mail/e-mail-reader.c:1612
+msgid "All Message _Headers"
+msgstr "_Todas las cabeceras del mensaje"
+
+#: ../mail/e-mail-reader.c:1614
+msgid "Show messages with all email headers"
+msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
+
+#: ../mail/e-mail-reader.c:1826
+msgid "Unable to retrieve message"
+msgstr "No se pudo obtener el mensaje"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2298
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../mail/e-mail-reader.c:2414
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "Reen_viar"
+
+#: ../mail/e-mail-reader.c:2415
+msgid "Forward the selected message to someone"
+msgstr "ReenvÃa a alguien el mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:2463 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:1111
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../mail/e-mail-reader.c:2467
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../mail/e-mail-reader.c:2471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1193
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mail/e-mail-reader.c:2475 ../mail/message-tag-followup.c:62
+msgid "Reply"
+msgstr "Responder"
 
-#: ../mail/e-mail-search-bar.c:76
+#: ../mail/e-mail-search-bar.c:77
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/e-mail-search-bar.c:520
+#: ../mail/e-mail-search-bar.c:552
 msgid "Close the find bar"
 msgstr "Cerrar la barra de bÃºsqueda"
 
-#: ../mail/e-mail-search-bar.c:528
+#: ../mail/e-mail-search-bar.c:560
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../mail/e-mail-search-bar.c:540
+#: ../mail/e-mail-search-bar.c:572
 msgid "Clear the search"
 msgstr "Limpiar la bÃºsqueda"
 
-#: ../mail/e-mail-search-bar.c:559
+#: ../mail/e-mail-search-bar.c:595
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/e-mail-search-bar.c:565
+#: ../mail/e-mail-search-bar.c:601
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar la coincidencia anterior de la frase"
 
-#: ../mail/e-mail-search-bar.c:573
+#: ../mail/e-mail-search-bar.c:611
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../mail/e-mail-search-bar.c:579
+#: ../mail/e-mail-search-bar.c:617
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar la siguiente coincidencia de la frase"
 
-#: ../mail/e-mail-search-bar.c:587
+#: ../mail/e-mail-search-bar.c:627
 msgid "Mat_ch case"
 msgstr "_Coincidir con capitalizaciÃ³n"
 
-#: ../mail/e-mail-search-bar.c:615
+#: ../mail/e-mail-search-bar.c:655
 msgid "Reached bottom of page, continued from top"
 msgstr "Se llegÃ³ al final de la pÃ¡gina, continuando desde el principio"
 
-#: ../mail/e-mail-search-bar.c:637
+#: ../mail/e-mail-search-bar.c:677
 msgid "Reached top of page, continued from bottom"
 msgstr "Se llegÃ³ al principio de la pÃ¡gina, continuando desde el final"
 
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1563
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2932
+msgid "On This Computer"
+msgstr "En este equipo"
+
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:485
 msgid "No encryption"
 msgstr "Sin cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:313
+#: ../mail/em-account-editor.c:489
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:317
+#: ../mail/em-account-editor.c:493
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:584
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:591
 #, c-format
 msgid ""
 "\n"
@@ -10751,125 +10100,170 @@ msgstr ""
 "para %s mostrado abajo\n"
 "y marque la casilla para aceptarlo.\n"
 
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
+#: ../mail/em-account-editor.c:664 ../mail/em-filter-folder-element.c:255
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:999
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:1000
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:1001
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:2076
+msgid "Mail Configuration"
+msgstr "ConfiguraciÃ³n del correo"
+
+#: ../mail/em-account-editor.c:2077
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Bienvenido al asistente de configuraciÃ³n de correo de Evolution.\n"
+"\n"
+"Pulse Â«AdelanteÂ» para comenzar. "
+
+#: ../mail/em-account-editor.c:2079 ../mail/em-account-editor.c:2214
+#: ../mail/mail-config.glade.h:86
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2080
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Por favor escriba debajo su nombre y direcciÃ³n de correo-e. Los campos "
+"Â«opcionalesÂ» no hace falta que los rellene, a menos que quiera incluir esta "
+"informaciÃ³n en el correo-e que envÃe."
+
+#: ../mail/em-account-editor.c:2082 ../mail/em-account-editor.c:2255
+#: ../mail/mail-config.glade.h:106
 msgid "Receiving Email"
 msgstr "RecepciÃ³n de correo"
 
-#: ../mail/em-account-editor.c:2200
+#: ../mail/em-account-editor.c:2083
+msgid "Please configure the following account settings."
+msgstr "Configure las siguientes opciones de la cuenta."
+
+#: ../mail/em-account-editor.c:2085 ../mail/em-account-editor.c:2715
+msgid "Sending Email"
+msgstr "EnvÃo de correo"
+
+#: ../mail/em-account-editor.c:2086
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Por favor escriba debajo la informaciÃ³n acerca de cÃ³mo enviarÃ¡ su correo. Si "
+"no estÃ¡ seguro, pregÃºntele a su administrador de sistemas o a su Proveedor "
+"de Servicios de Internet."
+
+#: ../mail/em-account-editor.c:2088
+msgid "Account Management"
+msgstr "AdministraciÃ³n de cuentas"
+
+#: ../mail/em-account-editor.c:2089
+#, fuzzy
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below. This "
+#| "name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo. "
+"Este nombre se usarÃ¡ sÃ³lo para mostrarlo."
+
+#: ../mail/em-account-editor.c:2093
+msgid "Done"
+msgstr "Hecho"
+
+#: ../mail/em-account-editor.c:2094
+#, fuzzy
+#| msgid ""
+#| "Congratulations, your mail configuration is complete.\n"
+#| "\n"
+#| "You are now ready to send and receive email \n"
+#| "using Evolution. \n"
+#| "\n"
+#| "Click \"Apply\" to save your settings."
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Enhorabuena, ha terminado de configurar su correo.\n"
+"\n"
+"Ahora estÃ¡ listo para enviar y recibir correo \n"
+"usando Evolution. \n"
+"\n"
+"Pulse Â«AplicarÂ» para guardar su configuraciÃ³n."
+
+#: ../mail/em-account-editor.c:2527
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay correo _nuevo cada"
 
-#: ../mail/em-account-editor.c:2208
+#: ../mail/em-account-editor.c:2535
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "EnvÃo de correo"
-
-#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2777 ../mail/mail-config.glade.h:62
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:112
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
+#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
 msgid "Receiving Options"
 msgstr "Opciones de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3408 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[Predeterminada]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "Nombre de la cuenta"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "Sin nombre"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "Idioma(s)"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "AÃ±adir un script de firma"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "Firma(s)"
-
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "--------- Mensaje reenviado --------"
-
-#: ../mail/em-composer-utils.c:1585
+#: ../mail/em-composer-utils.c:1622
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "No se proporcionÃ³ ninguna direcciÃ³n de destino, se cancelÃ³ el reenvÃo del "
 "mensaje."
 
-#: ../mail/em-composer-utils.c:1591
+#: ../mail/em-composer-utils.c:1628
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontrÃ³ ninguna cuenta que usar, se cancelÃ³ el reenvÃo del mensaje."
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2071
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2118
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10877,11 +10271,19 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiÃ³:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2262
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-filter-editor.c:172
+#: ../mail/em-composer-utils.c:2442
+msgid "Posting destination"
+msgstr "Destino de publicaciÃ³n"
+
+#: ../mail/em-composer-utils.c:2443
+msgid "Choose folders to post the message to."
+msgstr "Elija las carpetas en las que publicar el mensaje."
+
+#: ../mail/em-filter-editor.c:188
 msgid "_Filter Rules"
 msgstr "Reglas de _filtrado"
 
@@ -10898,18 +10300,22 @@ msgstr "Asignar color"
 msgid "Assign Score"
 msgstr "Asignar puntuaciÃ³n"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Cco"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pitar"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Completado en"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Copiar a la carpeta"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Fecha de recepciÃ³n"
@@ -10918,14 +10324,6 @@ msgstr "Fecha de recepciÃ³n"
 msgid "Date sent"
 msgstr "Fecha de envÃo"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Borrar"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Borrado"
@@ -10974,7 +10372,7 @@ msgstr "Seguimiento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
 msgid "Important"
 msgstr "Importante"
 
@@ -11002,8 +10400,7 @@ msgstr "no estÃ¡ establecida"
 msgid "is set"
 msgstr "estÃ¡ establecida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:87
 msgid "Junk"
 msgstr "SPAM"
 
@@ -11043,10 +10440,6 @@ msgstr "El mensaje no es SPAM"
 msgid "Message Location"
 msgstr "UbicaciÃ³n del mensaje"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Encauzar al programa"
@@ -11132,14 +10525,6 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "Asunto"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Quitar estado"
@@ -11153,54 +10538,6 @@ msgstr "Luego"
 msgid "Add Ac_tion"
 msgstr "AÃ±adir a_cciÃ³n"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "_Crear una carpeta de bÃºsqueda desde la bÃºsquedaâ?¦"
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "Todos los mensajes"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "Mensajes no leÃdos"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "Sin etiqueta"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "Mensajes leÃdos"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "Mensajes recientes"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "Mensajes de los Ãºltimos 5 dÃas"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "Mensajes con adjuntos"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "Mensajes importantes"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "Mensajes que no son SPAM"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "BÃºsqueda en la cuenta"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "BÃºsqueda en todas las cuentas"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11226,64 +10563,47 @@ msgstr "Uso de cuota (%s):"
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: ../mail/em-folder-properties.c:390
+#: ../mail/em-folder-properties.c:399
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<pulse aquÃ para seleccionar una carpeta>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:267
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:271
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
 msgid "Search Folders"
 msgstr "Carpetas de bÃºsqueda"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "Borradores"
-
-#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Plantillas"
-
-#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "Bandeja de salida"
-
-#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "Correo enviado"
-
-#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
 msgid "Loading..."
 msgstr "Cargandoâ?¦"
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Analizando carpetas en Â«%sÂ»"
+
+#: ../mail/em-folder-tree.c:445
+msgid "Folder names cannot contain '/'"
+msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11298,284 +10618,89 @@ msgstr "Cargandoâ?¦"
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:978
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1309
 msgid "Mail Folder Tree"
 msgstr "Ã?rbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1476
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1478
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1502
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacÃ©n de nivel superior"
 
-#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "_Copiar a la carpeta"
-
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "_Mover a la carpeta"
-
-#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "_Mover"
-
-#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "Cancelar _arrastre"
-
-#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Analizando carpetas en Â«%sÂ»"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "Abrir en una ventana _nueva"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "Carpeta _nuevaâ?¦"
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "_Moverâ?¦"
-
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "Actuali_zar"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "Enviar correos pe_ndientes"
-
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "_Vaciar papelera"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "Carpeta de bÃºsqueda de _no leÃdos"
-
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-utils.c:98
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando Â«%sÂ» a Â«%sÂ»"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
-msgid "Select folder"
-msgstr "Seleccionar carpeta"
+#: ../mail/em-folder-utils.c:382
+#, fuzzy
+#| msgid "_Move Folder To..."
+msgid "Move Folder To"
+msgstr "_Mover carpeta aâ?¦"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "C_opiar"
+#: ../mail/em-folder-utils.c:382
+#, fuzzy
+#| msgid "_Copy Folder To..."
+msgid "Copy Folder To"
+msgstr "_Copiar carpeta aâ?¦"
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:495
+#: ../plugins/groupwise-features/share-folder-common.c:142
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta Â«%sÂ»"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:657
+#, fuzzy
+#| msgid "Create folder"
+msgid "Create Folder"
 msgstr "Crear carpeta"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:658
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:351
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "Ha fallado el borrado del correo"
-
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "No tiene suficientes permisos para borrar este correo."
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "_Editar como un mensaje nuevoâ?¦"
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "_Recuperar"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "_Mover a la carpetaâ?¦"
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "Copiar a la c_arpetaâ?¦"
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "Marcar como _leÃdo"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "Marcar como no _leÃdo"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "Marcar como imp_ortante"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "Marcar como no imp_ortante"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "Marcar como _SPAM"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "Marcar como no _SPAM"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "Marcar para se_guimientoâ?¦"
-
-#: ../mail/em-folder-view.c:1354
-msgid "_Label"
-msgstr "Etiq_ueta"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "_Ninguna"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "Etiqueta n_ueva"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "Ma_rcar como terminado"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "_Quitar marca"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "Crear re_gla desde el mensaje"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "Carpeta de bÃºsqueda segÃºn el a_sunto"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "Carpeta de bÃºsqueda segÃºn el r_emitente"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatarios"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correo"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "Filtro segÃºn el _asunto"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "Filtro segÃºn el _remitente"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "Filtro segÃºn los _destinatarios"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "Filtro segÃºn la lista de _correo"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:593
-#: ../plugins/google-account-setup/google-source.c:764
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "No se pudo obtener el mensaje"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "Crear carpeta de _bÃºsqueda"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "_Desde esta direcciÃ³n"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "_A esta direcciÃ³n"
-
-#: ../mail/em-folder-view.c:3191
+#: ../mail/em-folder-utils.c:674
 #, c-format
-msgid "Click to mail %s"
-msgstr "Pulse para enviar correo a %s"
-
-#: ../mail/em-folder-view.c:3203
-#, c-format
-msgid "Click to call %s"
-msgstr "Pulse para llamar a %s"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "Pulse para ocultar/mostrar las direcciones"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "DesuscribiÃ©ndose de la carpeta Â«%sÂ»"
 
-#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1492
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11583,11 +10708,11 @@ msgstr ""
 "Este mensaje no estÃ¡ firmado. No hay garantÃa de que el mensaje sea "
 "autÃ©ntico."
 
-#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1493
 msgid "Valid signature"
 msgstr "Firma vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html-display.c:108
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11595,11 +10720,11 @@ msgstr ""
 "Este mensaje estÃ¡ firmado y es vÃ¡lido, lo que significa que es muy probable "
 "que el mensaje sea autÃ©ntico."
 
-#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1494
 msgid "Invalid signature"
 msgstr "Firma no vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html-display.c:109
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11607,11 +10732,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1495
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma vÃ¡lida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html-display.c:110
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11619,11 +10744,11 @@ msgstr ""
 "Este mensaje estÃ¡ firmado con una firma vÃ¡lida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1496
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pÃºblica"
 
-#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html-display.c:111
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11631,11 +10756,11 @@ msgstr ""
 "Este mensaje estÃ¡ firmado con una firma pero no existe una clave pÃºblica "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:118 ../mail/em-format-html.c:1502
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:118
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11643,11 +10768,11 @@ msgstr ""
 "Este mensaje no estÃ¡ cifrado. Su contenido puede verse en trÃ¡nsito a travÃ©s "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1503
 msgid "Encrypted, weak"
 msgstr "Cifrado, dÃ©bil"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:119
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11657,11 +10782,11 @@ msgstr ""
 "ser difÃcil, pero no imposible para un espÃa ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1504
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:120
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11669,11 +10794,11 @@ msgstr ""
 "Este mensaje estÃ¡ cifrado. SerÃa difÃcil para un espÃa ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:121 ../mail/em-format-html.c:1505
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:121
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11683,509 +10808,252 @@ msgstr ""
 "difÃcil que un espÃa vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:266
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:517
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution no puede mostrar este correo debido a que es demasiado grande para "
+"procesarlo. Puede verlo sin formato o con un editor de texto externo."
+
+#: ../mail/em-format-html-display.c:787
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:795
 msgid "Overdue:"
 msgstr "Atrasado:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:799
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "_Ver incluido"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "_Ocultar"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "_Ajustar al ancho"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "Mostrar tamaÃ±o _original"
-
-#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:1196 ../mail/em-format-html-display.c:1235
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:1198
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1255
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
-#: ../mail/em-format-html-display.c:1711
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution no puede mostrar este correo debido a que es demasiado grande para "
-"procesarlo. Puede verlo sin formato o con un editor de texto externo."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "PÃ¡gina %d de %d"
 
-#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:163
+msgid "Formatting message"
+msgstr "Formateando el mensaje"
+
+#: ../mail/em-format-html.c:354
+msgid "Formatting Message..."
+msgstr "Formateando el mensajeâ?¦"
+
+#: ../mail/em-format-html.c:1343 ../mail/em-format-html.c:1352
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Obteniendo Â«%sÂ»"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1804
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1812
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1842
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1853
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) vÃ¡lido en el sitio Â«%sÂ»"
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1855
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1876
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1887
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo Â«%sÂ»)"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "Formateando el mensaje"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "Formateando el mensajeâ?¦"
-
-#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "Cco"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "Transporte"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:2530
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo enviÃ³ <b>%s</b> en nombre de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "Fecha"
-
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "Cara"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
-
-#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encrypted"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "No es posible interpretar el mensaje PGP/MIME"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "Formato de firma no soportado"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "Error al verificar la firma"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "Error desconocido al verificar la firma"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "No es posible interpretar el mensaje PGP"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "Cada vez"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "Una vez por dÃa"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "Una vez por semana"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "Una vez por mes"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "AÃ±adir cabecera de SPAM personalizada"
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "Nombre de la cabecera:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "El valor de cabecera contiene:"
-
-#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Cabecera"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "Contiene el valor"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "Color"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "Etiqueta"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "El complemento %s estÃ¡ disponible y el binario estÃ¡ instalado."
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"El complemento %s no estÃ¡ disponible. Compruebe si el paquete estÃ¡ instalado."
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "No hay complemento para SPAM disponible"
-
-#: ../mail/em-mailer-prefs.c:1455
-msgid "Date header:"
-msgstr "Cabecera de fecha:"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "MÃ¡s tarde"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "MigraciÃ³n"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "No es posible crear la carpeta nueva: Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No es posible copiar el la carpeta Â«%sÂ» a Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No es posible buscar buzones existentes en Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:1789
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquÃa de las carpetas de buzones de correo ha cambiado desde "
-"Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../mail/em-migrate.c:1990
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "No es posible abrir los datos antiguos POP keep-on-server Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Fallo al crear directorio de datos POP3 keep-on-server Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:2033
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "No es posible copiar los datos POP3 keep-on-server Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "No es posible crear el almacÃ©n de correo local Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "Migrando carpetas"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El formato de resÃºmenes de las carpetas del buzÃ³n de Evolution se ha movido "
-"a sqlite desde Evolution 2.24.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "No es posible crear las carpetas de correo local en: Â«%sÂ»: %s"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"No es posible leer la configuraciÃ³n de la instalaciÃ³n anterior de Evolution, "
-"Â«evolution/config.xmldbÂ» no existe o estÃ¡ corrompido."
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "Guardar comoâ?¦"
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imagen-_sin-tÃtulo.%s"
-
-#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "Establecer como _fondo"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "_Responder al remitente"
-
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "Responder a la _lista"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "_AÃ±adir a la libreta de direcciones"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %sâ?¦"
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:597
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacÃ©n no soporta suscripciones, o no estÃ¡n activadas."
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:630
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:634
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:853
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:889
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningÃºn servidor"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "_No mostrar otra vez este mensaje."
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:307
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:359
 msgid "message"
 msgstr "mensaje"
 
-#: ../mail/em-utils.c:652
+#: ../mail/em-utils.c:647
 msgid "Save Message..."
 msgstr "Guardar mensajeâ?¦"
 
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "AÃ±adir direcciÃ³n"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:1110
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "Carpetas de _bÃºsqueda"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:517
+#, fuzzy
+#| msgid "Folder"
+msgid "Add Folder"
+msgstr "Carpeta"
+
+#: ../mail/em-vfolder-rule.c:594
 msgid "Search Folder source"
 msgstr "Origen de la carpeta de bÃºsqueda"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+#| msgid "Default window height"
+msgid "\"Filter Editor\" window height"
+msgstr "Altura predeterminada de la ventana"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#, fuzzy
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana Â«Enviar y recibir correoÂ»"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+#| msgid "Default window width"
+msgid "\"Filter Editor\" window width"
+msgstr "Anchura predeterminada de la ventana"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+#| msgid "Default window height"
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura predeterminada de la ventana"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana Â«Enviar y recibir correoÂ»"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+#| msgid "Search Folder based on Mailing _List"
+msgid "\"Search Folder Editor\" window width"
+msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Altura de la ventana Â«Enviar y recibir correoÂ»"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Estado maximizado de la ventana Â«Enviar y recibir correoÂ»"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Anchura de la ventana Â«Enviar y recibir correoÂ»"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Permite a Evolution mostrar la parte de texto de tamaÃ±o limitado"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Siempre solicitar confirmaciÃ³n de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Reconocimiento automÃ¡tico de emoticonos"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "Reconocimiento automÃ¡tico de enlaces"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "Altura predeterminada de la ventana de redacciÃ³n de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacciÃ³n de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "Directorio de carga/adjuntos del editor"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir la visualizaciÃ³n de direcciones en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12193,7 +11061,7 @@ msgstr ""
 "Comprime la visualizaciÃ³n de direcciones en A/CC/CCO al nÃºmero especificado "
 "en address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -12201,11 +11069,11 @@ msgstr ""
 "Controla la frecuencia con la que los cambios locales se sincronizan con el "
 "servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12213,59 +11081,69 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "Estilo de reenvÃo predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "Altura predeterminada de la ventana del mensaje."
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+#| msgid "Default height of the Composer Window."
+msgid "Default height of the mail browser window."
+msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada del diÃ¡logo de suscripciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+#| msgid "Default width of the Composer Window."
+msgid "Default maximized state of the mail browser window."
+msgstr "Anchura predeterminada de la ventana del editor de mensajes."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansiÃ³n de la conversaciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "Anchura predeterminada de la ventana de mensajes."
+#: ../mail/evolution-mail.schemas.in.h:38
+#, fuzzy
+#| msgid "Default width of the Composer Window."
+msgid "Default width of the mail browser window."
+msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "Anchura predeterminada del diÃ¡logo de suscripciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -12273,13 +11151,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sÃ³lo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la direcciÃ³n del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12291,12 +11169,12 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12306,7 +11184,7 @@ msgstr ""
 "SPAM. Si esta opciÃ³n estÃ¡ activada y las cabeceras se mencionan, se mejorarÃ¡ "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12314,43 +11192,49 @@ msgstr ""
 "Determina si se debe usar la misma tipografÃa para las lÃneas Â«DeÂ» y Â«AsuntoÂ» "
 "en la columna Â«MensajesÂ» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio para cargar/adjuntar archivos en el editor."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Directorio para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
 "lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+#| msgid "Could not save signature file."
+msgid "Do not add signature delimiter"
+msgstr "No es posible guardar el archivo de firma."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipogrÃ¡ficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -12358,31 +11242,31 @@ msgstr ""
 "Activar imÃ¡genes animadas en correos HTML. Muchos usuarios consideran "
 "molestas las imÃ¡genes animadas y prefieren ver una imagen estÃ¡tica."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mÃ¡gica"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "Activa o desactiva la caracterÃstica de bÃºsqueda al teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "Activar las carpetas de bÃºsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de bÃºsqueda al inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -12390,7 +11274,7 @@ msgstr ""
 "Activar la caracterÃstica barra de bÃºsqueda lateral para permitir bÃºsquedas "
 "interactivas de nombres de carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12398,19 +11282,19 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "Activar para mostrar la parte de texto del mensaje de tamaÃ±o limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.glade.h:73
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -12422,19 +11306,19 @@ msgstr ""
 "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
 "el estÃ¡ndar incorrecto RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selecciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12442,15 +11326,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o mÃ¡s mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Si el panel de Â«Vista previaÂ» estÃ¡ activado, entonces lo muestra en el "
-"lateral en vez de verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -12461,7 +11337,31 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Altura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se actualiza "
+"segÃºn el usuario redimensiona verticalmente la ventana."
+
+#: ../mail/evolution-mail.schemas.in.h:74
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Altura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se actualiza "
+"segÃºn el usuario redimensiona verticalmente la ventana."
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12469,7 +11369,47 @@ msgstr ""
 "Altura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se actualiza "
 "segÃºn el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:76
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"Estado inicial maximizado de la ventana Â«Enviar y recibir correoÂ». El valor "
+"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
+"no usa este valor en particular ya que la ventana Â«Enviar y recibir correoÂ» "
+"no se puede maximizar. Esta clave existe sÃ³lo como un detalle de "
+"implementaciÃ³n."
+
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Estado inicial maximizado de la ventana Â«Enviar y recibir correoÂ». El valor "
+"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
+"no usa este valor en particular ya que la ventana Â«Enviar y recibir correoÂ» "
+"no se puede maximizar. Esta clave existe sÃ³lo como un detalle de "
+"implementaciÃ³n."
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12483,23 +11423,39 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sÃ³lo como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Anchura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se "
+"actualiza segÃºn el usuario redimensiona horizontalmente la ventana."
+
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 "Anchura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se "
 "actualiza segÃºn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"Habilita/deshabilita la caracterÃstica donde la pregunta de si se requiere "
-"sincronizaciÃ³n antes de pasar al modo trabajar desconectado se repite."
+"Anchura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se "
+"actualiza segÃºn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12509,31 +11465,37 @@ msgstr ""
 "mensajes de una carpeta de bÃºsqueda borra permanentemente el mensaje, no "
 "sÃ³lo los elimina de los resultados de la bÃºsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "Ã?ltima vez que se vaciÃ³ el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "Ã?ltima vez que se vaciÃ³ la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+#| msgid "Lay_out"
+msgid "Layout style"
+msgstr "_DistribuciÃ³n"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 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.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12542,16 +11504,16 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si estÃ¡n activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista de los cÃ³digos de diccionario usados para la correcciÃ³n ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12560,15 +11522,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificaciÃ³n "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar imÃ¡genes para mensajes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -12579,219 +11541,240 @@ msgstr ""
 "remitente estÃ¡ en la libreta de direcciones; Â«2Â»: Siempre cargar imÃ¡genes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+#| msgid "Uniform row height"
+msgid "Mail browser height"
+msgstr "Altura uniforme de la fila"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+#| msgid "Email begins with"
+msgid "Mail browser width"
+msgstr "El correo-e empieza por"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despuÃ©s del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despuÃ©s del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la Â«vista previaÂ» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "Altura predeterminada de la ventana de mensajes"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "Anchura predeterminada de la ventana de mensajes"
-
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualizaciÃ³n del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "DÃas mÃnimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "DÃas mÃnimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mÃnimo entre el vaciado del SPAM a la salida, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mÃnimo entre el vaciado de la papelera a la salida, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃºmero de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto estÃ¡ en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
-"Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al borrar mensajes en carpetas de bÃºsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sÃ³lo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o mÃ¡s mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizÃ¡ no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poner firmas personalizas en la parte superior de las respuestas"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "Comenzar a escribir en la parte final al responder"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imÃ¡genes."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisiÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "EnvÃa el correo en HTML por omisiÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n con el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar el campo Â«CcoÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar el campo Â«CcÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar el campo Â«DeÂ» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Mostrar el campo Â«DeÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar el campo Â«Responder aÂ» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+#| msgid "Collapse all message threads"
+msgid "Show all message headers"
+msgstr "Contrae todas las conversaciones"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "Mostrar las imÃ¡genes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "Mostrar imÃ¡genes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12799,7 +11782,7 @@ msgstr ""
 "Mostrar el campo Â«CcoÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12807,7 +11790,7 @@ msgstr ""
 "Mostrar el campo Â«CcÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12815,7 +11798,7 @@ msgstr ""
 "Mostrar el campo Â«DeÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12823,7 +11806,15 @@ msgstr ""
 "Mostrar el campo Â«DeÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Show the \"Preview\" pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane."
+msgstr "Mostrar el panel de vista previa."
+
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12831,7 +11822,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al publicar en un grupo de noticias. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12839,7 +11830,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12847,59 +11838,67 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica en lÃnea"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Color de la correcciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "TipografÃa del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "LÃmite de la parte de texto del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "La Ãºltima vez que se vaciÃ³ el SPAM, en dÃas desde la Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La Ãºltima vez que se vaciÃ³ la papelera, en dÃas desde la Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "La tipografÃa de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "La tipografÃa de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12907,7 +11906,7 @@ msgstr ""
 "Esto puede tener tres valores posibles. Â«0Â» para errores. Â«1Â» para avisos. Â«2Â» "
 "para mensajes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -12916,7 +11915,7 @@ msgstr ""
 "bajo Evolution. Lo predeterminado son 4 MiB/4096 KiB y estÃ¡ especificado en "
 "tÃ©rminos de KiB."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12926,7 +11925,7 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado estÃ¡ "
 "desactivado, entonces no usarÃ¡ los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -12935,7 +11934,7 @@ msgstr ""
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12947,7 +11946,7 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
 "debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12958,11 +11957,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opciÃ³n ayudarÃ¡ a mejorar la velocidad de obtenciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12970,7 +11969,7 @@ msgstr ""
 "Esto establece el nÃºmero de direcciones a mostrar en la vista de lista de "
 "mensajes predeterminada, mÃ¡s allÃ¡ de los cuales se muestra un Â«â?¦Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12979,7 +11978,7 @@ msgstr ""
 "deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12989,65 +11988,61 @@ msgstr ""
 "Ãºltimo mensaje de cada conversaciÃ³n, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message list."
 msgstr "Agrupar la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list"
 msgstr "Agrupar la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Timeout for marking message as seen."
 msgstr "Tiempo para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subrayado para las palabras mal escritas cuando se use correcciÃ³n "
 "en lÃnea."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar el demonio y cliente de SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use custom fonts"
 msgstr "Usar tipografÃa personalizada"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografÃa personalizada para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³lo comprobaciones de SPAM locales."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa sÃ³lo comprobaciones de SPAM locales (sin DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "Usar distribuciÃ³n lado a lado o ancha"
-
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -13057,7 +12052,7 @@ msgstr ""
 "mensaje. Esto determina si el cursor se posiciona en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -13067,23 +12062,23 @@ msgstr ""
 "mensaje. Esto determina si la firma se ubica en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Variable width font"
 msgstr "TipografÃa de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica si se debe aÃ±adir una solicitud de lectura de forma predeterminada a "
 "cada mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica si se debe desactivar la caracterÃstica de elipsis de los nombres de "
 "las carpetas en la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13091,63 +12086,74 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras Â«In-Reply-ToÂ» o Â«ReferencesÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica si ordenar las conversaciones basÃ¡ndose en el Ãºltimo mensaje de esa "
 "conversaciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:324 ../mail/importers/pine-importer.c:378
+#: ../modules/mail/e-mail-shell-view.c:591
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Correo"
+
+#: ../mail/importers/elm-importer.c:364
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm de Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:365
 msgid "Import mail from Elm."
 msgstr "Importar correo de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "Seleccionar carpeta"
+
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "BuzÃ³n Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzÃ³n de Berkeley"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "Importando buzÃ³n de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando Â«%sÂ»"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
@@ -13156,6 +12162,11 @@ msgstr "Analizando %s"
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
+#: ../mail/importers/pine-importer.c:383
+#: ../modules/addressbook/addressbook-config.c:1047
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
 #: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
@@ -13164,22 +12175,22 @@ msgstr "Importador de Pine de Evolution"
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Correo para %s"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:257
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:292
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de correo %s"
@@ -13188,92 +12199,6 @@ msgstr "Lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "AÃ±adir regla de filtrado"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d seleccionado, "
-msgstr[1] "%d seleccionados, "
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d borrado"
-msgstr[1] "%d borrados"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d SPAM"
-msgstr[1] "%d SPAM"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d borrador"
-msgstr[1] "%d borradores"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d enviado"
-msgstr[1] "%d enviados"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d sin enviar"
-msgstr[1] "%d sin enviar"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d no leÃdo, "
-msgstr[1] "%d no leÃdos, "
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d en total"
-msgstr[1] "%d en total"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "Mensaje de correo nuevo"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mensaje de correo"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "Redacta un mensaje de correo nuevo"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "Carpeta de correo nueva"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "_Carpeta de correo"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "Crea una carpeta de correo nueva"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "FallÃ³ al actualizar la configuraciÃ³n de correo o carpetas."
-
 #: ../mail/mail-config.glade.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Nota: Requiere reiniciar la aplicaciÃ³n)"
@@ -13392,46 +12317,38 @@ msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de _autenticaciÃ³n</span>"
 
 #: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "AdministraciÃ³n de cuentas"
-
-#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "AÃ±adir firma _nuevaâ?¦"
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "AÃ±adir _script"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:36
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:37
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "TambiÃ©n cifrar a _mÃ mismo cuando envÃe correo cifrado"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:38
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre enviar _copia de carbÃ³n (Cc) a:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:39
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Siempre enviar copia de carbÃ³n _oculta (Cco) a:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:40
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi almacÃ©n al cifrar"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:41
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Siempre cifrar a _mÃ mismo cuando envÃe correo cifrado"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:42
 msgid "Always request rea_d receipt"
 msgstr "Siempre _solicitar confirmaciÃ³n de lectura"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:43
 msgid ""
 "Attachment\n"
 "Inline\n"
@@ -13441,7 +12358,7 @@ msgstr ""
 "En lÃnea\n"
 "Citado"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:46
 msgid ""
 "Attachment\n"
 "Inline (Outlook style)\n"
@@ -13453,373 +12370,286 @@ msgstr ""
 "Citado\n"
 "No citar"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:50
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imÃ¡genes de _emoticonos automÃ¡ticamente"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "BÃ¡ltico (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "BÃ¡ltico (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.glade.h:52
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:53
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:54
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:55
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafÃa mientras se escribe"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:56
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si el correo entrante es SPAM"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.glade.h:57
 msgid "Cle_ar"
 msgstr "_Vaciar"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.glade.h:58 ../mail/message-tag-followup.c:321
 msgid "Clea_r"
 msgstr "Vacia_r"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:59
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de compactar una carpeta"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Enhorabuena, ha terminado de configurar su correo.\n"
-"\n"
-"Ahora estÃ¡ listo para enviar y recibir correo \n"
-"usando Evolution. \n"
-"\n"
-"Pulse Â«AplicarÂ» para guardar su configuraciÃ³n."
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "_Predeterminada"
-
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:61
 msgid "Default character e_ncoding:"
 msgstr "_CodificaciÃ³n de caracteres predeterminada:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:63
 msgid "Delete junk messages on e_xit"
 msgstr "Borrar los correos SPAM al _salir"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:65
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃ³n)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:66
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "No formatear mensajes si el ta_maÃ±o del texto excede"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:67
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_No marcar los mensajes como basura si el remitente estÃ¡ en mi libreta de "
 "direcciones"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "Hecho"
-
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:68
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "Cuentas de correo-e"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:69
 msgid "Email _Address:"
 msgstr "Dir_ecciÃ³n de correo-e:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:70
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:71
 msgid "Enable Magic S_pacebar"
 msgstr "Activar la barra e_spaciadora mÃ¡gica"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:72
 msgid "Enable Sea_rch Folders"
 msgstr "Activar las Carpetas de _bÃºsqueda"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:74
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:75
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar mensajes _salientes (por omisiÃ³n)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:76
 msgid "Fi_xed-width:"
 msgstr "Anchura _fija:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:77
 msgid "Fix_ed width Font:"
 msgstr "TipografÃa de anchura _fija:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:78
 msgid "Font Properties"
 msgstr "Propiedades de tipografÃas"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:79
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:80
 msgid "Full Nam_e:"
 msgstr "Nombre _completo:"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:82
 msgid "HTML Messages"
 msgstr "Correos HTML"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:83
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:84
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer asÃ
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:85
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"If the server uses a non-standard port then specify the server address as "
-"\"server-name:port-number\""
-msgstr ""
-"Si el servidor usa un puerto no estÃ¡ndar especifique la direcciÃ³n del "
-"servidor como Â«nombre-del-servidor:nÃºmero-del-puertoÂ»"
-
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:88
 msgid "KB"
 msgstr "Kib"
 
-#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:89 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:90
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "ConfiguraciÃ³n del correo"
-
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:91
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:92 ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
+#: ../mail/mail-config.glade.h:93
 msgid "Mailbox location"
 msgstr "DirecciÃ³n del buzÃ³n"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:94
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:95
 msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
-#: ../mail/mail-config.glade.h:112
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"Nota: El guiÃ³n bajo en el nombre de la etiqueta se usa como un identificador "
-"mnemÃ³nico en el menÃº."
-
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:96
 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:114
+#: ../mail/mail-config.glade.h:97
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Esta opciÃ³n se omitirÃ¡ si se encuentra alguna coincidencia para una cabecera "
 "de SPAM personalizada."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:98
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:99
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:100
 msgid "Pass_word:"
 msgstr "_ContraseÃ±a:"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please configure the following account settings."
-msgstr "Configure las siguientes opciones de la cuenta."
-
-#: ../mail/mail-config.glade.h:120
-msgid ""
-"Please enter a descriptive name for this account in the space below. This "
-"name will be used for display purposes only."
-msgstr ""
-"Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo. "
-"Este nombre se usarÃ¡ sÃ³lo para mostrarlo."
-
-#: ../mail/mail-config.glade.h:121
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Por favor escriba debajo la informaciÃ³n acerca de cÃ³mo enviarÃ¡ su correo. Si "
-"no estÃ¡ seguro, pregÃºntele a su administrador de sistemas o a su Proveedor "
-"de Servicios de Internet."
-
-#: ../mail/mail-config.glade.h:122
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Por favor escriba debajo su nombre y direcciÃ³n de correo-e. Los campos "
-"Â«opcionalesÂ» no hace falta que los rellene, a menos que quiera incluir esta "
-"informaciÃ³n en el correo-e que envÃe."
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:102
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:103
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al enviar mensajes que tan sÃ³lo tengan definido el _Cco"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:104
 msgid "Re_member password"
 msgstr "_Recordar contraseÃ±a"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:105
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:107
 msgid "Remember _password"
 msgstr "Recordar _contraseÃ±a"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:108
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sÃ³lo en libretas de direcciones locales"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:109
 msgid "S_elect..."
 msgstr "S_eleccionarâ?¦"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:110
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:111
 msgid "S_tandard Font:"
 msgstr "TipografÃa _estÃ¡ndar:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:113
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:114
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:115
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:116
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:117
 msgid "Sending Mail"
 msgstr "EnvÃo de correo"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:118
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:119
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:120
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:121
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:122
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:123
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "Tabla de firmas"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:124
 msgid "Spell Checking"
 msgstr "OrtografÃa"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:125
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:126
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:127
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13827,15 +12657,20 @@ msgstr ""
 "La lista de idiomas de aquÃ refleja Ãºnicamente los idiomas para los cuÃ¡les "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:128
+#, fuzzy
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used for display purposes only."
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 "La salida de este script se usarÃ¡ como su firma. El nombre que especifique "
 "se usarÃ¡ Ãºnicamente para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13843,155 +12678,147 @@ msgstr ""
 "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 "Por ejemplo: Â«TrabajoÂ» o Â«PersonalÂ»"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:133
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:134
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
+#: ../mail/mail-config.glade.h:135 ../plugins/caldav/caldav-source.c:405
 #: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:136
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: ../mail/mail-config.glade.h:159
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Bienvenido al asistente de configuraciÃ³n de correo de Evolution.\n"
-"\n"
-"Pulse Â«AdelanteÂ» para comenzar. "
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:137
 msgid "_Add Signature"
 msgstr "_AÃ±adir firma"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:138
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imÃ¡genes desde Internet"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:139
 msgid "_Default junk plugin:"
 msgstr "Complemento SPAM pre_determinado:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:140
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "No _firmar las solicitudes de reuniÃ³n (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:142
 msgid "_Forward style:"
 msgstr "_Estilo de reenvÃo:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:143
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:144
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imÃ¡genes en los correo de mis contactos"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:145
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃ³lo en la libreta de direcciones local"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:146
 msgid "_Make this my default account"
 msgstr "_Hacer que Ã©sta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:147
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual del proxy:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:148
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leÃdos tras"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:150
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imÃ¡genes desde Internet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:151
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:152
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:153
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al enviar mensajes con el asunto vacÃo"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:154
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:155
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "_Seleccionarâ?¦"
+#: ../mail/mail-config.glade.h:158
+#: ../modules/addressbook/ldap-config.glade.h:39
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:160
 msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del correo-e"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:162
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir las cabeceras Para / Cc / Cco a "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:163
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexiÃ³n segura:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:164
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:168
 msgid "addresses"
 msgstr "direcciones"
 
 # Esta traducciÃ³n debe mantenerse asÃ
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:169
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:170
 msgid "description"
 msgstr "descripciÃ³n"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:171
 msgid "seconds"
 msgstr "segundos"
 
@@ -14027,7 +12854,7 @@ msgstr "Todas las carpetas locales"
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:268
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
@@ -14075,26 +12902,26 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:890
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:572
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:584 ../mail/mail-ops.c:611
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14103,123 +12930,142 @@ msgstr ""
 "No es posible anexar a %s: %s\n"
 "Se anexarÃ¡ a la carpeta local Â«Correo enviadoÂ» en su lugar."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:628
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No es posible anexar a la carpeta local Â«Correo enviadoÂ»: %s"
 
-#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:736 ../mail/mail-ops.c:817
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:746
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:773
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "FallÃ³ al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:775 ../mail/mail-send-recv.c:759
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:777 ../mail/mail-send-recv.c:761
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:889
+#, fuzzy, c-format
+#| msgid "Saving message to folder"
+msgid "Saving message to folder '%s'"
 msgstr "Guardando mensaje en la carpeta"
 
-#: ../mail/mail-ops.c:954
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:966
+#, fuzzy, c-format
+#| msgid "Moving messages to %s"
+msgid "Moving messages to '%s'"
 msgstr "Moviendo mensajes a %s"
 
-#: ../mail/mail-ops.c:954
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:966
+#, fuzzy, c-format
+#| msgid "Copying messages to %s"
+msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a %s"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1075
+#, fuzzy, c-format
+#| msgid "Scanning folders in \"%s\""
+msgid "Scanning folders in '%s'"
+msgstr "Analizando carpetas en Â«%sÂ»"
+
+#: ../mail/mail-ops.c:1183
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1212
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1224
+#, fuzzy, c-format
+#| msgid "Opening folder %s"
+msgid "Opening folder '%s'"
 msgstr "Abriendo carpeta %s"
 
-#: ../mail/mail-ops.c:1277
-#, c-format
-msgid "Retrieving quota information for folder %s"
+#: ../mail/mail-ops.c:1290
+#, fuzzy, c-format
+#| msgid "Retrieving quota information for folder %s"
+msgid "Retrieving quota information for folder '%s'"
 msgstr "Obteniendo la informaciÃ³n de la cuota para la carpeta %s"
 
-#: ../mail/mail-ops.c:1346
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1362
+#, fuzzy, c-format
+#| msgid "Opening store %s"
+msgid "Opening store '%s'"
 msgstr "Abriendo almacÃ©n %s"
 
-#: ../mail/mail-ops.c:1417
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1433
+#, fuzzy, c-format
+#| msgid "Removing folder %s"
+msgid "Removing folder '%s'"
 msgstr "Eliminando carpeta %s"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1551
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1614
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1615
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1669
+#, fuzzy, c-format
+#| msgid "Refreshing folder"
+msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta"
 
-#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1709
+#, fuzzy, c-format
+#| msgid "Expunging folder"
+msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1754
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1755
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
+#: ../mail/mail-ops.c:1833
+#, fuzzy, c-format
+#| msgid "Retrieving message %s"
+msgid "Retrieving message '%s'"
 msgstr "Obteniendo mensaje %s"
 
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1951
 #, 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:2016
+#: ../mail/mail-ops.c:2040
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14228,11 +13074,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2192
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2210 ../mail/mail-ops.c:2218
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14241,134 +13087,123 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2233
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2354
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2378
+#, fuzzy, c-format
+#| msgid "Disconnecting from %s"
+msgid "Disconnecting from '%s'"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2354
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2378
+#, fuzzy, c-format
+#| msgid "Reconnecting to %s"
+msgid "Reconnecting to '%s'"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2474
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta Â«%sÂ» para desconexiÃ³n"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2560
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Cancelandoâ?¦"
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:430
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:443
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:552
 msgid "Updating..."
 msgstr "Actualizandoâ?¦"
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:552 ../mail/mail-send-recv.c:629
 msgid "Waiting..."
 msgstr "Esperandoâ?¦"
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:872
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseÃ±a"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Introduzca contraseÃ±a"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "El usuario cancelÃ³ la operaciÃ³n."
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "_Guardar y cerrar"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "Editar firma"
-
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "Nombre de la _firma"
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:136
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "No es posible crear el directorio spool Â«%sÂ»: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:166
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzÃ³n Â«%sÂ»"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:272
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado: %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:274
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:314
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta invÃ¡lida: Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando carpeta de bÃºsqueda: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando carpetas de bÃºsqueda para Â«%s: %sÂ»"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando carpetas de bÃºsqueda para Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1075
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de bÃºsqueda"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1166
 msgid "New Search Folder"
 msgstr "Carpeta de bÃºsqueda nueva"
 
@@ -14572,81 +13407,65 @@ msgid "Could not save signature file."
 msgstr "No es posible guardar el archivo de firma."
 
 #: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "Â¿Borrar Â«{0}Â»?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "Â¿Desea borrar la cuenta?"
-
-#: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Â¿Borrar los mensajes en la carpeta de bÃºsqueda Â«{0}Â»?"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "Â¿Borrar los mensajes en la carpeta de bÃºsqueda?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "Â¿Desea descartar los cambios?"
-
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "No _borrar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "No borrar"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "No desactivar"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 "Â¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Â¿Quiere marcar todos los mensajes como leÃdos?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Â¿Desea guardar los cambios?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Introduzca la contraseÃ±a."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Error al efectuar operaciÃ³n."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Error mientras estaba {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrÃ¡ recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14654,11 +13473,11 @@ msgstr ""
 "Si borra la carpeta, todo su contenido y el de sus subcarpetas se borrarÃ¡ "
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continÃºa, las cuentas proxy se borrarÃ¡n permanentemente."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14666,11 +13485,11 @@ msgstr ""
 "Si continÃºa, la informaciÃ³n de la cuenta y toda la\n"
 "informaciÃ³n del proxy se borrarÃ¡ permanentemente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continÃºa, la informaciÃ³n de la cuenta se borrarÃ¡ permanentemente."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14678,19 +13497,23 @@ msgstr ""
 "Si sale, estos mensajes no se enviarÃ¡n hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "AutenticaciÃ³n invÃ¡lida"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:66
+msgid "Mail Deletion Failed"
+msgstr "Ha fallado el borrado del correo"
+
+#: ../mail/mail.error.xml.h:67
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automÃ¡ticamente."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14702,31 +13525,27 @@ msgstr ""
 "listarÃ¡ todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto deberÃa aÃ±adir al menos un destinatario Â«Para:Â» o Â«CC:Â»."
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "Marca todos los mensajes como leÃdos"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningÃºn origen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuraciÃ³n de la cuenta e intÃ©ntelo otra vez."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envÃe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14735,7 +13554,7 @@ msgstr ""
 "Puede buscar direcciones de correo pulsando en el botÃ³n Â«Para:Â» al lado de la "
 "caja de entrada."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14745,65 +13564,61 @@ msgstr ""
 "recibir correo-e en HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:78
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre Ãºnico para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:79
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:80
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo Â«{0}Â»."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "Consultando al servidor"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:81
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se estÃ¡ consultando al servidor por una lista de mecanismos de autenticaciÃ³n "
 "soportados."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:82
 msgid "Read receipt requested."
 msgstr "Se solicitÃ³ una notificaciÃ³n de lectura."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:83
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Â¿Seguro que quiere borrar la carpeta Â«{0}Â» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:84
 msgid "Report Junk Failed"
 msgstr "FallÃ³ al informe de que es SPAM"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:85
 msgid "Report Not Junk Failed"
 msgstr "FallÃ³ al informar de que no es SPAM"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de bÃºsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Enviar confirmaciÃ³n"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:89
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:90
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Â¿Sincronizar las carpetas localmente para usarse sin conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14811,7 +13626,7 @@ msgstr ""
 "Evolution requiere las carpetas de sistema para funcionar correctamente y no "
 "pueden renombrarse, moverse o borrarse."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14827,7 +13642,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, deberÃa aÃ±adir al menos un "
 "destinatario a Para: o Cc: "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14841,7 +13656,7 @@ msgstr ""
 "    Â«{1}Â» \n"
 "Y se han actualizado."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14855,11 +13670,11 @@ msgstr ""
 "    Â«{1}Â»\n"
 "Y se han actualizado."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:105
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14868,7 +13683,7 @@ msgstr ""
 "vaya al editor de carpetas de bÃºsqueda para aÃ±adirla explÃcitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14876,13 +13691,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligiÃ³ enviar no "
 "estÃ¡ activada"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Este mensaje no puede enviarse porque no ha especificado ningÃºn destinatario"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14890,11 +13705,11 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticaciÃ³n requerido y quizÃ¡ no "
 "soporte ningÃºn tipo de autenticaciÃ³n."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:111
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14902,11 +13717,11 @@ msgstr ""
 "Esto marcarÃ¡ todos los mensajes como leÃdos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14914,19 +13729,19 @@ msgstr ""
 "No es posible abrir la carpeta de borradores para esta cuenta. Â¿Quiere usar "
 "la carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Use default drafts folder?"
 msgstr "Â¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14936,27 +13751,31 @@ msgstr ""
 "actual de una de sus carpetas locales o remotas.\n"
 "Â¿Quiere borrar estos mensajes?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:120
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "No tiene suficientes permisos para borrar este correo."
+
+#: ../mail/mail.error.xml.h:121
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la informaciÃ³n requerida."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, Â¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:123
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:124
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de bÃºsqueda."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:125
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14966,102 +13785,111 @@ msgstr ""
 "HÃ¡galo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:128
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Su inicio de sesiÃ³n en su servidor Â«{0}Â» como Â«{0}Â» fallÃ³."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:129
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:130
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:131
 msgid "_Do not Synchronize"
 msgstr "_No sincronizar"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:132
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "_Empty Trash"
+msgstr "_Vaciar papelera"
+
+#: ../mail/mail.error.xml.h:133
 msgid "_Expunge"
 msgstr "C_ompactar"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:134
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1068
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1069
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1070
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1071
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1072
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1073
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensajes"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1077
 msgid "Lowest"
 msgstr "La mÃ¡s baja"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1078
 msgid "Lower"
 msgstr "MÃ¡s baja"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1082
 msgid "Higher"
 msgstr "MÃ¡s alta"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1083
 msgid "Highest"
 msgstr "La mÃ¡s alta"
 
-#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1728
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1740
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1748
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1750
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
+#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:534
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
+#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4578
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15069,7 +13897,7 @@ msgstr ""
 "NingÃºn mensaje satisface su criterio de bÃºsqueda. Limpie el criterio de "
 "selecciÃ³n con el elemento del menÃº Buscar->Limpiar o cÃ¡mbielo."
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4580
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -15077,7 +13905,7 @@ msgstr ""
 "SÃ³lo hay mensajes ocultos en esta carpeta. Use Ver->Mostrar mensajes ocultos "
 "para mostrarlos."
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4582
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -15106,7 +13934,6 @@ msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "TamaÃ±o"
@@ -15131,7 +13958,7 @@ msgstr "Seguimiento"
 msgid "For Your Information"
 msgstr "Para su informaciÃ³n"
 
-#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -15139,11 +13966,7 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "Responder"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
+#: ../mail/message-tag-followup.c:63
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -15152,22 +13975,27 @@ msgid "Review"
 msgstr "Revisar"
 
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1457
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1478
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
@@ -15175,13 +14003,2385 @@ msgstr "El asunto contiene"
 msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "El asunto o el destinatarios contiene"
+#: ../modules/addressbook/addressbook-config.c:212
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que Evolution sÃ³lo conectarÃ¡ con su "
+"servidor LDAP si su servidor LDAP soporta SSL."
+
+#: ../modules/addressbook/addressbook-config.c:214
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que Evolution sÃ³lo conectarÃ¡ con su "
+"servidor LDAP si su servidor LDAP soporta TLS."
+
+#: ../modules/addressbook/addressbook-config.c:216
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que su servidor no soporta ni SSL ni TLS. "
+"Esto significa que su conexiÃ³n serÃ¡ insegura, y que usted serÃ¡ vulnerable a "
+"fallos de seguridad."
+
+#: ../modules/addressbook/addressbook-config.c:341
+msgid "Base"
+msgstr "Base"
+
+#: ../modules/addressbook/addressbook-config.c:638
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "CumpleaÃ±os y aniversarios"
+
+#: ../modules/addressbook/addressbook-config.c:674
+msgid "Copy _book content locally for offline operation"
+msgstr "Copiar la li_breta localmente para trabajar desconectado"
+
+#: ../modules/addressbook/addressbook-config.c:785
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Este es el puerto del servidor LDAP al que Evolution intentarÃ¡ conectarse. "
+"Se ha proporcionado una lista de puertos estÃ¡ndar. Pregunte a su "
+"administrador del sistema quÃ© puerto deberÃa especificar."
+
+#: ../modules/addressbook/addressbook-config.c:863
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Este es el mÃ©todo que usarÃ¡ Evolution para autenticarle a usted.  Note que "
+"establecer esto a Â«DirecciÃ³n de correo-eÂ» requiere acceso anÃ³nimo a su "
+"servidor ldap."
+
+#: ../modules/addressbook/addressbook-config.c:942
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"El Ã¡mbito de bÃºsqueda define hasta quÃ© profundidad desea que la bÃºsqueda se "
+"extienda a lo largo de un Ã¡rbol de directorios. Un Ã¡mbito de bÃºsqueda de "
+"Â«subÂ» incluirÃ¡ todas las entradas por debajo de su base de bÃºsqueda. Un "
+"Ã¡mbito de Â«unoÂ» sÃ³lo incluirÃ¡ las entradas un nivel bajo su base."
+
+#: ../modules/addressbook/addressbook-config.c:1052
+msgid "Server Information"
+msgstr "InformaciÃ³n del servidor"
+
+#: ../modules/addressbook/addressbook-config.c:1054
+msgid "Authentication"
+msgstr "AutenticaciÃ³n"
+
+#: ../modules/addressbook/addressbook-config.c:1057
+#: ../modules/addressbook/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Detalles"
+
+#: ../modules/addressbook/addressbook-config.c:1058
+msgid "Searching"
+msgstr "BÃºsqueda"
+
+#: ../modules/addressbook/addressbook-config.c:1060
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../modules/addressbook/addressbook-config.c:1270
+#: ../modules/addressbook/ldap-config.glade.h:9
+msgid "Address Book Properties"
+msgstr "Propiedades de la libreta de direcciones"
+
+#: ../modules/addressbook/addressbook-config.c:1272
+msgid "New Address Book"
+msgstr "Libreta de direcciones nueva"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Longitud del autocompletado"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+#| msgid "Contact Print Test"
+msgid "Contact layout style"
+msgstr "Prueba de impresiÃ³n de contactos"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+#| msgid "Month view vertical pane position"
+msgid "Contact preview pane position (vertical)"
+msgstr "PosiciÃ³n del panel vertical en la vista mensual"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "XML EFolderList para la lista de URI de completado"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "XML EFolderList para la lista de URI de completado."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar el nombre autocompletado con la direcciÃ³n"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"El nÃºmero de caracteres que deben teclearse antes de que Evolution intente "
+"autocompletar."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+"URI para la carpeta usada por Ãºltima vez en el diÃ¡logo de selecciÃ³n de "
+"nombres"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+"URI para la carpeta usada por Ãºltima vez en el diÃ¡logo de selecciÃ³n de "
+"nombres."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Indica si se debe forzar el mostrado de la direcciÃ³n de corre-e con el "
+"nombre autocompletado del contacto en la entrada."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Indica si se muestra el panel de vista previa."
+
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Formato de la fecha y hora"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1147
+msgid "Table column:"
+msgstr "Columna de tabla:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Autocompletado"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "_Siempre mostrar la direcciÃ³n del contacto autocompletado"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "En servidores LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
+msgid "Create a new contact"
+msgstr "Crea un contacto nuevo"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Lista de contactos"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
+msgid "Create a new contact list"
+msgstr "Crea una lista de contactos nueva"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Libreta de _direcciones"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:619
+msgid "Create a new address book"
+msgstr "Crea una libreta de direcciones nueva"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:759
+#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-task-shell-backend.c:593
+#, fuzzy
+#| msgid "Source"
+msgid "Source List"
+msgstr "Fuente"
+
+#: ../modules/addressbook/e-book-shell-backend.c:597
+#, fuzzy
+#| msgid "Couldn't get list of address books"
+msgid "The registry of address books"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
+
+#: ../modules/addressbook/e-book-shell-content.c:313
+#, fuzzy
+#| msgid "_Current View"
+msgid "Current View"
+msgstr "Vista act_ual"
+
+#: ../modules/addressbook/e-book-shell-content.c:314
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:323
+#, fuzzy
+#| msgid "New Contact"
+msgid "Previewed Contact"
+msgstr "Contacto nuevo"
+
+#: ../modules/addressbook/e-book-shell-content.c:324
+#, fuzzy
+#| msgid "Whether to show the preview pane."
+msgid "The contact being shown in the preview pane"
+msgstr "Indica si se muestra el panel de vista previa."
+
+#: ../modules/addressbook/e-book-shell-content.c:333
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:630
+#: ../modules/mail/e-mail-shell-content.c:725
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Preview is Visible"
+msgstr "La barra lateral es visible"
+
+#: ../modules/addressbook/e-book-shell-content.c:334
+#: ../modules/calendar/e-memo-shell-content.c:608
+#: ../modules/calendar/e-task-shell-content.c:631
+#: ../modules/mail/e-mail-shell-content.c:726
+#, fuzzy
+#| msgid "Whether to show the preview pane."
+msgid "Whether the preview pane is visible"
+msgstr "Indica si se muestra el panel de vista previa."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1106
+msgid "Migrating..."
+msgstr "Migrandoâ?¦"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1179
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando Â«%sÂ»:"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "Servidores LDAP"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "ConfiguraciÃ³n de autocompletado"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquÃa de las carpetas de contactos de Evolution ha cambiado "
+"desde Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formato de los contactos de listas de correo ha cambiado.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"La forma en que Evolution almacena algunos nÃºmeros de telÃ©fono ha cambiado.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Los archivos del registro de cambios y los mapas Palm Sync de Evolution han "
+"cambiado.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus datos Pilot Syncâ?¦"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:173
+#: ../modules/calendar/e-cal-shell-sidebar.c:561
+#: ../modules/calendar/e-memo-shell-sidebar.c:528
+#: ../modules/calendar/e-task-shell-sidebar.c:526
+#, fuzzy
+#| msgid "Memo Source Selector"
+msgid "Source Selector Widget"
+msgstr "Selector de origen de notas"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:174
+#, fuzzy
+#| msgid "Couldn't get list of address books"
+msgid "This widget displays groups of address books"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:596
+msgid "Co_py All Contacts To..."
+msgstr "Co_piar todos los contactos aâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:598
+#, fuzzy
+#| msgid "Copy the contacts of the selected folder into another folder"
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copiar el contenido de la carpeta seleccionada en otra carpeta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:603
+msgid "Del_ete Address Book"
+msgstr "_Borrar la libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:605
+#, fuzzy
+#| msgid "Delete the selected folder"
+msgid "Delete the selected address book"
+msgstr "Borrar las carpeta seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:610
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ver todos los contactos aâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:612
+#, fuzzy
+#| msgid "Move the contacts of the selected folder into another folder"
+msgid "Move the contacts of the selected address book to another"
+msgstr "Mover los contactos de la carpeta seleccionada a otra carpeta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:617
+msgid "_New Address Book"
+msgstr "Libreta de direcciones _nueva"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:624
+msgid "Address _Book Properties"
+msgstr "Propiedades de la _libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:626
+#, fuzzy
+#| msgid "Change the properties of the selected folder"
+msgid "Show properties of the selected address book"
+msgstr "Cambia las propiedades de la carpeta seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1242
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
+msgid "_Rename..."
+msgstr "_Renombrarâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:633
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected address book"
+msgstr "Renombrar la carpeta seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:638
+#, fuzzy
+#| msgid "S_ave Address Book As VCard"
+msgid "S_ave Address Book as vCard"
+msgstr "G_uardar la libreta de direcciones como VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:640
+#, fuzzy
+#| msgid "Save the contacts of the selected folder as VCard"
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Guarda los contactos de la carpeta seleccionada como VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:647
+#, fuzzy
+#| msgid "Stop Loading"
+msgid "Stop loading"
+msgstr "Parar la carga"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+msgid "Copy the selection"
+msgstr "Copiar la selecciÃ³n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+msgid "Cut the selection"
+msgstr "Cortar la selecciÃ³n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+msgid "Paste the clipboard"
+msgstr "Pega el contenido del porta papeles"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#, fuzzy
+#| msgid "_Copy Contact to..."
+msgid "_Copy Contact To..."
+msgstr "_Copiar contacto aâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:675
+#, fuzzy
+#| msgid "Copy selected contacts to another folder"
+msgid "Copy selected contacts to another address book"
+msgstr "Copiar los contactos seleccionados a otra carpeta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
+msgid "_Delete Contact"
+msgstr "_Borrar contacto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
+msgid "Delete selected contacts"
+msgstr "Borrar los contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "_Forward Contact..."
+msgstr "_Reenviar contactoâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
+msgid "Send selected contacts to another person"
+msgstr "Enviar los contactos seleccionados a otra persona"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#, fuzzy
+#| msgid "_Move Contact to..."
+msgid "_Move Contact To..."
+msgstr "_Mover contacto aâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#, fuzzy
+#| msgid "Move selected contacts to another folder"
+msgid "Move selected contacts to another address book"
+msgstr "Mover los contactos seleccionados a otra carpeta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
+msgid "_New Contact..."
+msgstr "Contacto _nuevoâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+msgid "New Contact _List..."
+msgstr "_Lista de contactos nuevaâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+msgid "_Open"
+msgstr "_Abrir"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
+msgid "View the current contact"
+msgstr "Ver el contacto actual"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
+#, fuzzy
+#| msgid "Save selected contacts as a VCard"
+msgid "Save selected contacts as a vCard"
+msgstr "Guardar los contactos seleccionados en una VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
+msgid "Select all contacts"
+msgstr "Seleccionar todos los contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+msgid "_Send Message to Contact..."
+msgstr "Enviar _mensaje al contactoâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
+msgid "Send a message to the selected contacts"
+msgstr "Enviar un mensaje a los contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:827
+msgid "_Actions"
+msgstr "A_cciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:834
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
+msgid "_Preview"
+msgstr "Vista _previa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+msgid "_Delete"
+msgstr "_Borrar"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+msgid "_Properties"
+msgstr "_Propiedades"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
+msgid "_Save as vCard..."
+msgstr "G_uardar como vCardâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Contact _Preview"
+msgstr "Vista _previa de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
+msgid "Show contact preview window"
+msgstr "Mostrar una ventana de vista previa de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "_Classic View"
+msgstr "Vista _clÃ¡sica"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show contact preview below the contact list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "_Vertical View"
+msgstr "Vista _vertical"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#, fuzzy
+#| msgid "Show contact preview window"
+msgid "Show contact preview alongside the contact list"
+msgstr "Mostrar una ventana de vista previa de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:956
+msgid "Any Category"
+msgstr "Cualquier categorÃa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1569
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:991
+msgid "Unmatched"
+msgstr "No coincidente"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+msgid "Print selected contacts"
+msgstr "Imprimir los contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#, fuzzy
+#| msgid "Previews the contacts to be printed"
+msgid "Preview the contacts to be printed"
+msgstr "Previsualizar los contactos que imprimir"
+
+#: ../modules/addressbook/e-book-shell-view.c:322
+msgid "_Forward Contacts"
+msgstr "_Reenviar contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:324
+msgid "_Forward Contact"
+msgstr "_Reenviar contacto"
+
+#: ../modules/addressbook/e-book-shell-view.c:355
+#, fuzzy
+#| msgid "Send _Message to Contacts"
+msgid "_Send Message to Contacts"
+msgstr "Enviar un _mensaje a los contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:357
+#, fuzzy
+#| msgid "Send _Message to List"
+msgid "_Send Message to List"
+msgstr "Enviar un _mensaje a la lista"
+
+#: ../modules/addressbook/e-book-shell-view.c:359
+#, fuzzy
+#| msgid "Send _Message to Contact"
+msgid "_Send Message to Contact"
+msgstr "Enviar un _mensaje al contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:139
+msgid "Multiple vCards"
+msgstr "vCards mÃºltiples"
+
+#: ../modules/addressbook/eab-composer-util.c:147
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard para %s"
+
+#: ../modules/addressbook/eab-composer-util.c:159
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information"
+msgstr "InformaciÃ³n de contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:188
+#, c-format
+msgid "Contact information for %s"
+msgstr "InformaciÃ³n de contacto de %s"
+
+#: ../modules/addressbook/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
+
+#: ../modules/addressbook/ldap-config.glade.h:5
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>AutenticaciÃ³n</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Descarga</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>BÃºsqueda</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:10
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"AnÃ³nimamente\n"
+"Usando direcciÃ³n de correo-e\n"
+"Usando nombre distinguido (DN)"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar esta libreta hasta llegar al final"
+
+#: ../modules/addressbook/ldap-config.glade.h:16
+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."
+
+#: ../modules/addressbook/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "_Inicio de sesiÃ³n:"
+
+#: ../modules/addressbook/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Uno\n"
+"Sub"
+
+#: ../modules/addressbook/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"Cifrado SSL\n"
+"Cifrado TLS\n"
+"Sin cifrado"
+
+#: ../modules/addressbook/ldap-config.glade.h:24
+msgid "Search Filter"
+msgstr "Filtro de bÃºsqueda"
+
+#: ../modules/addressbook/ldap-config.glade.h:25
+msgid "Search _base:"
+msgstr "_Base de bÃºsqueda:"
+
+#: ../modules/addressbook/ldap-config.glade.h:26
+msgid "Search _filter:"
+msgstr "_Filtro de bÃºsqueda:"
+
+#: ../modules/addressbook/ldap-config.glade.h:27
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"El filtro de bÃºsqueda es el tipo de los objetos que buscar. Si no se "
+"modifica, la bÃºsqueda predeterminada se realizarÃ¡ sobre la clase de objetos "
+"de tipo Â«personÂ»."
+
+#: ../modules/addressbook/ldap-config.glade.h:28
+msgid "Supported Search Bases"
+msgstr "Bases de bÃºsqueda soportadas"
+
+#: ../modules/addressbook/ldap-config.glade.h:29
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"La base de BÃºsqueda es el nombre distintivo (ND) de la entrada donde las "
+"bÃºsquedas empezarÃ¡n. Si deja esto en blanco, la bÃºsqueda empezarÃ¡ en la raÃz "
+"del Ã¡rbol de directorios."
+
+#: ../modules/addressbook/ldap-config.glade.h:30
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Este es el nombre completo del servidor LDAP. Por ejemplo, Â«ldap.miempresa."
+"comÂ»."
+
+#: ../modules/addressbook/ldap-config.glade.h:31
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Este es el mÃ¡ximo nÃºmero de entradas para descargar.  Si pone este nÃºmero "
+"demasiado alto ralentizarÃ¡ su libreta de direcciones."
+
+#: ../modules/addressbook/ldap-config.glade.h:32
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Este nombre que identificarÃ¡ este servidor en la lista de carpetas de "
+"Evolution. Es sÃ³lo para poder mostrarlo en pantalla. "
+
+#: ../modules/addressbook/ldap-config.glade.h:33
+msgid "_Download limit:"
+msgstr "LÃmite de _descarga:"
+
+#: ../modules/addressbook/ldap-config.glade.h:34
+msgid "_Find Possible Search Bases"
+msgstr "_Buscar bases de bÃºsqueda posibles"
+
+#: ../modules/addressbook/ldap-config.glade.h:35
+msgid "_Login method:"
+msgstr "MÃ©todo de _inicio de sesiÃ³n:"
+
+#: ../modules/addressbook/ldap-config.glade.h:37
+msgid "_Port:"
+msgstr "_Puerto:"
+
+#: ../modules/addressbook/ldap-config.glade.h:38
+msgid "_Search scope:"
+msgstr "Ã?_mbito de bÃºsqueda:"
+
+#: ../modules/addressbook/ldap-config.glade.h:40
+msgid "_Timeout:"
+msgstr "_Tiempo de expiraciÃ³n:"
+
+#: ../modules/addressbook/ldap-config.glade.h:41
+msgid "_Use secure connection:"
+msgstr "Usar _conexiÃ³n segura:"
+
+#: ../modules/addressbook/ldap-config.glade.h:42
+msgid "cards"
+msgstr "tarjetas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "I_mportar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "Seleccionar un calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "Seleccionar una lista de tareas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "I_mportar al calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "I_mportar a las tareas"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "En la web"
+
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "MeteorologÃa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "CumpleaÃ±os y aniversarios"
+
+#: ../modules/calendar/e-cal-shell-backend.c:424
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Cita"
+
+#: ../modules/calendar/e-cal-shell-backend.c:426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+msgid "Create a new appointment"
+msgstr "Crea una cita nueva"
+
+#: ../modules/calendar/e-cal-shell-backend.c:431
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Cita para todo el _dÃa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:433
+msgid "Create a new all-day appointment"
+msgstr "Crea una cita nueva para todo el dÃa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:438
+msgctxt "New"
+msgid "M_eeting"
+msgstr "_ReuniÃ³n"
+
+#: ../modules/calendar/e-cal-shell-backend.c:440
+msgid "Create a new meeting request"
+msgstr "Crea una solicitud de reuniÃ³n nueva"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndario"
+
+#: ../modules/calendar/e-cal-shell-backend.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1223
+msgid "Create a new calendar"
+msgstr "Crea un calendario nuevo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:2564
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: ../modules/calendar/e-cal-shell-backend.c:760
+#, fuzzy
+#| msgid "Primary calendar"
+msgid "The registry of calendars"
+msgstr "Calendario primario"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquÃa de las carpetas de calendario de Evolution ha cambiado "
+"desde Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+"No es posible migrar la configuraciÃ³n antigua desde evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "No es posible migrar el calendario Â«%sÂ»"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, fuzzy, c-format
+#| msgid ""
+#| "Error on %s:\n"
+#| " %s"
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Error en %s:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#, fuzzy
+#| msgid "Loading Calendar"
+msgid "Loading calendars"
+msgstr "Cargando calendario"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#, fuzzy
+#| msgid "Calendar Source Selector"
+msgid "Calendar Selector"
+msgstr "Selector de origen del calendario"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:551
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:552
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:562
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#, fuzzy, c-format
+#| msgid "Opening calendar"
+msgid "Opening calendar at %s"
+msgstr "Apertura del calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:304
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Esta operaciÃ³n borrarÃ¡ permanentemente todos los acontecimientos marcados "
+"mÃ¡s antiguos que el tiempo seleccionado. Si continÃºa, no podrÃ¡ recuperar "
+"esos acontecimientos."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
+msgid "Purge events older than"
+msgstr "Purgar acontecimientos anteriores a"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:334
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "dÃas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:551
+#, fuzzy
+#| msgid "Copying items"
+msgid "Copying Items"
+msgstr "Copiando elementos"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:801
+#, fuzzy
+#| msgid "Moving items"
+msgid "Moving Items"
+msgstr "Moviendo elementos"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+msgid "Save As..."
+msgstr "Guardar comoâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1179
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
+msgid "_Copy..."
+msgstr "_Copiarâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1195
+#, fuzzy
+#| msgid "Go back"
+msgid "Go Back"
+msgstr "Retroceder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1202
+#, fuzzy
+#| msgid "Go forward"
+msgid "Go Forward"
+msgstr "Avanzar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+msgid "Select _Today"
+msgstr "Seleccionar _hoy"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1209
+msgid "Select today"
+msgstr "Selecciona hoy"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+msgid "Select _Date"
+msgstr "Seleccionar _fecha"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1216
+msgid "Select a specific date"
+msgstr "Selecciona una fecha especÃfica"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+msgid "_New Calendar"
+msgstr "Calendario _nuevo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-task-shell-view-actions.c:811
+msgid "Purg_e"
+msgstr "Purg_ar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+msgid "Purge old appointments and meetings"
+msgstr "Purgar reuniones y acontecimientos antiguos"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected calendar"
+msgstr "Renombrar la carpeta seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#, fuzzy
+#| msgid "Show _only this Calendar"
+msgid "Show _Only This Calendar"
+msgstr "Mostrar _sÃ³lo este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+msgid "Cop_y to Calendar..."
+msgstr "Cop_iar al calendarioâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+msgid "_Delegate Meeting..."
+msgstr "_Delegar reuniÃ³nâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+msgid "Delete the appointment"
+msgstr "Borra la cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "Delete This _Occurrence"
+msgstr "Borrar esta _repeticiÃ³n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+msgid "Delete this occurrence"
+msgstr "Borrar esta repeticiÃ³n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+msgid "Delete _All Occurrences"
+msgstr "Borrar tod_as las repeticiones"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+msgid "Delete all occurrences"
+msgstr "Borra todas las repeticiones"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#, fuzzy
+#| msgid "New All Day _Event"
+msgid "New All Day _Event..."
+msgstr "Acont_ecimiento nuevo para todo el dÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#, fuzzy
+#| msgid "Create a new all-day appointment"
+msgid "Create a new all day event"
+msgstr "Crea una cita nueva para todo el dÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-memopad.c:307
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+msgid "_Forward as iCalendar..."
+msgstr "Reenviar como i_Calendarâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#, fuzzy
+#| msgid "New _Meeting"
+msgid "New _Meeting..."
+msgstr "_ReuniÃ³n nueva"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting"
+msgstr "Crea una solicitud de reuniÃ³n nueva"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ver al calendarioâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+msgid "New _Appointment..."
+msgstr "_Cita nuevaâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+msgid "Make this Occurrence _Movable"
+msgstr "Hacer esta repeticiÃ³n _movible"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+msgid "_Open Appointment"
+msgstr "_Abrir cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+msgid "View the current appointment"
+msgstr "Ver la cita actual"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+msgid "_Reply"
+msgstr "_Responder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+msgid "_Schedule Meeting..."
+msgstr "_Concertar una reuniÃ³nâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+msgid "Day"
+msgstr "DÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+msgid "Show one day"
+msgstr "Mostrar un dÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "List"
+msgstr "Lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+msgid "Show as list"
+msgstr "Mostrar como una lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+msgid "Month"
+msgstr "Mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+msgid "Show one month"
+msgstr "Mostrar un mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+msgid "Week"
+msgstr "Semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+msgid "Show one week"
+msgstr "Mostrar una semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#, fuzzy
+#| msgid "Show one week"
+msgid "Show one work week"
+msgstr "Mostrar una semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+msgid "Active Appointments"
+msgstr "Citas activas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+msgid "Next 7 Days' Appointments"
+msgstr "Citas de los prÃ³ximos 7 dÃas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-task-shell-view-actions.c:1008
+msgid "Description contains"
+msgstr "La descripciÃ³n contiene"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:1015
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Print this calendar"
+msgstr "Imprime este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+#, fuzzy
+#| msgid "Previews the calendar to be printed"
+msgid "Preview the calendar to be printed"
+msgstr "Previsualiza el calendario a imprimir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+msgid "Go To"
+msgstr "Ir a"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:96
+#, fuzzy
+#| msgid "Deleting selected objects..."
+msgid "Deleting selected memos..."
+msgstr "Borrando los objetos seleccionadosâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:576
+msgid "Copy selected memo"
+msgstr "Copia la nota seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:288
+#: ../modules/calendar/e-memo-shell-view-actions.c:583
+msgid "Cut selected memo"
+msgstr "Corta la nota seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-memo-shell-view-actions.c:590
+msgid "Paste memo from the clipboard"
+msgstr "Pegar notas desde el portapapeles"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "_Delete Memo"
+msgstr "_Borrar el mensaje"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:302
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
+msgid "Delete selected memos"
+msgstr "Borra las notas seleccionadas"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:314
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#, fuzzy
+#| msgid "New memo"
+msgid "New _Memo"
+msgstr "Nota nueva"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:316
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:653
+msgid "Create a new memo"
+msgstr "Crea una nota nueva"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:321
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
+msgid "_Open Memo"
+msgstr "_Abrir nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+msgid "View the selected memo"
+msgstr "Ver la nota seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:328
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:416
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "Open _Web Page"
+msgstr "Abrir pÃ¡gina _web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:347
+#: ../modules/calendar/e-memo-shell-view-actions.c:841
+#, fuzzy
+#| msgid "View the selected memo"
+msgid "Print the selected memo"
+msgstr "Ver la nota seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:429
+#: ../modules/calendar/e-memo-shell-view.c:223
+#, fuzzy
+#| msgid "Delegate To"
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "Delegar en"
+msgstr[1] "Delegar en"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:127
+#, fuzzy
+#| msgid "Deleting selected objects..."
+msgid "Deleting selected tasks..."
+msgstr "Borrando los objetos seleccionadosâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:692
+msgid "_Assign Task"
+msgstr "_Asignar tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Copy selected tasks"
+msgstr "Copia las tareas seleccionadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "Cut selected tasks"
+msgstr "Corta las tareas seleccionadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:369
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "Paste tasks from the clipboard"
+msgstr "Pega las tareas del portapapeles"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
+#: ../modules/calendar/e-task-shell-view-actions.c:720
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Delete Task"
+msgstr "_Borrar"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:376
+#: ../modules/calendar/e-task-shell-view-actions.c:722
+msgid "Delete selected tasks"
+msgstr "Borra las tareas seleccionadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:388
+#: ../modules/calendar/e-task-shell-view-actions.c:776
+msgid "_Mark as Complete"
+msgstr "_Marcar como terminado"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:390
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "Mark selected tasks as complete"
+msgstr "Marcar tareas seleccionadas como terminadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:395
+msgid "_Mark as Incomplete"
+msgstr "_Marcar como incompleto"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:397
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+#, fuzzy
+#| msgid "Mark selected tasks as complete"
+msgid "Mark selected tasks as incomplete"
+msgstr "Marcar tareas seleccionadas como terminadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:402
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+msgid "New _Task"
+msgstr "_Tarea nueva"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:404
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "Create a new task"
+msgstr "Crea una tarea nueva"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:409
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "_Open Task"
+msgstr "_Abrir tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:411
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+msgid "View the selected task"
+msgstr "Ver la tarea seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:423
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-task-shell-view-actions.c:818
+#, fuzzy
+#| msgid "_Forward as iCalendar..."
+msgid "_Save as iCalendar..."
+msgstr "Reenviar como i_Calendarâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:435
+#: ../modules/calendar/e-task-shell-view-actions.c:1041
+#, fuzzy
+#| msgid "View the selected task"
+msgid "Print the selected task"
+msgstr "Ver la tarea seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:540
+#: ../modules/calendar/e-task-shell-view.c:350
+#, fuzzy
+#| msgid "Delegate To"
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "Delegar en"
+msgstr[1] "Delegar en"
+
+#: ../modules/calendar/e-memo-shell-backend.c:316
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_Nota"
+
+#: ../modules/calendar/e-memo-shell-backend.c:323
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Nota _compartida"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#, fuzzy
+#| msgid "Create a shared new memo"
+msgid "Create a new shared memo"
+msgstr "Crea una nota compartida nueva"
+
+#: ../modules/calendar/e-memo-shell-backend.c:333
+#, fuzzy
+#| msgid "Memo List"
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Lista de notas"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
+msgid "Create a new memo list"
+msgstr "Crea una lista de notas nueva"
+
+#: ../modules/calendar/e-memo-shell-backend.c:584
+#, fuzzy
+#| msgid "Primary memo list"
+msgid "The registry of memo lists"
+msgstr "Lista de notas primaria"
+
+#: ../modules/calendar/e-memo-shell-content.c:598
+#, fuzzy
+#| msgid "Table model"
+msgid "The memo table model"
+msgstr "Modelo de la tabla"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "Cargando notas"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#, fuzzy
+#| msgid "Memo Source Selector"
+msgid "Memo List Selector"
+msgstr "Selector de origen de notas"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:529
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Abriendo notas en %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+msgid "Print Memos"
+msgstr "Imprimir notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+msgid "_New Memo List"
+msgstr "Lista de notas _nueva"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected memo list"
+msgstr "Renombrar la carpeta seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#, fuzzy
+#| msgid "Show _only this Memo List"
+msgid "Show _Only This Memo List"
+msgstr "Mostrar _sÃ³lo esta lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:746
+#, fuzzy
+#| msgid "_Preview"
+msgid "Memo _Preview"
+msgstr "Vista _previa"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show memo preview pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:769
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview below the memo list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:776
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview alongside the memo list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:827
+msgid "Print the list of memos"
+msgstr "Imprime la lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#, fuzzy
+#| msgid "Previews the list of memos to be printed"
+msgid "Preview the list of memos to be printed"
+msgstr "Vista previa de la lista de notas a imprimir"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:412
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d nota"
+msgstr[1] "%d notas"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-task-shell-view-private.c:510
+#, fuzzy, c-format
+#| msgid ", %d selected"
+#| msgid_plural ", %d selected"
+msgid "%d selected"
+msgstr ", %d seleccionado"
+
+#: ../modules/calendar/e-memo-shell-view.c:221
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "Delete Memos"
+msgstr "_Borrar el mensaje"
+
+#: ../modules/calendar/e-task-shell-backend.c:320
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarea"
+
+#: ../modules/calendar/e-task-shell-backend.c:327
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tarea _asignada"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgid "Create a new assigned task"
+msgstr "Crea una tarea nueva asignada"
+
+#: ../modules/calendar/e-task-shell-backend.c:337
+#, fuzzy
+#| msgid "Task List"
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Lista de tareas"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgid "Create a new task list"
+msgstr "Crea una lista de tareas nueva"
+
+#: ../modules/calendar/e-task-shell-backend.c:594
+#, fuzzy
+#| msgid "Primary task list"
+msgid "The registry of task lists"
+msgstr "Lista de tareas primaria"
+
+#: ../modules/calendar/e-task-shell-content.c:621
+#, fuzzy
+#| msgid "Table model"
+msgid "The task table model"
+msgstr "Modelo de la tabla"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquÃa de las carpetas de tareas de Evolution ha cambiado "
+"desde Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "No es posible migrar las tareas en Â«%sÂ»"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:183
+msgid "Loading tasks"
+msgstr "Cargando tareas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+#, fuzzy
+#| msgid "Task Source Selector"
+msgid "Task List Selector"
+msgstr "Selector de origen de tareas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:527
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:680
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Abriendo tareas en %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+msgid "Print Tasks"
+msgstr "Imprimir tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:570
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"Esta operaciÃ³n borrarÃ¡ permanentemente todos las tareas marcados como "
+"terminadas. Si continÃºa, no podrÃ¡ recuperar esas tareas.\n"
+"\n"
+"Â¿Borrar realmente esas tareas?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+#, fuzzy
+#| msgid "_Copy..."
+msgid "Copy..."
+msgstr "_Copiarâ?¦"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "_New Task List"
+msgstr "Lista de tareas _nueva"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected task list"
+msgstr "Renombrar la carpeta seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+#, fuzzy
+#| msgid "Show _only this Task List"
+msgid "Show _Only This Task List"
+msgstr "Mostrar _sÃ³lo esta lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+#, fuzzy
+#| msgid "_Mark as Incomplete"
+msgid "Mar_k as Incomplete"
+msgstr "_Marcar como incompleto"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "Delete completed tasks"
+msgstr "Borra las tareas terminadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+msgid "Task _Preview"
+msgstr "_Vista previa de tarea"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show task preview pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview below the task list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:941
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview alongside the task list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:949
+msgid "Active Tasks"
+msgstr "Tareas activas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+msgid "Completed Tasks"
+msgstr "Tareas completadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Next 7 Days' Tasks"
+msgstr "Tareas de los prÃ³ximos 7 dÃas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:977
+msgid "Overdue Tasks"
+msgstr "Tareas fuera de plazo"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Tasks with Attachments"
+msgstr "Tareas con adjuntos"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+msgid "Print the list of tasks"
+msgstr "Imprime la lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1034
+#, fuzzy
+#| msgid "Previews the list of tasks to be printed"
+msgid "Preview the list of tasks to be printed"
+msgstr "Vista previa de la lista de tareas a imprimir"
+
+#: ../modules/calendar/e-task-shell-view-private.c:506
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tarea"
+msgstr[1] "%d tareas"
+
+#: ../modules/calendar/e-task-shell-view.c:348
+#, fuzzy
+#| msgid "Completed Tasks"
+msgid "Delete Tasks"
+msgstr "Tareas completadas"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d mensajes adjuntos"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensaje de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "Redacta un mensaje de correo nuevo"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Carpeta de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "Crea una carpeta de correo nueva"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "Preferencias de red"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "To Do"
+msgstr "Tareas pendientes"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:960
+msgid "Later"
+msgstr "MÃ¡s tarde"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1139
+msgid "Migration"
+msgstr "MigraciÃ³n"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1589
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "No es posible crear la carpeta nueva: Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1617
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "No es posible copiar el la carpeta Â«%sÂ» a Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1812
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "No es posible buscar buzones existentes en Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid "Migrating Folders"
+msgstr "Migrando carpetas"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1819
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquÃa de las carpetas de buzones de correo ha cambiado desde "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2022
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "No es posible abrir los datos antiguos POP keep-on-server Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2038
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Fallo al crear directorio de datos POP3 keep-on-server Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2070
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "No es posible copiar los datos POP3 keep-on-server Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2541
+#: ../modules/mail/e-mail-shell-migrate.c:2555
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "No es posible crear el almacÃ©n de correo local Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2916
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formato de resÃºmenes de las carpetas del buzÃ³n de Evolution se ha movido "
+"a sqlite desde Evolution 2.24.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3013
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "No es posible crear las carpetas de correo local en: Â«%sÂ»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3031
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"No es posible leer la configuraciÃ³n de la instalaciÃ³n anterior de Evolution, "
+"Â«evolution/config.xmldbÂ» no existe o estÃ¡ corrompido."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view.c:510
+#, fuzzy
+#| msgid "Disable Account"
+msgid "_Disable Account"
+msgstr "Desactivar cuenta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#, fuzzy
+#| msgid "Disable Account"
+msgid "Disable this account"
+msgstr "Desactivar cuenta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "C_reate Search Folder From Search..."
+msgstr "_Crear una carpeta de bÃºsqueda desde la bÃºsquedaâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "_Download Messages for Offline Usage"
+msgstr "_Descargar mensajes para trabajar sin conexiÃ³n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#, fuzzy
+#| msgid "Download messages of accounts/folders marked for offline"
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "Descargar mensajes para cuentas/carpetas marcadas como sin conexiÃ³n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "Empty _Trash"
+msgstr "_Vaciar papelera"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "Fl_ush Outbox"
+msgstr "Enviar correos pe_ndientes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1074
+msgid "_Copy Folder To..."
+msgstr "_Copiar carpeta aâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
+msgid "Copy the selected folder into another folder"
+msgstr "Copia la carpeta seleccionada en otra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
+msgid "Permanently remove this folder"
+msgstr "Elimina permanentemente esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
+msgid "E_xpunge"
+msgstr "C_ompactar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Mar_k All Messages as Read"
+msgstr "Marcar todos los mensajes como _leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Mark all messages in the folder as read"
+msgstr "Marcar todos los mensajes en la carpeta como leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1102
+msgid "_Move Folder To..."
+msgstr "_Mover carpeta aâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1104
+msgid "Move the selected folder into another folder"
+msgstr "Mueve la carpeta seleccionada a otra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
+msgid "_New..."
+msgstr "_Nuevaâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
+msgid "Create a new folder for storing mail"
+msgstr "Crea una carpeta nueva para almacenar correo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
+msgid "Change the properties of this folder"
+msgstr "Cambia las propiedades de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
+msgid "Refresh the folder"
+msgstr "Actualizar la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1132
+msgid "Change the name of this folder"
+msgstr "Cambia el nombre de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
+msgid "Select _All Messages"
+msgstr "Seleccionar _todos los mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "Select all visible messages"
+msgstr "Selecciona todos los mensajes visibles"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1144
+msgid "Select Message _Thread"
+msgstr "Seleccionar con_versaciÃ³n del mensaje"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Selecciona todos los mensajes en la misma conversaciÃ³n que el mensaje "
+"seleccionado"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
+msgid "Select Message S_ubthread"
+msgstr "Seleccionar s_ubconversaciÃ³n del mensaje"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
+msgid "Select all replies to the currently selected message"
+msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Unsubscribe from the selected folder"
+msgstr "Renombrar la carpeta seleccionada"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1165
+msgid "_New Label"
+msgstr "Etiqueta n_ueva"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1172
+#, fuzzy
+#| msgid "None"
+msgid "N_one"
+msgstr "Ninguno"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1179
+msgid "Hide _Read Messages"
+msgstr "Ocultar mensajes _leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Oculta temporalmente todos los mensajes que han sido leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1186
+msgid "Hide S_elected Messages"
+msgstr "Ocultar mensajes s_eleccionados"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
+msgid "Temporarily hide the selected messages"
+msgstr "Oculta temporalmente los mensajes seleccionados"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1193
+msgid "Show Hidde_n Messages"
+msgstr "_Mostrar mensajes ocultos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
+msgid "Show messages that have been temporarily hidden"
+msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
+msgid "Cancel the current mail operation"
+msgstr "Cancela la operaciÃ³n de correo actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
+msgid "Collapse All _Threads"
+msgstr "_Contraer todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
+msgid "Collapse all message threads"
+msgstr "Contrae todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
+msgid "E_xpand All Threads"
+msgstr "E_xpandir todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
+msgid "Expand all message threads"
+msgstr "Expandir todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
+msgid "_Message Filters"
+msgstr "_Filtros de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
+msgid "Search F_olders"
+msgstr "Carpetas de bÃºsque_da"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#, fuzzy
+#| msgid "Create or edit Search Folder definitions"
+msgid "Create or edit search folder definitions"
+msgstr "Crea o edita definiciones de carpetas de bÃºsqueda"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+msgid "_Subscriptions..."
+msgstr "_Suscripcionesâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "F_older"
+msgstr "_Carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
+msgid "_Label"
+msgstr "Etiq_ueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
+msgid "_New Folder..."
+msgstr "Carpeta _nuevaâ?¦"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
+msgid "Hide _Deleted Messages"
+msgstr "Ocultar mensajes _borrados"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+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"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
+msgid "Show Message _Preview"
+msgstr "Mostrar vista _previa del mensaje"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#, fuzzy
+#| msgid "Show message preview window"
+msgid "Show message preview pane"
+msgstr "Mostrar una ventana de vista previa de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1346
+msgid "_Group By Threads"
+msgstr "A_grupar por conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
+#, fuzzy
+#| msgid "Threaded Message list"
+msgid "Threaded message list"
+msgstr "Lista de mensajes por conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "Show message preview below the message list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show message preview alongside the message list"
+msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
+msgid "All Messages"
+msgstr "Todos los mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
+msgid "Important Messages"
+msgstr "Mensajes importantes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
+msgid "Last 5 Days' Messages"
+msgstr "Mensajes de los Ãºltimos 5 dÃas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
+msgid "Messages Not Junk"
+msgstr "Mensajes que no son SPAM"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
+msgid "Messages with Attachments"
+msgstr "Mensajes con adjuntos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1419
+msgid "No Label"
+msgstr "Sin etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
+msgid "Read Messages"
+msgstr "Mensajes leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
+msgid "Recent Messages"
+msgstr "Mensajes recientes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
+msgid "Unread Messages"
+msgstr "Mensajes no leÃdos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#, fuzzy
+#| msgid "Subject or Addresses contains"
+msgid "Subject or Addresses contain"
+msgstr "El asunto o las direcciones contienen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1495
+msgid "All Accounts"
+msgstr "Todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1502
+msgid "Current Account"
+msgstr "Cuenta actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1509
+msgid "Current Folder"
+msgstr "Carpeta actual"
+
+#: ../modules/mail/e-mail-shell-view-private.c:781
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d seleccionado, "
+msgstr[1] "%d seleccionados, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:792
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d borrado"
+msgstr[1] "%d borrados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:798
+#: ../modules/mail/e-mail-shell-view-private.c:805
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d SPAM"
+msgstr[1] "%d SPAM"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "El asunto o el remitente contiene"
+#: ../modules/mail/e-mail-shell-view-private.c:811
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d borrador"
+msgstr[1] "%d borradores"
+
+#: ../modules/mail/e-mail-shell-view-private.c:817
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d sin enviar"
+msgstr[1] "%d sin enviar"
+
+#: ../modules/mail/e-mail-shell-view-private.c:823
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d enviado"
+msgstr[1] "%d enviados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:835
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d no leÃdo, "
+msgstr[1] "%d no leÃdos, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:838
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d en total"
+msgstr[1] "%d en total"
+
+#: ../modules/mail/e-mail-shell-view.c:508
+msgid "Proxy _Logout"
+msgstr "_Cerrar sesiÃ³n proxy"
+
+#: ../modules/mail/em-composer-prefs.c:478
+msgid "Language(s)"
+msgstr "Idioma(s)"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "Cada vez"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "Una vez por dÃa"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "Una vez por semana"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "Una vez por mes"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "AÃ±adir cabecera de SPAM personalizada"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "Nombre de la cabecera:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "El valor de cabecera contiene:"
+
+#: ../modules/mail/em-mailer-prefs.c:326
+#: ../widgets/table/e-table-click-to-add.c:498
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Cabecera"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "Contiene el valor"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "El complemento %s estÃ¡ disponible y el binario estÃ¡ instalado."
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"El complemento %s no estÃ¡ disponible. Compruebe si el paquete estÃ¡ instalado."
+
+#: ../modules/mail/em-mailer-prefs.c:752
+msgid "No Junk plugin available"
+msgstr "No hay complemento para SPAM disponible"
+
+#: ../modules/mail/em-mailer-prefs.c:1146
+msgid "Date header:"
+msgstr "Cabecera de fecha:"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Pruebas de carga de los complementos Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Complemento de prueba Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Probar el complemento para el cargador Python EPlugin."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -15208,20 +16408,15 @@ msgstr ""
 "el cuerpo de un mensaje."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/templates/templates.c:378
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Recuerdo de adjuntos"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr ""
-"Le recuerda cuando se le olvida aÃ±adir un adjunto a un mensaje de correo."
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -15242,36 +16437,41 @@ msgstr "_AÃ±adir adjuntoâ?¦"
 msgid "_Edit Message"
 msgstr "_Editar mensaje"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+"Le recuerda cuando se le olvida aÃ±adir un adjunto a un mensaje de correo."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
-msgstr "Sonido en lÃnea"
+#, fuzzy
+#| msgid "Inline"
+msgid "Inline Audio"
+msgstr "Incluido en lÃnea"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
+#, fuzzy
+#| msgid "Play audio attachments directly from Evolution."
+msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir adjuntos de sonido directamente en Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:143
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution despuÃ©s del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:198
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution despuÃ©s de la restauraciÃ³n"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "Restaurar desde un respaldo"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:293
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15281,18 +16481,42 @@ msgstr ""
 "todos los correos, calendarios, tareas, notas, libreta de direcciones. "
 "TambiÃ©n restaura su configuraciÃ³n personal, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:300
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:310
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
+#: ../plugins/backup-restore/backup-restore.c:318
+msgid "Restore from backup"
+msgstr "Restaurar desde un respaldo"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "_Backup Settings..."
+msgstr "_Respaldar ajustesâ?¦"
+
+#: ../plugins/backup-restore/backup-restore.c:356
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "Respaldar y restaurar los datos de Evolution y la configuraciÃ³n"
+
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "R_estore Settings..."
+msgstr "R_estaurar ajustesâ?¦"
+
+#: ../plugins/backup-restore/backup-restore.c:363
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Respaldar y restaurar los datos de Evolution y la configuraciÃ³n"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Respaldar el directorio de Evolution"
@@ -15460,52 +16684,40 @@ msgstr ""
 "guardadas antes de proceder. Si quiere que Evolution se reinicie "
 "automÃ¡ticamente despuÃ©s del restaurado, active el botÃ³n conmutador."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "Respaldar y restaurar los datos de Evolution y la configuraciÃ³n"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "R_estaurar ajustesâ?¦"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "_Respaldar ajustesâ?¦"
-
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:617 ../plugins/bbdb/bbdb.c:626
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:641
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear entradas _automÃ¡ticamente en la libreta de direcciones al enviar "
 "correos"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:647
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione la libreta para contactos automÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:662
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensajerÃa instantÃ¡nea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:677
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar informaciÃ³n e imÃ¡genes de contactos desde la lista de contactos "
 "de Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:683
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 "Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:694
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
@@ -15527,28 +16739,33 @@ msgstr ""
 "direcciones de correo-e cuando contesta a los correos. TambiÃ©n rellena la "
 "informaciÃ³n de contacto de MI de su lista de amigos."
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "OcurriÃ³ un error al crear %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "El proceso hijo de Bogofilter no estÃ¡ respondiendo, matÃ¡ndoloâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminandoâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "FallÃ³ la tuberÃa hacia Bogofilter, cÃ³digo de error: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Convertir el texto del correo a _Unicode"
 
@@ -15592,20 +16809,20 @@ msgstr "Usar _SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/calendar-weather/calendar-weather.c:499
 #: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
 #: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-file/calendar-file.c:296
 #: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/calendar-weather/calendar-weather.c:517
 #: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
 msgid "weeks"
 msgstr "semanas"
 
@@ -15617,31 +16834,31 @@ msgstr "AÃ±adir soporte CalDAV a Evolution."
 msgid "CalDAV Support"
 msgstr "Soporte CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-file/calendar-file.c:208
 msgid "_Customize options"
 msgstr "Opciones de personali_zaciÃ³n"
 
-#: ../plugins/calendar-file/calendar-file.c:224
+#: ../plugins/calendar-file/calendar-file.c:227
 msgid "File _name:"
 msgstr "_Nombre del archivo:"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:231
 msgid "Choose calendar file"
 msgstr "Elegir un archivo de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:272
+#: ../plugins/calendar-file/calendar-file.c:279
 msgid "On open"
 msgstr "Al abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:273
+#: ../plugins/calendar-file/calendar-file.c:280
 msgid "On file change"
 msgstr "Al cambiar un archivo"
 
-#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-file/calendar-file.c:281
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:301
+#: ../plugins/calendar-file/calendar-file.c:308
 msgid "Force read _only"
 msgstr "Forzar _sÃ³lo lectura"
 
@@ -15669,55 +16886,55 @@ msgstr "AÃ±adir calendarios web a Evolution."
 msgid "Web Calendars"
 msgstr "Calendarios web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "MeteorologÃa: Niebla"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "MeteorologÃa: Nuboso"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "MeteorologÃa: Noche nubosa"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "MeteorologÃa: Cubierto"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "MeteorologÃa: Chubascos"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "MeteorologÃa: Nieve"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "MeteorologÃa: Soleado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "MeteorologÃa: Noche despejada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "MeteorologÃa: Tormenta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "Seleccione un lugar"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trica (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:605
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, pulgadas, etc)"
 
@@ -15729,14 +16946,6 @@ msgstr "AÃ±adir calendarios meteorolÃ³gicos a Evolution."
 msgid "Weather Calendars"
 msgstr "Calendario meteorolÃ³gico"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "Copy Tool"
-msgstr "Herramienta de copia"
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "Copiar cosas al portapapeles."
-
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar si Evolution es la aplicaciÃ³n de correo predeterminada"
@@ -15761,24 +16970,25 @@ msgstr "Cliente de correo predeterminado"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Â¿Quiere que Evolution sea su cliente de correo predeterminado?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "Marcar como libreta de direcciones pre_determinada"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:119
+#, fuzzy
+#| msgid "Show autocompleted name with an address"
+msgid "A_utocomplete with this address book"
+msgstr "Mostrar el nombre autocompletado con la direcciÃ³n"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_determinado"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "Marcar como lista de tareas pre_determinada"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "Marcar como lista de notas pre_determinada"
 
@@ -15792,36 +17002,51 @@ msgstr ""
 "Marque como predeterminados su libreta de direcciones y calendario "
 "preferidos."
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Lista de cabeceras personalizadas"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"La clave especifica la lista de cabeceras personalizadas que puede aÃ±adir a "
+"un mensaje saliente. El formato para especificar una cabecera y el valor de "
+"la cabecera es: el nombre de la cabecera personalizada seguido de un Â«=Â» y "
+"los valores separados por Â«;Â»."
+
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:334
 msgid "Unclassified"
 msgstr "Sin clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:335
 msgid "Protected"
 msgstr "Protegido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:580
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
+#: ../plugins/email-custom-header/email-custom-header.c:905
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
+#: ../plugins/email-custom-header/email-custom-header.c:916
+#: ../plugins/templates/templates.c:384
 msgid "Values"
 msgstr "Valores"
 
@@ -15835,10 +17060,6 @@ msgstr ""
 "es:\n"
 "Valores clave del nombre de la cabecera personalizada separados por Â«;Â»."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "Cabeceras personalizadas del correo-e"
-
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
@@ -15848,976 +17069,9 @@ msgstr "AÃ±adir una cabecera personalizada a los mensajes salientes."
 msgid "Custom Header"
 msgstr "Cabecera personalizada"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Lista de cabeceras personalizadas"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"La clave especifica la lista de cabeceras personalizadas que puede aÃ±adir a "
-"un mensaje saliente. El formato para especificar una cabecera y el valor de "
-"la cabecera es: el nombre de la cabecera personalizada seguido de un Â«=Â» y "
-"los valores separados por Â«;Â»."
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Abrir la carpeta de otro usuario"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Cuenta:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nombre de la _carpeta:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Usuario:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "ContraseÃ±a segura"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Esta opciÃ³n conectarÃ¡ con el servidor Exchange usando autenticaciÃ³n con "
-"contraseÃ±a segura (NTLM)."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "ContraseÃ±a en texto simple"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Esta opciÃ³n conectarÃ¡ con el servidor Exchange usando autenticaciÃ³n con "
-"contraseÃ±a estÃ¡ndar de texto simple."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "Fuera de la oficina"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"El mensaje especificado abajo se enviarÃ¡ automÃ¡ticamente a cada\n"
-"persona que le envÃe correo mientras estÃ¡ fuera de la oficina."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "Ahora estoy fuera de la oficina"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "Ahora estoy en la oficina"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "Cambie la contraseÃ±a para la cuenta de Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Cambiar contraseÃ±a"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Gestione los ajustes de delegaciones para la cuenta Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "Asistente de delegaciones"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "MiscelÃ¡neo"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "Vea el tamaÃ±o de todas las carpetas Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "TamaÃ±o de las carpetas"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "ConfiguraciÃ³n de Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "URL _OWA:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "A_utenticar"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "El nombre del buzÃ³n es _diferente del nombre de usuario"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "_BuzÃ³n:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "Tipo de _autenticaciÃ³n"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KiB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KiB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "TamaÃ±o:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution estÃ¡ en modo desconectado. No puede crear o modificar carpetas "
-"ahora.\n"
-"Cambie a modo conectado para dichas operaciones."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"La contraseÃ±a actual no coincide con la contraseÃ±a existente para su cuenta. "
-"Introduzca la contraseÃ±a correcta"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "Las dos contraseÃ±as no coinciden. Vuelva a introducir las contraseÃ±as."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Confirme la contraseÃ±a:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ContraseÃ±a actual:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "ContraseÃ±a nueva:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "Su contraseÃ±a actual ha caducado. Cambie su contraseÃ±a ahora."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Su contraseÃ±a caducarÃ¡ en los siguientes %d dÃas"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "Editor (lectura, creaciÃ³n, ediciÃ³n)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "Autor (lectura, creaciÃ³n)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "Revisor (sÃ³lo lectura)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "Permisos de delegados"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "Permisos para %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Este mensaje se enviÃ³ automÃ¡ticamente por Evolution para informarle de que "
-"ha sido designado como delegado. Ahora puede enviar mensajes en mi nombre."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "Se le han otorgado los siguientes permisos sobre mis carpetas:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "TambiÃ©n se le permite ver mis elementos privados."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "No obstante no se le permite ver mis elementos privados."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "Ha sido designado como delegado para %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "Delegar en"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "Â¿Desea quitar el delegado %s?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "No es posible acceder al Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "No es posible encontrarse a sÃ mismo en el Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "No es posible encontrar al delegado %s en el Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "No es posible quitar al delegado %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "No es posible actualizar la lista de delegados."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "No es posible aÃ±adir el delegado %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "Error al leer la lista de delegados."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "_Calendario:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "Co_ntactos:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "Delegados"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"Ninguno\n"
-"Revisor (sÃ³lo lectura)\n"
-"Autor (leer, crear)\n"
-"Editor (leer, crear, editar)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "Permisos para"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"Estos usuarios podrÃ¡n enviar correo por usted y acceder a sus\n"
-"carpetas con los permisos que usted les dÃ©."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "El _delegado puede ver los elementos privados"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "_Bandeja de entrada:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "_Resumir permisos"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "_Tareas:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Permisosâ?¦"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "Nombre de la carpeta"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "TamaÃ±o de la carpeta"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "_Usuario"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Subscribirse a la carpeta de otro usuario"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Ã?rbol de carpetas de Exchange"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "Desuscribirse de la carpetaâ?¦"
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Â¿Seguro que desea desuscribirse de la carpeta Â«%sÂ»?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Desuscribirse de Â«%sÂ»"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Actualmente, su estado es Â«Fuera de la oficinaÂ».</b>\n"
-"\n"
-"Â¿Quiere cambiar su estado a Â«En la oficinaÂ»? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Mensaje para cuando estÃ© fuera de la oficina</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Estado:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>El mensaje especificado abajo se enviarÃ¡ automÃ¡ticamente a cada "
-"persona que le envÃe correo mientras estÃ© fuera de la oficina. </small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Ahora estoy en la oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Ahora no estoy en la oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "No, no cambiar el estado"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Asistente para fuera de la oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "SÃ, cambiar estado"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Alerta de caducidad de contraseÃ±aâ?¦"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "Su contraseÃ±a caducarÃ¡ en 7 dÃasâ?¦"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "_Cambiar contraseÃ±a"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(Permiso denegado.)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "AÃ±adir usuario:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "AÃ±adir usuario"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Permisos</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "No es posible borrar"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "No es posible editar"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Crear elementos"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Crear subcarpetas"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Borrar cualquier elemento"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Borrar los elementos propios"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Editar cualquier elemento"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Editar los elementos propios"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Contacto de la carpeta"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Propietario de la carpeta"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Carpeta visible"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Leer elementos"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Rol: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>ConfiguraciÃ³n del mensaje</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>Opciones de seguimiento</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - Opciones de envÃo"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "_Importacia: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"Normal\n"
-"Alta\n"
-"Baja"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"Normal\n"
-"Personal\n"
-"Privado\n"
-"Confidencial"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "Pedir una confirmaciÃ³n de _entrega para este mensaje"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "Pedir una confirmaciÃ³n de _lectura para este mensaje"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "Enviar como delegado"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "_Sensibilidad: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "_Usuario"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "Seleccionar usuario"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "Libreta de direccionesâ?¦"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Subscribirse a los contactos de otro usuario"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Subscribirse al calendario de otro usuario"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "Activa el paquete de extensiÃ³n de Evolution Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Operaciones de Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
-"No se puede acceder a la solapa Â«ConfiguraciÃ³n de ExchangeÂ» en modo "
-"desconectado."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr ""
-"No es posible cambiar la contraseÃ±a debido a problemas de configuraciÃ³n."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "No es posible mostrar carpetas."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "No es posible efectuar la operaciÃ³n."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Los cambios a las opciones de la cuenta Exchange Â«{0}Â» sÃ³lo tendrÃ¡n lugar "
-"despuÃ©s de reiniciar Evolution."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "No es posible autenticar con el servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "No es posible cambiar la contraseÃ±a."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"No es posible configurar la cuenta de Exchange porque\n"
-"ocurriÃ³ un error desconocido. Compruebe el URL,\n"
-"usuario y contraseÃ±a e intÃ©ntelo otra vez."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "No es posible conectar con el servidor Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "No es posible conectar con el servidor {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "No se pudieron determinar los permisos de la carpeta para delegados."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "No es posible encontrar el sistema de almacenamiento Web de Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "No es posible localizar el servidor {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "No es posible hacer de {0} un delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "No se pudieron leer los permisos de la carpeta"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "No se pudieron leer los permisos de la carpeta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "No es posible leer el estado de disponibilidad"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "No es posible actualizar los permisos de la carpeta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "No es posible actualizar el estado de disponibilidad"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"Evolution requiere reiniciarse para cargar el buzÃ³n de correo del usuario "
-"suscrito"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "La cuenta de Exchange estÃ¡ desconectada."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector requiere acceso a cierta funcionalidad\n"
-"en el servidor de Exchange que parece estar desactivada\n"
-"o bloqueada. (Esto normalmente no es intencional). Su \n"
-"administrador de Exchange tendrÃ¡ que activar esta\n"
-"funcionalidad para que usted pueda usar Ximian Connector.\n"
-"\n"
-"La informaciÃ³n que puede proporcionar a su administrador\n"
-"de Exchange, puede obtenerla del enlace de abajo:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "FallÃ³ al actualizar delegados:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "La carpeta ya existe"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "La carpeta no existe"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "Carpeta desconectada"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "Error genÃ©rico"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "No es posible llegar al Servidor de CatÃ¡logo Global"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Si OWA se estÃ¡ ejecutando en una ruta diferente, debe especificarla en el "
-"diÃ¡logo de configuraciÃ³n de cuenta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "El buzÃ³n de {0} no estÃ¡ en este servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "AsegÃºrese de que la URL es correcta e intente de nuevo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"AsegÃºrese de que el nombre del servidor estÃ© escrito correctamente e "
-"intÃ©ntelo de nuevo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"AsegÃºrese de que el usuario y contraseÃ±a son correctos e intente de nuevo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "No hay un servidor de CatÃ¡logo Global configurado para esta cuenta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "No hay buzÃ³n para el usuario {0} en {1}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "No existe ese usuario {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "ContraseÃ±a cambiada con Ã©xito."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
-"Introduzca la Id del delegado o deseleccione la opciÃ³n Enviar como delegado."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr ""
-"AsegÃºrese de que el nombre del Servidor de CatÃ¡logo Global es correcto."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "Seleccione un usuario."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "El servidor rechazÃ³ la contraseÃ±a porque es demasiado dÃ©bil."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "La cuenta de Exchange se desactivarÃ¡ cuando salga de Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "La cuenta de Exchange se eliminarÃ¡ cuando salga de Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "El servidor Exchange no es compatible con Exchange Connector."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"El servidor estÃ¡ funcionando con Exchange 5.5. Exchange Connector\n"
-"sÃ³lo soporta Microsoft Exchange 2000 y 2003."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"Esto probablemente significa que su servidor requiere \n"
-"que le especifique el nombre de dominio de Windows \n"
-"como parte del nombre de usuario (ej, Â«DOMINIO\\usuarioÂ»).\n"
-"\n"
-"O quizÃ¡ tan sÃ³lo ha escrito mal la contraseÃ±a."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "IntÃ©ntelo con una contraseÃ±a diferente."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "No puede aÃ±adirse el usuario a la lista de control de acceso:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "Imposible editar delegados."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "Error desconocido al buscar {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:604
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "Tipo desconocido"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "OperaciÃ³n no soportada"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"EstÃ¡ cerca de su cuota disponible para almacenar correo en este servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr ""
-"Le estÃ¡ permitido mandar un mensaje en nombre de a un solo delegado cada vez."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "No puede hacerse asÃ mismo su propio delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "Ha excedido su cuota para almacenar correo en este servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "SÃ³lo puede configurar una sola cuenta de Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Su uso actual es: {0} Kib. Intente hacer algo de espacio borrando algunos "
-"mensajes."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr "Su uso actual es: {0} Kib. No podrÃ¡ ni enviar ni recibir correo ahora."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Su uso actual es: {0} Kib. No podrÃ¡ enviar correo hasta que haga algo de "
-"espacio borrando algunos mensajes."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "Su contraseÃ±a ha caducado."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} no puede aÃ±adirse a la lista de control de acceso"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} ya es un delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} ya estÃ¡ en la lista"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Suscribirse a las tareas de otros usuarios"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Compruebe los permisos de la carpeta"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Cabeceras personalizadas del correo-e"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
@@ -16825,7 +17079,7 @@ msgstr ""
 "Lanzar el editor automÃ¡ticamente al pulsar una tecla en el editor de correos"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automÃ¡ticamente al editar un correo nuevo"
 
@@ -16837,6 +17091,23 @@ msgstr "Editor externo predeterminado"
 msgid "The default command that must be used as the editor."
 msgstr "El comando predeterminado que usar como editor."
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "Comando que ejecutar para lanzar el editor: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Para Emacs use Â«xemacsÂ»\n"
+"Para VI use Â«gvim -fÂ»"
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "Redactar en un editor externo"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "Editor externo"
@@ -16881,82 +17152,102 @@ msgstr ""
 "No se puede lanzar el editor externo ajustado en las preferencias del "
 "complemento. IntÃ©ntelo estableciendo un editor diferente."
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "Comando que ejecutar para lanzar el editor: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:110
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Para Emacs use Â«xemacsÂ»\n"
-"Para VI use Â«gvim -fÂ»"
 
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-msgid "Compose in External Editor"
-msgstr "Redactar en un editor externo"
+#: ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Error desconocido"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:286
+#, fuzzy
+#| msgid "Select a (48*48) png of size < 700bytes"
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "Seleccione un png (48*48) de tamaÃ±o < 700bytes"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "Archivos PNG"
+#: ../plugins/face/face.c:296
+#, fuzzy
+#| msgid "Importing files"
+msgid "Image files"
+msgstr "Importando archivos"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "_Cara"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:415
+#, fuzzy
+#| msgid "Include:"
+msgid "Include _Face"
+msgstr "Incluye:"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"Adjuntar una cabecera de cara a los correos salientes. \n"
-"\n"
-"Primero el usuario debe configurar una imagen PNG de 48*48 pÃxeles. EstÃ¡ "
-"codificada en base64 y almacenada en ~/.evolution/faces Ã?sta opciÃ³n se usarÃ¡ "
-"en los correos que se envÃen a partir de ahora."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "DesuscribiÃ©ndose de la carpeta Â«%sÂ»"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+#| msgid "Table header"
+msgid "Failed Read"
+msgstr "Cabecera de la tabla"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "Desuscribirse de carpetas"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+#| msgid "Invalid Date Value"
+msgid "Invalid Image Size"
+msgstr "Valor de fecha invÃ¡lido"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid ""
-"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr ""
-"Desuscribirse de una carpeta IMAP pulsando sobre ella con el botÃ³n derecho "
-"del ratÃ³n en la carpeta del Ã¡rbol."
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+#| msgid "_No image"
+msgid "Not an image"
+msgstr "_Sin imagen"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "Des_uscribir"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+#| msgid "Please select an image for this contact"
+msgid "Please select an image of size 48 * 48"
+msgstr "Seleccione una imagen para este contacto"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+#| msgid "The item could not be sent!\n"
+msgid "The file cannot be read"
+msgstr "El elemento no pudo enviarse.\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
 
-#: ../plugins/google-account-setup/google-source.c:81
 #: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduzca la contraseÃ±a para que el usuario %s acceda a la lista de "
 "calendarios suscritos."
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16965,19 +17256,20 @@ msgstr ""
 "No se pueden leer los datos del servidor de Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:668
+#: ../plugins/mail-to-task/mail-to-task.c:886
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "Obtener _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "AÃ±adir un calendario de Google a Evolution."
@@ -16986,20 +17278,56 @@ msgstr "AÃ±adir un calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:451
 msgid "Checklist"
 msgstr "Lista de comprobaciÃ³n"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "AÃ±adir soporte Novell GroupWise para Evolution."
+#: ../plugins/groupwise-features/gw-ui.c:110
+msgid "New _Shared Folder..."
+msgstr "Carpeta compartida _nuevaâ?¦"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "ConfiguraciÃ³n de la cuenta GroupWise"
+#: ../plugins/groupwise-features/gw-ui.c:117
+msgid "_Proxy Login..."
+msgstr "SesiÃ³n _proxyâ?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:219
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:168
+msgid "Junk Mail Settings..."
+msgstr "Opciones de SPAMâ?¦"
+
+#: ../plugins/groupwise-features/gw-ui.c:175
+msgid "Track Message Status..."
+msgstr "Seguir el estado del mensajeâ?¦"
+
+#: ../plugins/groupwise-features/gw-ui.c:181
+msgid "Retract Mail"
+msgstr "Retractar correo"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "Aceptar provisionalmente"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "Reen_viar reuniÃ³nâ?¦"
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:351
+msgid "Create folder"
+msgstr "Crear carpeta"
+
+#: ../plugins/groupwise-features/install-shared.c:225
+#, fuzzy, c-format
+#| msgid ""
+#| "The user '%s' has shared a folder with you\n"
+#| "\n"
+#| "Message from '%s'\n"
+#| "\n"
+#| "\n"
+#| "%s\n"
+#| "\n"
+#| "\n"
+#| "Click 'Forward' to install the shared folder\n"
+#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17009,7 +17337,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "El usuario Â«%sÂ» ha compartido una capeta con usted\n"
@@ -17023,27 +17351,23 @@ msgstr ""
 "Pulse Â«ReenviarÂ» para instalar la carpeta compartida\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "Instalar la carpeta compartida"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "InstalaciÃ³n de carpeta compartida"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "Opciones de SPAM"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "ConfiguraciÃ³n de SPAM"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "Opciones de SPAMâ?¦"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
 msgstr "<b>Lista de SPAM:</b>"
@@ -17053,7 +17377,7 @@ msgid "Email:"
 msgstr "Correo-e:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/publish-calendar/publish-calendar.c:484
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -17065,25 +17389,35 @@ msgstr "_Activar"
 msgid "_Junk List"
 msgstr "Lista de _SPAM"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Quitar"
+
+#: ../plugins/groupwise-features/mail-retract.c:82
 msgid "Message Retract"
 msgstr "Retirada de mensaje"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
+#: ../plugins/groupwise-features/mail-retract.c:87
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this ?"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "Retirar un mensaje puede eliminarlo del buzÃ³n de correo del destinatario. "
 "Â¿EstÃ¡ seguro que quiere hacer esto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:106
 msgid "Message retracted successfully"
 msgstr "Mensaje retractado con Ã©xito"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "Retractar correo"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "Insertar opciones de envÃo"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -17159,15 +17493,21 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "Debe especificar el nombre de usuario que quiere aÃ±adir a la lista"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting ?"
+#, fuzzy
+#| msgid "Do you want to resend the meeting ?"
+msgid "Do you want to resend the meeting?"
 msgstr "Â¿Quiere reenviar la reuniÃ³n?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting ?"
+#, fuzzy
+#| msgid "Do you want to resend the recurring meeting ?"
+msgid "Do you want to resend the recurring meeting?"
 msgstr "Â¿Quiere reenviar la reuniÃ³n repetitiva?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item ?"
+#, fuzzy
+#| msgid "Do you want to retract the original item ?"
+msgid "Do you want to retract the original item?"
 msgstr "Â¿Quiere retractar el elemento original?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
@@ -17201,14 +17541,6 @@ msgstr "Â¿Quiere aceptarlo?"
 msgid "Would you like to decline it?"
 msgstr "Â¿Quiere rechazarlo?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "Aceptar provisionalmente"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "Reen_viar reuniÃ³nâ?¦"
-
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Usuarios:</b>"
@@ -17222,7 +17554,7 @@ msgid "Con_tacts..."
 msgstr "Con_tactosâ?¦"
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
+#: ../widgets/table/e-table-click-to-add.c:512
 msgid "Message"
 msgstr "Mensaje"
 
@@ -17305,51 +17637,45 @@ msgstr "<b>Nombre de la cuenta</b>"
 msgid "Proxy Login"
 msgstr "SesiÃ³n proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:487
 #: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseÃ±a para %s (usuario %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
-msgid "_Proxy Login..."
-msgstr "SesiÃ³n _proxyâ?¦"
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:688
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "La solapa del Proxy estarÃ¡ disponible sÃ³lo cuando la cuenta estÃ© conectada."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:694
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La solapa del Proxy estarÃ¡ disponible sÃ³lo cuando la cuenta estÃ© activada."
 
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:713
+msgid "Add User"
+msgstr "AÃ±adir usuario"
+
 #: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Opciones de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:318
 #: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
 msgstr "Introduzca los usuarios y establezca permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "Carpeta compartida _nuevaâ?¦"
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:416
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17365,59 +17691,55 @@ msgstr "AÃ±adir   "
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:124
 msgid "Message Status"
 msgstr "Estado del mensaje"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:138
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:152
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:167
 msgid "Creation date:"
 msgstr "Fecha de creaciÃ³n:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Abierto: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Borrado: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Rechazado: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Completado: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Sin entregar: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "Seguir el estado del mensajeâ?¦"
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "AÃ±adir soporte Hula para Evolution."
@@ -17426,11 +17748,11 @@ msgstr "AÃ±adir soporte Hula para Evolution."
 msgid "Hula Support"
 msgstr "Soporte Hula"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:331
 msgid "Custom Headers"
 msgstr "Cabeceras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:344
 msgid "IMAP Headers"
 msgstr "Cabeceras IMAP"
 
@@ -17484,176 +17806,134 @@ msgstr "Configurar sus cuentas IMAP."
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "La capa de abstracciÃ³n de hardware (HAL) no estÃ¡ cargada"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"Se requiere el servicio Â«haldÂ» pero actualmente no se estÃ¡ ejecutando. Active "
-"el servicio y vuelva a este programa o contacte con el administrador de su "
-"sistema."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "FallÃ³ la bÃºsqueda de un iPod"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution no pudo encontrar un iPod con el que sincronizarse. O no estÃ¡ "
-"conectado al sistema o no estÃ¡ encendido."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "Sincronizar con iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "Sincronizar sus datos con su iPod de Apple."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "SincronizaciÃ³n con iPod"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:492
+#: ../plugins/itip-formatter/itip-formatter.c:617
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No es posible cargar el calendario Â«%sÂ»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:637
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario Â«%sÂ» entra en conflicto con esta reuniÃ³n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:673
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontrÃ³ la cita en el calendario Â«%sÂ»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:772
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:779
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reuniÃ³n en ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:783
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:858
 msgid "Opening the calendar. Please wait.."
 msgstr "Abriendo el calendario. Espere..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:861
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versiÃ³n existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1043
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario Â«%sÂ»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1142
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario Â«%sÂ» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario Â«%sÂ» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1151
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario Â«%sÂ» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario Â«%sÂ» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1257
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificaciÃ³n de cancelaciÃ³n al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1259
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificaciÃ³n de cancelaciÃ³n al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1367
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "invÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1396
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 msgid "Meeting information sent"
 msgstr "InformaciÃ³n de reuniÃ³n enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1429
 msgid "Task information sent"
 msgstr "InformaciÃ³n de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Memo information sent"
 msgstr "InformaciÃ³n de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1441
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la informaciÃ³n de la reuniÃ³n, la reuniÃ³n no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la informaciÃ³n de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la informaciÃ³n de la nota, la nota no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../plugins/itip-formatter/itip-formatter.c:1515
+#: ../plugins/itip-formatter/itip-formatter.c:1526
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1516
+#: ../plugins/itip-formatter/itip-formatter.c:1527
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17661,15 +17941,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1567
+#: ../plugins/itip-formatter/itip-formatter.c:1595
+#: ../plugins/itip-formatter/itip-formatter.c:1687
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1568
+#: ../plugins/itip-formatter/itip-formatter.c:1596
+#: ../plugins/itip-formatter/itip-formatter.c:1688
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17677,11 +17957,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningÃºn "
 "acontecimiento, tarea o informaciÃ³n de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1607
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos mÃºltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1608
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17689,31 +17969,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo deberÃa guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2353
 msgid "This meeting recurs"
 msgstr "Esta reuniÃ³n se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2356
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2589
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje despuÃ©s de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2632
 msgid "Conflict Search"
 msgstr "BÃºsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2614
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -18089,101 +18369,105 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ha cancelado la siguiente nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:822
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Decline all"
 msgstr "_Rehusar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Send Information"
 msgstr "_Enviar informaciÃ³n"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:852
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
+#: ../plugins/itip-formatter/itip-view.c:1032
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1063
+#: ../plugins/itip-formatter/itip-view.c:1117
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1102
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "_Preserve my reminder"
 msgstr "Conser_var mi recordatorio"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "_Tareas:"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18210,20 +18494,6 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Esta respuesta no es de un asistente. Â¿Desea aÃ±adirlo como asistente?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "_Cerrar sesiÃ³n proxy"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "Desactivar cuenta"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr ""
-"Desactivar una cuenta pulsando con el botÃ³n derecho sobre ella en la carpeta "
-"del Ã¡rbol."
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Pitar o reproducir un archivo de sonido."
@@ -18261,60 +18531,71 @@ msgid "Play sound when new messages arrive."
 msgstr "Reproducir un sonido cuando llegue correo nuevo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Archivo que reproducir cuando llega un mensaje nuevo, si no se debe "
+"reproducir un pitido."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Mensaje emergente junto con el icono."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostrar el icono de correo nuevo en el Ã¡rea de notificaciÃ³n cuando llegan "
 "nuevos mensajes."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "Nombre del archivo de sonido que reproducir."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Archivo que reproducir cuando llega un mensaje nuevo, si no se debe "
 "reproducir un pitido."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+#| msgid "Use underline"
+msgid "Use sound theme"
+msgstr "Usar subrayado"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr ""
 "Indica si se debe mostrar un mensaje sobre el icono cuando llega un mensaje "
 "nuevo."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "Indica si el icono debe parpadear o no."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Indica si se deben notificar sÃ³lo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "Generar un mensaje _D-Bus"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:341
 msgid "Evolution's Mail Notification"
 msgstr "NotificaciÃ³n de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:363
 msgid "Mail Notification Properties"
 msgstr "Propiedades de la notificaciÃ³n de correo"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:492
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18329,58 +18610,76 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
 #: ../plugins/mail-notification/mail-notification.c:503
+#, fuzzy, c-format
+#| msgid "From %s:"
+msgid "From: %s"
+msgstr "De %s:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:515
+#, fuzzy, c-format
+#| msgid "Subject:"
+msgid "Subject: %s"
+msgstr "Asunto:"
+
+#: ../plugins/mail-notification/mail-notification.c:524
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:599
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el Ã¡rea de _notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el Ã¡rea de notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:637
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:816
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:845
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "Reproducir archivo de _sonido"
+#: ../plugins/mail-notification/mail-notification.c:858
+#, fuzzy
+#| msgid "Use underline"
+msgid "Use sound _theme"
+msgstr "Usar subrayado"
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "Especificar nombre de a_rchivo:"
+#: ../plugins/mail-notification/mail-notification.c:877
+#, fuzzy
+#| msgid "Play _sound file"
+msgid "Play _file:"
+msgstr "Reproducir archivo de _sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:888
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "Reprod_ucir"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:946
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sÃ³lo para la _bandeja de entrada"
 
+#: ../plugins/mail-notification/mail-notification.c:955
+msgid "Generate a _D-Bus message"
+msgstr "Generar un mensaje _D-Bus"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "NotificaciÃ³n de correo"
@@ -18389,7 +18688,13 @@ msgstr "NotificaciÃ³n de correo"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Le notifica cuando llega un mensaje de correo nuevo."
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:184
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:439
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18398,7 +18703,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento Â«%sÂ». Â¿Quiere editar "
 "el acontecimiento antiguo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:442
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18407,7 +18712,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene la tarea Â«%sÂ». Â¿Quiere editar la "
 "tarea antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:445
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18416,7 +18721,7 @@ msgstr ""
 "La lista de notas seleccionada ya contiene la nota Â«%sÂ». Â¿Quiere editar la "
 "nota antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
+#: ../plugins/mail-to-task/mail-to-task.c:462
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18424,7 +18729,7 @@ msgstr ""
 "El calendario seleccionado ya contiene algunos acontecimientos para los "
 "correos proporcionados. Â¿Quiere crear acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
+#: ../plugins/mail-to-task/mail-to-task.c:465
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18432,7 +18737,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene algunas tareas para los correos "
 "proporcionados. Â¿Quiere crear tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
+#: ../plugins/mail-to-task/mail-to-task.c:468
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18440,7 +18745,7 @@ msgstr ""
 "La lista de notas seleccionada contiene algunas notas para los correos "
 "proporcionados. Â¿Quiere crear notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:486
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18454,7 +18759,7 @@ msgstr[1] ""
 "El calendario seleccionada ya contiene acontecimientos para los correos "
 "proporcionados. Â¿Quiere crear los acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
+#: ../plugins/mail-to-task/mail-to-task.c:492
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18468,7 +18773,7 @@ msgstr[1] ""
 "La lista de tareas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
+#: ../plugins/mail-to-task/mail-to-task.c:498
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18482,25 +18787,25 @@ msgstr[1] ""
 "La lista de notas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:568
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolviÃ³ un objeto no vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "OcurriÃ³ un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:668
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:675
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18508,7 +18813,7 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear un "
 "acontecimiento en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:678
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18516,7 +18821,7 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear una "
 "tarea en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
+#: ../plugins/mail-to-task/mail-to-task.c:681
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18524,92 +18829,113 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear una "
 "nota en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:886
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "Convertir el mensaje de correo en una tarea."
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Create a Mem_o"
-msgstr "Crear una _nota"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Create a _Meeting"
-msgstr "Crear una _reuniÃ³n"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Create a _Task"
-msgstr "Crear una _tarea"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#: ../plugins/mail-to-task/mail-to-task.c:1005
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail-to-Task"
-msgstr "Correo a tarea"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#: ../plugins/mail-to-task/mail-to-task.c:1007
 msgid "Create a new event from the selected message"
 msgstr "Crear un acontecimiento nuevo del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Create a new meeting from the selected message"
-msgstr "Crear una reuniÃ³n nueva del mensaje seleccionado"
+#: ../plugins/mail-to-task/mail-to-task.c:1012
+msgid "Create a Mem_o"
+msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#: ../plugins/mail-to-task/mail-to-task.c:1014
 msgid "Create a new memo from the selected message"
 msgstr "Crear una nota nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#: ../plugins/mail-to-task/mail-to-task.c:1019
+msgid "Create a _Task"
+msgstr "Crear una _tarea"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1021
 msgid "Create a new task from the selected message"
 msgstr "Crear una tarea nueva del mensaje seleccionado"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "_Responsable de la lista de contactos"
+#: ../plugins/mail-to-task/mail-to-task.c:1029
+msgid "Create a _Meeting"
+msgstr "Crear una _reuniÃ³n"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1031
+msgid "Create a new meeting from the selected message"
+msgstr "Crear una reuniÃ³n nueva del mensaje seleccionado"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Convertir el mensaje de correo en una tarea."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+msgid "Get List _Archive"
 msgstr "Obtener _archivador de la lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Usage Information"
 msgstr "Obtener informaciÃ³n de _uso de la lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "Acciones de las listas de correo"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+"Obtiene informaciÃ³n sobre el uso de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "_Lista de correo"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Contact List _Owner"
+msgstr "_Responsable de la lista de contactos"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
-"Realizar acciones tÃpicas de listas de correo (suscribirse, desuscribirseâ?¦)."
+"Contactar con el responsable de la lista de correo a la que pertenece este "
+"mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "_Post Message to List"
 msgstr "_Publicar un mensaje a la lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Subscribe to List"
 msgstr "_Suscribirse a la lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "Des_uscribirse de la lista"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Unsubscribe from List"
+msgstr "_Desuscribirse de la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#, fuzzy
+#| msgid "Unsubscribe to the mailing list this message belongs to"
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Desuscribirse de la lista de correo a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Mailing _List"
+msgstr "_Lista de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Acciones de las listas de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+"Realizar acciones tÃpicas de listas de correo (suscribirse, desuscribirseâ?¦)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18692,63 +19018,11 @@ msgstr "_Editar mensaje"
 msgid "_Send message"
 msgstr "_Enviar mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "_Responsable de la lista de contactos"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Contactar con el responsable de la lista de correo a la que pertenece este "
-"mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Obtener _archivador de la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Obtener informaciÃ³n de _uso de la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Obtiene informaciÃ³n sobre el uso de la lista a la que pertenece este mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Desuscribirse de la lista de correo a la que pertenece este mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Publicar un mensaje a la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Suscribirse a la lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "_Desuscribirse de la lista"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "Â¿Marcar tambiÃ©n los mensajes en las subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18756,53 +19030,36 @@ msgstr ""
 "Â¿Quiere marcar los mensajes como leÃdos sÃ³lo en la carpeta actual o en la "
 "capeta actual y todas sus subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
+#: ../plugins/mark-all-read/mark-all-read.c:172
 msgid "In Current Folder and _Subfolders"
 msgstr "En la carpeta actual y _subcarpetas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
+#: ../plugins/mark-all-read/mark-all-read.c:186
 msgid "In Current _Folder Only"
 msgstr "SÃ³lo en la ca_rpeta actual"
 
+#: ../plugins/mark-all-read/mark-all-read.c:343
+msgid "Mark Me_ssages as Read"
+msgstr "Marcar los mensajes como _leÃdos"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marcar todo como leÃdo"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Marcar los mensajes como _leÃdos"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todos los mensajes en una carpeta como leÃdos."
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "Cargador de Mono"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "Soportar complementos escritos en Mono."
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "Manage your Evolution plugins."
 msgstr "Gestionar sus complementos de Evolution"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "Administrador de complementos"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Activar y desactivar complementos"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "Com_plementos"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "Autores(s)"
 
@@ -18810,19 +19067,27 @@ msgstr "Autores(s)"
 msgid "Configuration"
 msgstr "ConfiguraciÃ³n"
 
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: Algunos cambios no tendrÃ¡n efecto hasta que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "Vista general"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "Complemento"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "Com_plementos"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "Activar y desactivar complementos"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18836,19 +19101,43 @@ msgstr "Preferir texto plano"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver los mensajes de correo en texto plano, incluso si contienen HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "Mostrar HTML si estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "Preferir sin formato"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+#, fuzzy
+#| msgid "Show HTML if present"
+msgid "Show plain text if present"
+msgstr "Mostrar HTML si estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+#, fuzzy
+#| msgid "Only ever show PLAIN"
+msgid "Only ever show plain text"
 msgstr "SÃ³lo mostrar sin formato"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -18872,22 +19161,31 @@ msgstr "Importador PST de Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "Co_rreo"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "Libreta de _direcciones"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tareas"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "Entradas del dia_rio"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "_Importando datos de Outlook"
 
@@ -18903,44 +19201,49 @@ msgstr "Lugares"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios en la web."
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "_Publicar informaciÃ³n del calendario"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../plugins/publish-calendar/publish-calendar.c:94
+#: ../plugins/publish-calendar/publish-calendar.c:336
 #, c-format
 msgid "Could not open %s:"
 msgstr "No se pudo abrir Â«%sÂ»:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:96
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "No se ha podido abrir Â«%sÂ»: Error desconocido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:116
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Hubo un error al publicar en %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:118
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "La publicaciÃ³n en %s finalizÃ³ correctamente"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:163
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "FallÃ³ al montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Activar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:629
 msgid "Are you sure you want to remove this location?"
 msgstr "Â¿Seguro que quiere eliminar este lugar?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
+#: ../plugins/publish-calendar/publish-calendar.c:943
 msgid "Could not create publish thread."
 msgstr "No se pudo publicar el hilo de publicaciÃ³n."
 
+#: ../plugins/publish-calendar/publish-calendar.c:950
+msgid "_Publish Calendar Information"
+msgstr "_Publicar informaciÃ³n del calendario"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Lugar</span>"
@@ -18959,10 +19262,6 @@ msgstr ""
 "Semanalmente\n"
 "Manual (por medio del menÃº Acciones)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "_Activar"
-
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "_Puerto:"
@@ -19054,30 +19353,6 @@ msgstr "UbicaciÃ³n nueva"
 msgid "Edit Location"
 msgstr "Editar ubicaciÃ³n"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Pruebas de carga de los complementos Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Complemento de prueba Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Probar el complemento para el cargador Python EPlugin."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "Un complemento que carga otros complementos escritos en Python."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Cargador de Python"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -19109,16 +19384,17 @@ msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminandoâ?¦
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "FallÃ³ la tuberÃa hacia SpamAssasin, cÃ³digo de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#, fuzzy, c-format
+#| msgid "SpamAssassin is not available."
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssasin no estÃ¡ disponible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto harÃ¡ que SpamAssasin sea mÃ¡s exacto, pero mÃ¡s lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19138,78 +19414,82 @@ msgstr "Opciones de SpamAssasin"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:159
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Description List"
 msgstr "Lista de descripciÃ³n"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Categories List"
 msgstr "Lista de categorÃas"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Start"
 msgstr "Empieza"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "End"
 msgstr "Termina"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "percent Done"
 msgstr "porcentaje terminado"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:523
+#: ../plugins/save-calendar/csv-format.c:522
 msgid "A_dvanced options for the CSV format"
 msgstr "Opciones avan_zadas para el formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:529
 msgid "Prepend a _header"
 msgstr "Anteponer una ca_becera"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "_Value delimiter:"
 msgstr "Delimitador de _valor:"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "_Record delimiter:"
 msgstr "Delimitador de _registro:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:163
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Guardar seleccionados"
@@ -19218,50 +19498,44 @@ msgstr "Guardar seleccionados"
 msgid "Save a calendar or task list to disk."
 msgstr "Guardar un calendario o una lista de tareas al disco."
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "_Guardar al disco"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:371
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "Seleccione el archivo de destino"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "Seleccionar rÃ¡pidamente un sÃ³lo calendario o tarea para verlo."
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Select One Source"
-msgstr "Seleccionar un origen"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "Mostrar _sÃ³lo este calendario"
+#: ../plugins/save-calendar/save-calendar.c:323
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected calendar to disk"
+msgstr "Guarda los mensajes como un archivo de texto"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "Mostrar _sÃ³lo esta lista de notas"
+#: ../plugins/save-calendar/save-calendar.c:358
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected memo list to disk"
+msgstr "Guarda los mensajes como un archivo de texto"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "Mostrar _sÃ³lo esta lista de tareas"
+#: ../plugins/save-calendar/save-calendar.c:393
+#, fuzzy
+#| msgid "Save a calendar or task list to disk."
+msgid "Save the selected task list to disk"
+msgstr "Guardar un calendario o una lista de tareas al disco."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19271,15 +19545,15 @@ msgstr "Le guÃa a travÃ©s de su configuraciÃ³n inicial de cuenta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuraciÃ³n"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuraciÃ³n de Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19292,29 +19566,26 @@ msgstr ""
 "\n"
 "Por favor pulse el botÃ³n Â«AdelanteÂ» para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "Importando archivos"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../widgets/misc/e-import-assistant.c:370
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la informaciÃ³n que quiera importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:462
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "Importando archivos"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -19343,22 +19614,24 @@ msgstr ""
 "Lista de pares de palabras clave y valores para que el complemento de "
 "plantillas sustituya en el cuerpo del mensaje."
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Borradores basados en el complemento de plantillas"
+
+#: ../plugins/templates/templates.c:582
+#, fuzzy
+#| msgid "No title"
+msgid "No Title"
 msgstr "Sin tÃtulo"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:653
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:655
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Borradores basados en el complemento de plantillas"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr ""
@@ -19376,27 +19649,27 @@ msgstr "vCards en lÃnea"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente en los mensajes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:222
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "Hay otro contacto mÃ¡s."
 
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hay %d contacto mÃ¡s."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "Guardar en la libreta de direcciones"
 
@@ -19420,22 +19693,6 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "IntÃ©rprete de Evolution"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "FÃ¡brica de configuraciÃ³n del intÃ©rprete de Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Prueba de Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Componente de Prueba de Evolution"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "Autenticar las conexiones del servidor proxy"
@@ -19453,44 +19710,56 @@ msgid "Default sidebar width"
 msgstr "Anchura predeterminada de la barra lateral"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window X coordinate"
+msgstr "Estado predeterminado de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window Y coordinate"
+msgstr "Estado predeterminado de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Altura predeterminada de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Estado predeterminado de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Anchura predeterminada de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "Nombre del equipo proxy HTtP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "ContraseÃ±a del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "Puerto del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "Usuario del proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Id o alias del componente que se mostrarÃ¡ al iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19502,20 +19771,20 @@ msgstr ""
 "shell/network_config/authentication_user\" y la contraseÃ±a de gnome-keyring "
 "o bien del archivo de contrasÃ±eas ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "Vista inicial de adjunto"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "Carpeta inicial del selector de archivos"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr ""
 "La carpeta inicial para los diÃ¡logos GtkFileChooser (selector de archivos)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19523,46 +19792,46 @@ msgstr ""
 "Vista inicial para los widgets de la barra de adjuntos. Â«0Â» es para Vista de "
 "icono, Â«1Â» es para Vista de lista."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Ã?ltima versiÃ³n de la configuraciÃ³n actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarÃ¡n al disco para usar "
 "desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Equipos que no sean proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ContraseÃ±a para pasar como autenticaciÃ³n al hacer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraciÃ³n del proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Nombre del equipo proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Puerto del proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Nombre del equipo proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Puerto del proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19574,23 +19843,23 @@ msgstr ""
 "\"usar configuraciÃ³n manual del proxy\" y \"usar la configuraciÃ³n "
 "proporcionada en la URL de autoconfiguraciÃ³n del proxy\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "La barra lateral es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Saltar el diÃ¡logo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:316
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "La barra de estado es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19598,19 +19867,31 @@ msgstr ""
 "La versiÃ³n de configuraciÃ³n de Evolution, con nivel de configuraciÃ³n mayor/"
 "menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default X coordinate for the main window."
+msgstr "La anchura predeterminada de la ventana principal, en pÃxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default Y coordinate for the main window."
+msgstr "La anchura predeterminada de la ventana principal, en pÃxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada de la ventana principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "La anchura predeterminada de la ventana principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "La anchura predeterminada para la barra lateral, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19618,19 +19899,19 @@ msgstr ""
 "La Ãºltima versiÃ³n de configuraciÃ³n de Evolution actualizada, con nivel de "
 "configuraciÃ³n mayor/menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "El nombre de la mÃ¡quina por la que se hace proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "El nombre de la mÃ¡quina por la que se hace proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "El nombre de la mÃ¡quina por la que se hace proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19638,7 +19919,7 @@ msgstr ""
 "El puerto de la mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19646,7 +19927,7 @@ msgstr ""
 "El puerto de la mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19654,7 +19935,7 @@ msgstr ""
 "El puerto de la mÃ¡quina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19664,7 +19945,7 @@ msgstr ""
 "\", \"toolbar\". Si se selecciona \"toolbar\", el estilo de los botones se "
 "determina por la configuraciÃ³n de la barra de herramientas de GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19677,160 +19958,210 @@ msgstr ""
 "foo.com), direcciones IP de anfitriones (tanto IPv4 como IPv6) y direcciones "
 "de red con una mÃ¡scara (algo como 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL que proporciona las variables de configuraciÃ³n del proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Usuario que pasar como autenticaciÃ³n al usar el proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica si Evolution se iniciarÃ¡ en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Indica si la ventana debe o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Indica si la barra lateral debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Indica si la barra de estado debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica si se omite el diÃ¡logo de advertencia en las versiones de desarrollo "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Indica si la los botones de la ventana deben ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Conexiones activas</b>"
+# #En conflicto con _Mensaje
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-content.c:872
+#, fuzzy
+#| msgid "Sho_w: "
+msgid "Sho_w:"
+msgstr "M_ostrar: "
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Conexiones activas"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:897
+#, fuzzy
+#| msgid "Sear_ch: "
+msgid "Sear_ch:"
+msgstr "B_uscar: "
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Pulse Â«AceptarÂ» para cerrar estas conexiones y desconectarse"
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:939
+#, fuzzy
+#| msgid " i_n "
+msgid "i_n"
+msgstr " e_n "
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "Elija el tipo de importador a ejecutar:"
+#: ../shell/e-shell-content.c:1362
+msgid "Advanced Search"
+msgstr "BÃºsqueda avanzada"
 
-#: ../shell/e-shell-importer.c:131
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+#: ../shell/e-shell-content.c:1419 ../shell/e-shell-content.c:1420
+msgid "Searches"
+msgstr "BÃºsquedas"
+
+#: ../shell/e-shell-content.c:1465
+msgid "Save Search"
+msgstr "Guardar bÃºsqueda"
+
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KiB"
+
+#: ../shell/e-shell-switcher.c:446
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "Toolbar Style"
+msgstr "Estilo de la _barra de herramientas"
+
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
 msgstr ""
-"Elija el archivo que quiere importar en Evolution y seleccione de la lista "
-"el tipo de archivo que es."
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "Elija el destino de esta importaciÃ³n"
+#: ../shell/e-shell-switcher.c:463
+#, fuzzy
+#| msgid "Toolbar is visible"
+msgid "Toolbar Visible"
+msgstr "La barra de herramientas es visible"
 
-#: ../shell/e-shell-importer.c:141
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-switcher.c:464
+#, fuzzy
+#| msgid "Whether the sidebar should be visible."
+msgid "Whether the switcher is visible"
+msgstr "Indica si la barra lateral debe ser visible."
+
+#: ../shell/e-shell-view.c:485
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switcher Action"
+msgstr "Cambiar a %s"
+
+#: ../shell/e-shell-view.c:486
+msgid "The switcher action for this shell view"
 msgstr ""
-"Evolution comprobÃ³ la configuraciÃ³n para importar de las siguientes \n"
-"aplicaciones: Pine, Netscape, Elm, iCalendar. No se encontrÃ³ ninguna\n"
-"configuraciÃ³n que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
-"el botÃ³n Â«AtrÃ¡sÂ».\n"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "Nombre del _archivo:"
+#: ../shell/e-shell-view.c:501
+#, fuzzy
+#| msgid "Serial Number"
+msgid "Page Number"
+msgstr "NÃºmero de serie"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "Elija un archivo"
+#: ../shell/e-shell-view.c:502
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "_Tipo de archivo:"
+#: ../shell/e-shell-view.c:520
+msgid "The title of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "Importar datos y configuraciÃ³n de programas _antiguos"
+#: ../shell/e-shell-view.c:535
+msgid "The EShellBackend for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "Importar un _Ãºnico archivo"
+#: ../shell/e-shell-view.c:550
+msgid "Shell Content Widget"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "_Importar"
+#: ../shell/e-shell-view.c:551
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "Preferencias de Evolution"
+#: ../shell/e-shell-view.c:567
+#, fuzzy
+#| msgid "Default sidebar width"
+msgid "Shell Sidebar Widget"
+msgstr "Anchura predeterminada de la barra lateral"
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:568
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: ../shell/e-shell-view.c:583
+msgid "Shell Taskbar Widget"
 msgstr ""
-"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s. (%s)"
-msgstr "Error al ejecutar %s. (%s)"
+#: ../shell/e-shell-view.c:584
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "Bug Buddy no estÃ¡ instalado."
+#: ../shell/e-shell-view.c:599
+#, fuzzy
+#| msgid "New _Window"
+msgid "Shell Window"
+msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "No es posible ejecutar Bug Buddy."
+#: ../shell/e-shell-view.c:600
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:615
+#, fuzzy
+#| msgid "_Current View"
+msgid "Current View ID"
+msgstr "Vista act_ual"
+
+#: ../shell/e-shell-view.c:616
+#, fuzzy
+#| msgid "the current time"
+msgid "The current GAL view ID"
+msgstr "la fecha actual"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007-2009\n"
@@ -19841,131 +20172,429 @@ msgstr ""
 "Eneko Lacunza <enlar iname com>, 2001-2002\n"
 "Carlos PerellÃ³ MarÃn <carlos gnome-db org>, 2000-2001"
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "PÃ¡gina web de Evolution"
 
-#: ../shell/e-shell-window-commands.c:1163
-msgid "_Work Online"
-msgstr "_Trabajar conectado"
+#: ../shell/e-shell-window-actions.c:1280
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "Bug Buddy is not installed."
+msgstr "Bug Buddy no estÃ¡ instalado."
+
+#: ../shell/e-shell-window-actions.c:1282
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "Bug Buddy could not be run."
+msgstr "No es posible ejecutar Bug Buddy."
+
+#: ../shell/e-shell-window-actions.c:1384
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "GNOME Pilot is not installed."
+msgstr "Bug Buddy no estÃ¡ instalado."
+
+#: ../shell/e-shell-window-actions.c:1386
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "GNOME Pilot could not be run."
+msgstr "No es posible ejecutar Bug Buddy."
+
+#: ../shell/e-shell-window-actions.c:1480
+msgid "Show information about Evolution"
+msgstr "Mostrar informaciÃ³n acerca de Evolution"
+
+#: ../shell/e-shell-window-actions.c:1485
+msgid "_Close Window"
+msgstr "_Cerrar ventana"
+
+#: ../shell/e-shell-window-actions.c:1492
+#, fuzzy
+#| msgid "A_ppointments"
+msgid "_Contents"
+msgstr "Ci_tas"
+
+#: ../shell/e-shell-window-actions.c:1494
+#, fuzzy
+#| msgid "Open Other User's Folder"
+msgid "Open the Evolution User Guide"
+msgstr "Abrir la carpeta de otro usuario"
+
+#: ../shell/e-shell-window-actions.c:1499
+msgid "Evolution _FAQ"
+msgstr "P+_F de Evolution"
+
+#: ../shell/e-shell-window-actions.c:1501
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Abrir la pÃ¡gina web de preguntas mÃ¡s frecuentes"
+
+#: ../shell/e-shell-window-actions.c:1506
+msgid "_Forget Passwords"
+msgstr "_Olvidar contraseÃ±as"
+
+#: ../shell/e-shell-window-actions.c:1508
+#, fuzzy
+#| msgid "Are you sure you want to forget all remembered passwords?"
+msgid "Forget all remembered passwords"
+msgstr "Â¿Seguro que quiere olvidar todas las contraseÃ±as almacenadas?"
+
+#: ../shell/e-shell-window-actions.c:1513
+msgid "I_mport..."
+msgstr "I_mportarâ?¦"
+
+#: ../shell/e-shell-window-actions.c:1515
+msgid "Import data from other programs"
+msgstr "Importa datos de otros programas"
+
+#: ../shell/e-shell-window-actions.c:1520
+msgid "New _Window"
+msgstr "_Ventana nueva"
+
+#: ../shell/e-shell-window-actions.c:1522
+#, fuzzy
+#| msgid "Create a new window displaying this folder"
+msgid "Create a new window displaying this view"
+msgstr "Crea una ventana nueva mostrando esta carpeta"
+
+#: ../shell/e-shell-window-actions.c:1529
+#, fuzzy
+#| msgid "Configuration"
+msgid "Configure Evolution"
+msgstr "ConfiguraciÃ³n"
+
+#: ../shell/e-shell-window-actions.c:1534
+msgid "_Quick Reference"
+msgstr "_Referencia rÃ¡pida"
+
+#: ../shell/e-shell-window-actions.c:1536
+#, fuzzy
+#| msgid "Change Evolution's settings"
+msgid "Show Evolution's shortcut keys"
+msgstr "Cambia la configuraciÃ³n de Evolution"
+
+#: ../shell/e-shell-window-actions.c:1543
+msgid "Exit the program"
+msgstr "Sale del programa"
+
+#: ../shell/e-shell-window-actions.c:1548
+msgid "_Advanced Search..."
+msgstr "BÃºsqueda _avanzadaâ?¦"
+
+#: ../shell/e-shell-window-actions.c:1550
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1557
+#, fuzzy
+#| msgid "Clear the search"
+msgid "Clear the current search parameters"
+msgstr "Limpiar la bÃºsqueda"
+
+#: ../shell/e-shell-window-actions.c:1562
+msgid "_Edit Saved Searches..."
+msgstr "_Editar bÃºsquedas guardadasâ?¦"
+
+#: ../shell/e-shell-window-actions.c:1564
+#, fuzzy
+#| msgid "Manage your email, contacts and schedule"
+msgid "Manage your saved searches"
+msgstr "Gestione su correo-e, contactos y calendario"
+
+#: ../shell/e-shell-window-actions.c:1571
+msgid "Click here to change the search type"
+msgstr "Pulse aquÃ para cambiar el tipo de bÃºsqueda"
+
+# En conflicto con _Buscar del menu principal
+#: ../shell/e-shell-window-actions.c:1576
+msgid "_Find Now"
+msgstr "B_uscar ahora"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1578
+#, fuzzy
+#| msgid "Cancel the current mail operation"
+msgid "Execute the current search parameters"
+msgstr "Cancela la operaciÃ³n de correo actual"
+
+#: ../shell/e-shell-window-actions.c:1583
+msgid "_Save Search..."
+msgstr "_Guardar bÃºsquedaâ?¦"
+
+#: ../shell/e-shell-window-actions.c:1585
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the current search parameters"
+msgstr "Guardar archivo actual"
+
+#: ../shell/e-shell-window-actions.c:1590
+msgid "Send / _Receive"
+msgstr "Enviar / Reci_bir"
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1592
+msgid "Send queued items and retrieve new items"
+msgstr "EnvÃa el correo en la cola y obtiene el nuevo"
+
+#: ../shell/e-shell-window-actions.c:1597
+#, fuzzy
+#| msgid "Submit _Bug Report"
+msgid "Submit _Bug Report..."
+msgstr "Enviar informe de _fallos"
+
+#: ../shell/e-shell-window-actions.c:1599
+msgid "Submit a bug report using Bug Buddy"
+msgstr "EnvÃa un informe de fallos usando Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1604
+msgid "_Synchronization Options..."
+msgstr "Opciones de _sincronizaciÃ³nâ?¦"
+
+#: ../shell/e-shell-window-actions.c:1606
+msgid "Set up Pilot configuration"
+msgstr "ConfiguraciÃ³n del Pilot"
+
+#: ../shell/e-shell-window-actions.c:1611
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "Trabajar desconectado"
+#: ../shell/e-shell-window-actions.c:1613
+#, fuzzy
+#| msgid "Start in offline mode"
+msgid "Put Evolution into offline mode"
+msgstr "Iniciar en modo desconectado"
 
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"Evolution estÃ¡ conectado.\n"
-"Pulse este botÃ³n para trabajar desconectado."
+#: ../shell/e-shell-window-actions.c:1618
+msgid "_Work Online"
+msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution estÃ¡ en proceso de desconectarse."
+#: ../shell/e-shell-window-actions.c:1620
+#, fuzzy
+#| msgid "Start in online mode"
+msgid "Put Evolution into online mode"
+msgstr "Iniciar en modo conectado"
 
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+#: ../shell/e-shell-window-actions.c:1648
+msgid "Lay_out"
+msgstr "_DistribuciÃ³n"
+
+#: ../shell/e-shell-window-actions.c:1655
+msgid "_New"
+msgstr "_Nuevo"
+
+#: ../shell/e-shell-window-actions.c:1662
+msgid "_Search"
+msgstr "_Buscar"
+
+#: ../shell/e-shell-window-actions.c:1669
+msgid "_Switcher Appearance"
+msgstr "Apariencia del _selector"
+
+#: ../shell/e-shell-window-actions.c:1683
+msgid "_Window"
+msgstr "_Ventana"
+
+#: ../shell/e-shell-window-actions.c:1693
+msgid "Show Side _Bar"
+msgstr "Mostrar barra _lateral"
+
+#: ../shell/e-shell-window-actions.c:1695
+#, fuzzy
+#| msgid "Show Side _Bar"
+msgid "Show the side bar"
+msgstr "Mostrar barra _lateral"
+
+#: ../shell/e-shell-window-actions.c:1701
+msgid "Show _Status Bar"
+msgstr "Mostrar barra de _estado"
+
+#: ../shell/e-shell-window-actions.c:1703
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show the status bar"
+msgstr "Mostrar barra de _estado"
+
+#: ../shell/e-shell-window-actions.c:1709
+#, fuzzy
+#| msgid "Show Animations"
+msgid "Show _Buttons"
+msgstr "Mostrar animaciones"
+
+#: ../shell/e-shell-window-actions.c:1711
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show the switcher buttons"
+msgstr "Muestra la segunda zona horaria"
+
+#: ../shell/e-shell-window-actions.c:1717
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show _Tool Bar"
+msgstr "Mostrar barra de _herramientas"
+
+#: ../shell/e-shell-window-actions.c:1719
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show the toolbar"
+msgstr "Mostrar barra de _herramientas"
+
+#: ../shell/e-shell-window-actions.c:1741
+msgid "_Icons Only"
+msgstr "SÃ³lo _iconos"
+
+#: ../shell/e-shell-window-actions.c:1743
+msgid "Display window buttons with icons only"
+msgstr "Mostrar los botones de la ventana sÃ³lo con iconos"
+
+#: ../shell/e-shell-window-actions.c:1748
+msgid "_Text Only"
+msgstr "SÃ³lo _texto"
+
+#: ../shell/e-shell-window-actions.c:1750
+msgid "Display window buttons with text only"
+msgstr "Mostrar los botones de la ventana sÃ³lo con texto"
+
+#: ../shell/e-shell-window-actions.c:1755
+msgid "Icons _and Text"
+msgstr "Iconos _y texto"
+
+#: ../shell/e-shell-window-actions.c:1757
+msgid "Display window buttons with icons and text"
+msgstr "Mostrar los botones de la ventana con iconos y texto"
+
+#: ../shell/e-shell-window-actions.c:1762
+msgid "Tool_bar Style"
+msgstr "Estilo de la _barra de herramientas"
+
+#: ../shell/e-shell-window-actions.c:1764
+msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
-"Evolution estÃ¡ desconectado.\n"
-"Pulse este botÃ³n para trabajar conectado."
+"Mostrar los botones de la ventana usando la configuraciÃ³n de la barra de "
+"herramientas del escritorio"
 
-#: ../shell/e-shell-window.c:778
-#, c-format
-msgid "Switch to %s"
-msgstr "Cambiar a %s"
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Define Views..."
+msgstr "Definir vistasâ?¦"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "Error del sistema desconocido."
+#: ../shell/e-shell-window-actions.c:1774
+msgid "Create or edit views"
+msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KiB"
+#: ../shell/e-shell-window-actions.c:1779
+msgid "Save Custom View..."
+msgstr "Guardar vista personalizadaâ?¦"
 
-#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "Aceptar"
+#: ../shell/e-shell-window-actions.c:1781
+msgid "Save current custom view"
+msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "Argumentos invÃ¡lidos"
+#: ../shell/e-shell-window-actions.c:1788
+msgid "C_urrent View"
+msgstr "Vista act_ual"
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "No es posible registrar en OAF"
+#: ../shell/e-shell-window-actions.c:1798
+msgid "Custom View"
+msgstr "Vista personalizada"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "No se encontrÃ³ la base de datos de configuraciÃ³n"
+#: ../shell/e-shell-window-actions.c:1800
+msgid "Current view is a customized view"
+msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
+#: ../shell/e-shell-window-actions.c:1810
+#, fuzzy
+#| msgid "Set up the page settings for your current printer"
+msgid "Change the page settings for your current printer"
+msgstr "Establecer la configuraciÃ³n de la pÃ¡gina para la impresora actual"
+
+#: ../shell/e-shell-window-actions.c:2082
+#, c-format
+msgid "Switch to %s"
+msgstr "Cambiar a %s"
+
+#: ../shell/e-shell-window-actions.c:2285
+msgid "Execute these search parameters"
+msgstr ""
+
+#: ../shell/e-shell-window-private.c:254
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "Prueba nueva"
-
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "_Prueba"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:571
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "Crea una elemento de prueba nuevo"
+#: ../shell/e-shell-window.c:292
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Pulse Â«ImportarÂ» para comenzar a importar el archivo en Evolution. "
+#: ../shell/e-shell-window.c:293
+#, fuzzy
+#| msgid "Name of new view:"
+msgid "Name of the active shell view"
+msgstr "Nombre de la vista nueva:"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Asistente de importaciÃ³n de Evolution"
+#: ../shell/e-shell-window.c:307
+#, fuzzy
+#| msgid "_Caret Mode"
+msgid "Safe Mode"
+msgstr "Activar cu_rsor"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Importar archivo"
+#: ../shell/e-shell-window.c:308
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the shell window is in safe mode"
+msgstr "Indica si el complemento estÃ¡ activado"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Lugar de importaciÃ³n"
+#: ../shell/e-shell-window.c:339
+#, fuzzy
+#| msgid "Manager"
+msgid "UI Manager"
+msgstr "Jefe"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Tipo de importador"
+#: ../shell/e-shell-window.c:340
+msgid "The shell window's GtkUIManager"
+msgstr ""
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "Seleccione la imformaciÃ³n para importar"
+#: ../shell/e-shell.c:207
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go offline..."
+msgstr "Preparando la cuenta Â«%sÂ» para desconexiÃ³n"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Seleccione un archivo"
+#: ../shell/e-shell.c:261
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go online..."
+msgstr "Preparando la cuenta Â«%sÂ» para desconexiÃ³n"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+#: ../shell/e-shell.c:324
+msgid "Preparing to quit..."
 msgstr ""
-"Bienvenido al asistente de importaciÃ³n de Evolution.\n"
-"Este asistente le guiarÃ¡ a travÃ©s del proceso de\n"
-"importaciÃ³n de archivos externos dentro de Evolution."
+
+#: ../shell/e-shell.c:688
+#, fuzzy
+#| msgid "TLS not Available"
+msgid "Network Available"
+msgstr "TLS no disponible"
+
+#: ../shell/e-shell.c:689
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the network is available"
+msgstr "Indica si el complemento estÃ¡ activado"
+
+#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "En lÃnea"
+
+#: ../shell/e-shell.c:705
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the shell is online"
+msgstr "Indica si el complemento estÃ¡ activado"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:165
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20001,7 +20630,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribuciÃ³n.\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:189
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20009,43 +20638,45 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:196
 msgid "Do not tell me again"
 msgstr "No preguntarme mÃ¡s veces"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:314
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:318
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:321
+#, fuzzy
+#| msgid "Forcibly shut down all Evolution components"
+msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:325
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigraciÃ³n desde Evolution 1.4"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:328
 msgid "Send the debugging output of all components to a file."
 msgstr "EnvÃa la salida de depuraciÃ³n de todos los componentes a un archivo."
 
-#: ../shell/main.c:503
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:505
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:614
+#: ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:540
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20059,22 +20690,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Â¿Seguro que quiere olvidar todas las contraseÃ±as almacenadas?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "No se pudo iniciar Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Â¿Seguro que quiere borrar los datos antiguos de la versiÃ³n {0}?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution no se pudo iniciar."
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20082,15 +20705,15 @@ msgstr ""
 "Olvidar sus contraseÃ±as borrarÃ¡ todas las contraseÃ±as recordadas. Se le "
 "volverÃ¡ a preguntar la prÃ³xima vez que se necesiten."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "Espacio de disco insuficiente para la actualizaciÃ³n."
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "Â¿Seguro que quiere borrar los datos antiguos?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20112,7 +20735,7 @@ msgstr ""
 "Una vez borrados, no podrÃ¡ desactualizarse a la versiÃ³n anterior de "
 "Evolution sin intervenciÃ³n manual.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20129,11 +20752,13 @@ msgstr ""
 "datos, entonces puede eliminar manualmente el contenido de &quot;"
 "evolution&quot; a su conveniencia.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+#| msgid "Upgrade from previous version failed: {0}"
+msgid "Upgrade from previous version failed:"
 msgstr "La actualizaciÃ³n desde la versiÃ³n anterior ha fallado: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20147,46 +20772,27 @@ msgstr ""
 "NecesitarÃ¡ hacer mÃ¡s espacio libre en su carpeta personal antes de que pueda "
 "continuar."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\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/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\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."
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_Olvidar"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "_Conservar los datos"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "_RecordÃ¡rmelo mÃ¡s tarde"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
+#| msgid ""
+#| "{1}\n"
+#| "\n"
+#| "If you choose to continue, you may not have access to some of your old "
+#| "data.\n"
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -20195,6 +20801,104 @@ msgstr ""
 "\n"
 "Si elige continuar, quizÃ¡ no tenga acceso a algunos de sus datos antiguos.\n"
 
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Test"
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Prueba"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Crea una elemento de prueba nuevo"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+#| msgid "Resource"
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Recurso"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+#| msgid "Create a new test item"
+msgid "Create a new test source"
+msgstr "Crea una elemento de prueba nuevo"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+#| msgid "Scanning %s"
+msgid "Starting %s"
+msgstr "Analizando %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+#| msgid "Editor not launchable"
+msgid "Not a launchable item"
+msgstr "No se puede lanzar el editor"
+
+#: ../smclient/eggsmclient.c:225
+#, fuzzy
+#| msgid "_Direct connection to the Internet"
+msgid "Disable connection to session manager"
+msgstr "ConexiÃ³n _directa a Internet"
+
+#: ../smclient/eggsmclient.c:228
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Specify file containing saved configuration"
+msgstr "ConfiguraciÃ³n del Pilot"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+#, fuzzy
+#| msgid "UID"
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:253
+#, fuzzy
+#| msgid "Show image animations"
+msgid "Show session management options"
+msgstr "Mostrar imÃ¡genes animadas"
+
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
@@ -20226,54 +20930,58 @@ msgstr ""
 "este certificado, entonces usted no confÃa en la autenticidad de este "
 "certificado a no ser que se indique otra cosa aquÃ"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:384
+#: ../smime/gui/certificate-manager.c:612
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importarâ?¦"
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
 msgstr "Todos los archivos PKCS12"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:399
+#: ../smime/gui/certificate-manager.c:626
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:714
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:507
 msgid "Purposes"
 msgstr "PropÃ³sito"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:302
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:393
 msgid "All email certificate files"
 msgstr "Todos los archivos de certificado de correos-e"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:498
 msgid "E-Mail Address"
 msgstr "DirecciÃ³n de correo-e"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:621
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "Certificados"
+
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -20679,1317 +21387,6 @@ msgstr "Introduzca la contraseÃ±a para el archivo PKCS12:"
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "No es posible ejecutar: Â«%sÂ»: %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Cerrando %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Propiedades de la _libreta de direcciones"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Cambia las propiedades de la carpeta seleccionada"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Co_piar todos los contactos aâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "Vista _previa de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "Copiar los contactos seleccionados a otra carpeta"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copiar el contenido de la carpeta seleccionada en otra carpeta"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Copiar la selecciÃ³n"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Copiar a la carpetaâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "Crear una libreta de direcciones nueva"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Cortar la selecciÃ³n"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "_Borrar la libreta de direcciones"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Borrar los contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Borrar las carpeta seleccionada"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ver todos los contactos aâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "Mover los contactos seleccionados a otra carpeta"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "Mover los contactos de la carpeta seleccionada a otra carpeta"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Mover a la carpetaâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Pega el contenido del porta papeles"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Previsualizar los contactos que imprimir"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Imprimir los contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Renombrar la carpeta seleccionada"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "G_uardar la libreta de direcciones como VCard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Guardar como VCardâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "Guardar los contactos seleccionados en una VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "Guarda los contactos de la carpeta seleccionada como VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Seleccionar todos los contactos"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "Enviar un mensaje a los contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Enviar un mensaje al contacto"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "Enviar los contactos seleccionados a otra persona"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Mostrar una ventana de vista previa de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "_Parar"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Parar"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Parar la carga"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "Ver el contacto actual"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "A_cciones"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_Copiar contacto aâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Copiar carpeta de contactos a"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_Borrar contacto"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Reenviar contactoâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Mover contacto aâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Mover contactos de la carpeta a"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "_Nuevo"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "_Renombrar"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "G_uardar contacto como vCardâ?¦"
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_Guardar los contactos de la carpeta como una VCard"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "Enviar _mensaje al contactoâ?¦"
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "DÃa"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Borrar _todas las repeticiones"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Borra todas las repeticiones"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Borra la cita"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Borrar esta repeticiÃ³n"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "Ir a"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "Retroceder"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "Avanzar"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "Lista"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Previsualiza el calendario a imprimir"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Imprime este calendario"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "Purg_ar"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Purgar reuniones y acontecimientos antiguos"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Seleccionar _fecha"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Seleccionar _hoy"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Selecciona una fecha especÃfica"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Selecciona hoy"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Mostrar como una lista"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Mostrar un dÃa"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Mostrar un mes"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Mostrar una semana"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Mostrar la semana laboral"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "Ver la cita actual"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Ver la consola de depuraciÃ³n para los mensajes de sucesos"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "Semana"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Depurar sucesos"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "_Abrir cita"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Cancela la operaciÃ³n de correo actual"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Copia la carpeta seleccionada en otra carpeta"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Crea una carpeta nueva para almacenar correo"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Crea o edita definiciones de carpetas de bÃºsqueda"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "Descargar mensajes para cuentas/carpetas marcadas como sin conexiÃ³n"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "_Vaciar papelera"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "_Carpeta"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "Mueve la carpeta seleccionada a otra carpeta"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "Carpetas de bÃºsque_da"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "Mostrar vista _previa del mensaje"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "Mostrar la vista previa del mensaje bajo la lista de mensajes"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "Mostrar la vista previa de mensajes al lado de la lista de mensajes"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "Mostrar una ventana de vista previa de mensajes"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "Vista _clÃ¡sica"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_Copiar carpeta aâ?¦"
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "_Descargar mensajes para trabajar sin conexiÃ³n"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "_Filtros de mensajes"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "_Mover carpeta aâ?¦"
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "_Nuevaâ?¦"
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "Vista _previa"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "_Suscripcionesâ?¦"
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "Vista _vertical"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "Cambia el nombre de esta carpeta"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Cambia las propiedades de esta carpeta"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "_Contraer todas las conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Contrae todas las conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Copiar mensaje(s) seleccionado(s) al portapapeles"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "E_xpandir todas las conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "C_ompactar"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Expandir todas las conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Ocultar mensajes s_eleccionados"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensajes _borrados"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Ocultar mensajes _leÃdos"
-
-#: ../ui/evolution-mail-list.xml.h:15
-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:16
-msgid "Mar_k All Messages as Read"
-msgstr "Marcar todos los mensajes como _leÃdos"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "Marcar todos los mensajes en la carpeta como leÃdos"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "Pegar mensaje(s) desde el portapapeles"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "Elimina permanentemente esta carpeta"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "Actualizar la carpeta"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "Seleccionar s_ubconversaciÃ³n del mensaje"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "Seleccionar con_versaciÃ³n del mensaje"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "Seleccionar _todos los mensajes"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Selecciona todos los mensajes que no estÃ¡n seleccionados actualmente"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecciona todos los mensajes en la misma conversaciÃ³n que el mensaje "
-"seleccionado"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "Selecciona todos los mensajes visibles"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "_Mostrar mensajes ocultos"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Oculta temporalmente todos los mensajes que han sido leÃdos"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "Oculta temporalmente los mensajes seleccionados"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "Lista de mensajes por conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "A_grupar por conversaciones"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "_AÃ±adir remitente a la libreta"
-
-# ColisiÃ³n en la A
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "Aplicar _filtros"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "AÃ±ade el remitente a la libreta de direcciones"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "_Todas las cabeceras del mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Aplica filtros a los mensajes seleccionados"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Detectar _SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "Redactar un mensaje _nuevo"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Responde a todos los destinatarios del mensaje seleccionado"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Responde al remitente del mensaje seleccionado"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Copia mensajes seleccionados a otra carpeta"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Copiar los mensajes seleccionados al portapapeles"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "Crear _regla"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Crea una carpeta de bÃºsqueda para estos destinatarios"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Crea una carpeta de bÃºsqueda para esta lista de correo"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Crea una carpeta de bÃºsqueda para este remitente"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Crea una carpeta de bÃºsqueda para este asunto"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Crea una regla para filtrar los mensajes de este remitente"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Crea una regla para filtrar los mensajes con este asunto"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Corta los mensajes seleccionados al portapapeles"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "Reduce el tamaÃ±o del texto"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Mostrar el mensaje siguiente importante"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Mostrar el mensaje siguiente"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Mostrar la siguiente conversaciÃ³n"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Mostrar el siguiente mensaje no leÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Mostrar el anterior mensaje importante"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Mostrar el mensaje anterior"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Mostrar el anterior mensaje no leÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "Reenviar _comoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Filtro segÃºn la _lista de correoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Filtro segÃºn el _remitenteâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Filtro segÃºn los _destinatariosâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Filtro segÃºn el _asuntoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Marcar los mensajes seleccionados para seguimiento"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "Se_guimientoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Fuerza la carga de imÃ¡genes en el correo HTML"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "ReenvÃa el mensaje seleccionado en el cuerpo de un mensaje nuevo"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "ReenvÃa el mensaje seleccionado citado como una respuesta"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "ReenvÃa a alguien el mensaje seleccionado"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "ReenvÃa a alguien el mensaje seleccionado como un adjunto"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Incrementar el tamaÃ±o del texto"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Mar_car como"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Marcar los mensajes seleccionados como leÃdos"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Marcar los mensajes seleccionados como importantes"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Marcar los mensajes seleccionados como SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Marcar los mensajes seleccionados como no SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Marcar los mensajes seleccionados como no leÃdos"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Marcar los mensajes seleccionados como no importantes"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Marcar los mensajes seleccionados para borrar"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Mueve los mensajes seleccionados a otra carpeta"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Mensaje siguiente _importante"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "_ConversaciÃ³n siguiente"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Mensaje siguiente _no leÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "No es SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "Abre una ventana para escribir un mensaje de correo"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Abre los mensajes seleccionados en una ventana nueva"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Abre los mensajes seleccionados en el editor para editarlo"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "Mensaje anterior n_o leÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "Pega los mensajes desde el portapapeles"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "Mensaje anterior i_mportante"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "Vista previa del mensaje que va a imprimirse"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "Imprime este mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "Re_dirigir"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "Restablecer el texto a su tamaÃ±o original"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "Guarda los mensajes como un archivo de texto"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatariosâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "Carpeta de bÃºsqueda segÃºn el a_suntoâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "Carpeta de bÃºsqueda segÃºn el r_emitenteâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "Busca un texto en el cuerpo del mensaje mostrado"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "Seleccionar _todo el texto"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "Selecciona todo el texto de un mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "Establecer la configuraciÃ³n de la pÃ¡gina para la impresora actual"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "Mostrar mensaje de correo-e en bruto"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "Recupera los mensajes seleccionados"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "N_o importante"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "_Reducir"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "_Adjunto"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "Activar cu_rsor"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "_Quitar marca"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "_Borrar el mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "B_uscar en el mensajeâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "Ma_rcar como terminado"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "_Ir a"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "_Importante"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "_Incluido en lÃnea"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "_SPAM"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "Cargar _imÃ¡genes"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "Me_nsaje en bruto"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "Mensaje _siguiente"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "TamaÃ±o _normal"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "No es SPA_M"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "_Abrir en una ventana nueva"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "Mensaje _anterior"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "_Citado"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "_LeÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "_Guardar mensajeâ?¦"
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "_Recuperar mensaje"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "_No leÃdo"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "_Ampliar"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "_Ampliar"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Barra de herramientas principal"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Copia la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Corta la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Borra las notas seleccionadas"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Pegar notas desde el portapapeles"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Vista previa de la lista de notas a imprimir"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Imprime la lista de notas"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Ver la nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Abrir nota"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Copia las tareas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Corta las tareas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Borra las tareas terminadas"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Borra las tareas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "_Marcar como terminado"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Marcar tareas seleccionadas como terminadas"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "Pega las tareas del portapapeles"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "Vista previa de la lista de tareas a imprimir"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Imprime la lista de tareas"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Mostrar una ventana de vista previa de tarea"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_Vista previa de tarea"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "Ver la tarea seleccionada"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "_Abrir tarea"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Acerca de Evolutionâ?¦"
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Cambia la configuraciÃ³n de Evolution"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "Cambia la visibilidad de la barra de herramientas"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "Crea una ventana nueva mostrando esta carpeta"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Mostrar los botones de la ventana usando la configuraciÃ³n de la barra de "
-"herramientas del escritorio"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Mostrar los botones de la ventana con iconos y texto"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Mostrar los botones de la ventana sÃ³lo con iconos"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Mostrar los botones de la ventana sÃ³lo con texto"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "P+_F de Evolution"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Sale del programa"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Olvida las contraseÃ±as almacenadas asÃ que se le preguntarÃ¡n de nuevo"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "Ocultar los botones de la ventana"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "I_mportarâ?¦"
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "Iconos _y texto"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "Importa datos de otros programas"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "_DistribuciÃ³n"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "_Ventana nueva"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Abrir la pÃ¡gina web de preguntas mÃ¡s frecuentes"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "Config_uraciÃ³n de pÃ¡ginaâ?¦"
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "Prefere_ncias"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "Enviar / Reci_bir"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "EnvÃa el correo en la cola y obtiene el nuevo"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "ConfiguraciÃ³n del Pilot"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "Mostrar barra _lateral"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "Mostrar barra de _estado"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "Mostrar barra de _herramientas"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Mostrar informaciÃ³n acerca de Evolution"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "EnvÃa un informe de fallos"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Enviar informe de _fallos"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "EnvÃa un informe de fallos usando Bug Buddy"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Cambiar si se estÃ¡ trabajando desconectado."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "Estilo de la _barra de herramientas"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "Ver/Ocultar la barra de lateral"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "Ver/Ocultar la barra de estado"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "Trabajar _desconectado"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "Acerca _de"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_Cerrar ventana"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_Olvidar contraseÃ±as"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "_Preguntas mÃ¡s frecuentes"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "_Ocultar botones"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "SÃ³lo _iconos"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "_Referencia rÃ¡pida"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "Apariencia del _selector"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "Opciones de _sincronizaciÃ³nâ?¦"
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "SÃ³lo _texto"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_Ventana"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _compaÃ±Ãa"
@@ -22140,46 +21537,6 @@ msgstr "_Crear vista nueva"
 msgid "_Replace existing view"
 msgstr "_Reemplazar vista existente"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "Vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "Guardar vista personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "Definir vistasâ?¦"
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "Vista act_ual"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "Seleccionar vista: %s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "La vista actual es una vista personalizada"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "Guardar vista personalizadaâ?¦"
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "Guardar la vista actual personalizada"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "Crear o editar vistas"
-
 #: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "FÃ¡brica"
@@ -22200,57 +21557,56 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.c:990
-msgid "Attached message"
-msgstr "Mensaje adjunto"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "Existe una operaciÃ³n de carga en progreso"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "_Predeterminada"
 
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "Existe una operaciÃ³n de guardado en progreso"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+#| msgid "Account name"
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
 
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load '%s'"
-msgstr "No se pudo cargar Â«%sÂ»"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-msgid "Could not load the attachment"
-msgstr "No se pudo cargar el adjunto"
+#: ../widgets/misc/e-action-combo-box.c:388
+#, fuzzy
+#| msgid "_Actions"
+msgid "Action"
+msgstr "A_cciones"
 
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-msgid "Could not open '%s'"
-msgstr "No se pudo abrir Â«%sÂ»"
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-msgid "Could not open the attachment"
-msgstr "No se pudo abrir el adjunto"
+#. Translators: This is a cancelled activity.
+#: ../widgets/misc/e-activity.c:224
+#, fuzzy, c-format
+#| msgid "Cancelled"
+msgid "%s (cancelled)"
+msgstr "Cancelado"
 
-#: ../widgets/misc/e-attachment.c:2635
-msgid "Attachment contents not loaded"
-msgstr "No se cargÃ³ el contenido del adjunto"
+#. Translators: This is a completed activity.
+#: ../widgets/misc/e-activity.c:227
+#, fuzzy, c-format
+#| msgid "%s (%d%% complete)"
+msgid "%s (completed)"
+msgstr "%s (%d%% completado)"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-msgid "Could not save '%s'"
-msgstr "No se pudo guardar Â«%sÂ»"
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../widgets/misc/e-activity.c:231
+#, fuzzy, c-format
+#| msgid "%s (...)"
+msgid "%s..."
+msgstr "%s (â?¦)"
 
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-activity.c:236
 #, c-format
-msgid "Could not save the attachment"
-msgstr "No se pudo guardar el adjunto"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% completado)"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -22268,6 +21624,10 @@ msgstr "Tipo MIME:"
 msgid "Could not set as background"
 msgstr "No se pudo establecer como fondo"
 
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Establecer como _fondo"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -22315,6 +21675,12 @@ msgid_plural "Save Attachments"
 msgstr[0] "Guarda el adjunto"
 msgstr[1] "Guardar los adjuntos"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "Guardar _todo"
@@ -22323,6 +21689,14 @@ msgstr "Guardar _todo"
 msgid "A_dd Attachment..."
 msgstr "_AÃ±adir adjuntoâ?¦"
 
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "_Ocultar"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "_Ver incluido"
+
 #: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
@@ -22333,6 +21707,59 @@ msgstr "Abrir con Â«%sÂ»"
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
 
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Mensaje adjunto"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Existe una operaciÃ³n de carga en progreso"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Existe una operaciÃ³n de guardado en progreso"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "No se pudo cargar Â«%sÂ»"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "No se pudo cargar el adjunto"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "No se pudo abrir Â«%sÂ»"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "No se pudo abrir el adjunto"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "No se cargÃ³ el contenido del adjunto"
+
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+msgid "Could not save '%s'"
+msgstr "No se pudo guardar Â«%sÂ»"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "No se pudo guardar el adjunto"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+#, fuzzy
+#| msgid "Click to open %s"
+msgid "Ctrl-click to open a link"
+msgstr "Pulse para abrir %s"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
@@ -22383,14 +21810,14 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Ancho mÃnimo"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-item.c:3063
@@ -22401,192 +21828,157 @@ msgstr "Ancho mÃnimo"
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "Ahora"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "La fecha debe estar en el formato: %s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "Ã?rabe"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "BÃ¡ltico"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "Centroeuropeo"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "Chino"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "CirÃlico"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "Griego"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "JaponÃ©s"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "Coreano"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "TailandÃ©s"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "Turco"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "Europeo occidental"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "Europeo occidental, nuevo"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "tradicional"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "simplificado"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "visual"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Conjunto de caracteres desconocido: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "CodificaciÃ³n de caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Introduzca el conjunto de caracteres a usar"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "Otroâ?¦"
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "C_odificaciÃ³n de caracteres"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:412
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:432
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:454
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botÃ³n para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:496
 msgid "Drop-down combination box to select time"
 msgstr "Caja combo desplegable para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:572
 msgid "No_w"
 msgstr "_Ahora"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:578
 msgid "_Today"
 msgstr "_Hoy"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:586
+msgid "_None"
+msgstr "_Ninguna"
+
+#: ../widgets/misc/e-dateedit.c:1679
 msgid "Invalid Date Value"
 msgstr "Valor de fecha invÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1715
 msgid "Invalid Time Value"
 msgstr "Valor de hora invÃ¡lido"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "BÃºsqueda avanzada"
+#: ../widgets/misc/e-import-assistant.c:223
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Elija el archivo que quiere importar en Evolution y seleccione de la lista "
+"el tipo de archivo que es."
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "Guardar bÃºsqueda"
+#: ../widgets/misc/e-import-assistant.c:240
+msgid "F_ilename:"
+msgstr "Nombre del _archivo:"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "_BÃºsquedas"
+#: ../widgets/misc/e-import-assistant.c:250
+msgid "Select a file"
+msgstr "Elija un archivo"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "BÃºsquedas"
+#: ../widgets/misc/e-import-assistant.c:264
+msgid "File _type:"
+msgstr "_Tipo de archivo:"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "_Guardar bÃºsquedaâ?¦"
+#: ../widgets/misc/e-import-assistant.c:307
+msgid "Choose the destination for this import"
+msgstr "Elija el destino de esta importaciÃ³n"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "_Editar bÃºsquedas guardadasâ?¦"
+#: ../widgets/misc/e-import-assistant.c:332
+msgid "Choose the type of importer to run:"
+msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "BÃºsqueda _avanzadaâ?¦"
+#: ../widgets/misc/e-import-assistant.c:340
+msgid "Import data and settings from _older programs"
+msgstr "Importar datos y configuraciÃ³n de programas _antiguos"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Todas las cuentas"
+#: ../widgets/misc/e-import-assistant.c:348
+msgid "Import a _single file"
+msgstr "Importar un _Ãºnico archivo"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Cuenta actual"
+#: ../widgets/misc/e-import-assistant.c:436
+#, fuzzy
+#| msgid ""
+#| "Evolution checked for settings to import from the following\n"
+#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+#| "settings found. If you would like to\n"
+#| "try again, please click the \"Back\" button.\n"
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution comprobÃ³ la configuraciÃ³n para importar de las siguientes \n"
+"aplicaciones: Pine, Netscape, Elm, iCalendar. No se encontrÃ³ ninguna\n"
+"configuraciÃ³n que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
+"el botÃ³n Â«AtrÃ¡sÂ».\n"
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Carpeta actual"
+#: ../widgets/misc/e-import-assistant.c:823
+#: ../widgets/misc/e-import-assistant.c:839
+msgid "Evolution Import Assistant"
+msgstr "Asistente de importaciÃ³n de Evolution"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "Elija una imagen"
+#: ../widgets/misc/e-import-assistant.c:832
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Import Assistant.\n"
+#| "With this assistant you will be guided through the process of\n"
+#| "importing external files into Evolution."
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Bienvenido al asistente de importaciÃ³n de Evolution.\n"
+"Este asistente le guiarÃ¡ a travÃ©s del proceso de\n"
+"importaciÃ³n de archivos externos dentro de Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:848
+msgid "Importer Type"
+msgstr "Tipo de importador"
+
+#: ../widgets/misc/e-import-assistant.c:857
+msgid "Select Information to Import"
+msgstr "Seleccione la imformaciÃ³n para importar"
+
+#: ../widgets/misc/e-import-assistant.c:865
+msgid "Select a File"
+msgstr "Seleccione un archivo"
+
+#: ../widgets/misc/e-import-assistant.c:873
+msgid "Import Location"
+msgstr "Lugar de importaciÃ³n"
+
+#: ../widgets/misc/e-import-assistant.c:880
+#, fuzzy
+#| msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Pulse Â«ImportarÂ» para comenzar a importar el archivo en Evolution. "
+
+#: ../widgets/misc/e-import-assistant.c:886
+#: ../widgets/misc/e-import-assistant.c:895
+#, fuzzy
+#| msgid "Important"
+msgid "Import Data"
+msgstr "Importante"
 
 #: ../widgets/misc/e-map.c:605
 msgid "World Map"
@@ -22601,14 +21993,60 @@ msgstr ""
 "horaria. Los usuarios que sÃ³lo dispongan de teclado pueden, en su lugar, "
 "seleccionar la zona horaria desde la caja combinada desplegable inferior."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "En lÃnea"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently online.\n"
+#| "Click on this button to work offline."
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolution estÃ¡ conectado.\n"
+"Pulse este botÃ³n para trabajar desconectado."
+
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolution estÃ¡ desconectado.\n"
+"Pulse este botÃ³n para trabajar conectado."
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"Evolution estÃ¡ desconectado.\n"
+"Pulse este botÃ³n para trabajar conectado."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "El botÃ³n de estado estÃ¡ en lÃnea"
 
+#: ../widgets/misc/e-paned.c:234
+#, fuzzy
+#| msgid "Horizontal pane position"
+msgid "Horizontal Position"
+msgstr "PosiciÃ³n horizontal del panel"
+
+#: ../widgets/misc/e-paned.c:235
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:246
+#, fuzzy
+#| msgid "Vertical pane position"
+msgid "Vertical Position"
+msgstr "PosiciÃ³n del panel vertical"
+
+#: ../widgets/misc/e-paned.c:247
+msgid "Pane position when oriented vertically"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -22621,68 +22059,19 @@ msgstr "Sincr. registros privados:"
 msgid "Sync Categories:"
 msgstr "Sincr. categorÃas:"
 
-#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "Mensaje vacÃo"
-
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "Modelo de reflujo"
-
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "Anchura de columna"
-
-#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "Buscar"
-
-#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "Pulse aquÃ para cambiar el tipo de bÃºsqueda"
-
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "_Buscar"
-
-# En conflicto con _Buscar del menu principal
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "B_uscar ahora"
-
-# Conflicto con _Ver del menÃº principal
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "_Vaciar"
-
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "ID de elemento"
-
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "Texto"
-
-# #En conflicto con _Mensaje
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
-msgid "Sho_w: "
-msgstr "M_ostrar: "
+#: ../widgets/misc/e-popup-action.c:173
+#, fuzzy
+#| msgid "Source Account"
+msgid "Source Action"
+msgstr "Cuenta de origen"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "B_uscar: "
+#: ../widgets/misc/e-popup-action.c:174
+msgid "The source action to proxy"
+msgstr ""
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
-msgid " i_n "
-msgstr " e_n "
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Preferencias de Evolution"
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22839,27 +22228,155 @@ msgstr "_Cuando convenga"
 msgid "_When opened:"
 msgstr "_Al abrir:"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (â?¦)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Sin nombre"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% completado)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "_Guardar y cerrar"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "Editar firma"
+
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "Nombre de la _firma"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+#| msgid "Add signature script"
+msgid "Add Signature Script"
+msgstr "AÃ±adir un script de firma"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+#| msgid "Edit Signature"
+msgid "Edit Signature Script"
+msgstr "Editar firma"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "AÃ±adir _script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used for display purposes only."
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"La salida de este script se usarÃ¡ como su firma. El nombre que especifique "
+"se usarÃ¡ Ãºnicamente para mostrarlo por pantalla. "
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+#| msgid "_Script:"
+msgid "S_cript:"
+msgstr "_Script:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+#| msgid "The script file must exist and be executable."
+msgid "Script file must be executable."
+msgstr "El archivo de script debe existir y ser ejecutable."
 
 #: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Pulse aquÃ para ir a la URL"
 
+#: ../widgets/misc/e-web-view.c:305
+#, fuzzy
+#| msgid "Copy things to the clipboard."
+msgid "Copy the link to the clipboard"
+msgstr "Copiar cosas al portapapeles."
+
+#: ../widgets/misc/e-web-view.c:315
+#, fuzzy
+#| msgid "_Open Link in Browser"
+msgid "Open the link in a web browser"
+msgstr "_Abrir enlace en el navegador"
+
+#: ../widgets/misc/e-web-view.c:323
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "_Copy Email Address"
+msgstr "Copiar direcciÃ³n de _correo-e"
+
+#: ../widgets/misc/e-web-view.c:325
+#, fuzzy
+#| msgid "Copy things to the clipboard."
+msgid "Copy the email address to the clipboard"
+msgstr "Copiar cosas al portapapeles."
+
+#: ../widgets/misc/e-web-view.c:332
+#, fuzzy
+#| msgid "Convert a mail message to a task."
+msgid "Send a mail message to this address"
+msgstr "Convertir el mensaje de correo en una tarea."
+
+#: ../widgets/misc/e-web-view.c:576
+#, c-format
+msgid "Click to mail %s"
+msgstr "Pulse para enviar correo a %s"
+
+#: ../widgets/misc/e-web-view.c:578 ../widgets/misc/e-web-view.c:580
+#: ../widgets/misc/e-web-view.c:582
+#, c-format
+msgid "Click to call %s"
+msgstr "Pulse para llamar a %s"
+
+#: ../widgets/misc/e-web-view.c:584
+msgid "Click to hide/unhide addresses"
+msgstr "Pulse para ocultar/mostrar las direcciones"
+
+#: ../widgets/misc/e-web-view.c:586
+#, c-format
+msgid "Click to open %s"
+msgstr "Pulse para abrir %s"
+
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendario: desde %s a %s"
+
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "elemento de calendario de Evolution"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "lista emergente"
 
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "Ahora"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "La fecha debe estar en el formato: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
+
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Columna seleccionada"
@@ -22892,6 +22409,12 @@ msgstr "Color de la columna"
 msgid "BG Color Column"
 msgstr "Color de fondo de la columna"
 
+#: ../widgets/table/e-table-click-to-add.c:576
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "pulse para aÃ±adir"
+
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Estado"
@@ -22926,7 +22449,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22939,7 +22462,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "Descendente"
 
@@ -23107,60 +22630,60 @@ msgstr "Altura uniforme de la fila"
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1447
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1467
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1468
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "Add a C_olumn..."
 msgstr "AÃ±adir una c_olumnaâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "A_lignment"
 msgstr "A_lineaciÃ³n"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "B_est Fit"
 msgstr "Ajust_e automÃ¡tico"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Format Column_s..."
 msgstr "Formatear columna_sâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actualâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1555
 msgid "_Custom"
 msgstr "_Personalizado"
 
@@ -23214,6 +22737,64 @@ msgstr "TamaÃ±o del expansor"
 msgid "Size of the expander arrow"
 msgstr "TamaÃ±o de la flecha del expansor"
 
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "emergente"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "emerger un descendiente"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "editar"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "empezar a editar esta celda"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "cambiar"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "cambiar la celda"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "expandir"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "expande la fila en el ETree que contiene esta celda"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "contraer"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "contrae la fila en el ETree que contiene esta celda"
+
+#: ../widgets/table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "Celda de la tabla"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "pulsar"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "ordenar"
+
+#: ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "Seleccionar todo"
+
 #: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
@@ -23222,6 +22803,10 @@ msgstr "MÃ©todos de entrada"
 msgid "Event Processor"
 msgstr "Procesador de acontecimientos"
 
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "Texto"
+
 #: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Negrita"
@@ -23319,6 +22904,1651 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "search bar"
+#~ msgstr "barra de bÃºsqueda"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "barra de bÃºsqueda del calendario de Evolution"
+
+#~ msgid "Combo Button"
+#~ msgstr "BotÃ³n combo"
+
+#~ msgid "Activate Default"
+#~ msgstr "Activar predeterminados"
+
+#~ msgid "Popup Menu"
+#~ msgstr "MenÃº emergente"
+
+#~ msgid "C_ontacts"
+#~ msgstr "C_ontactos"
+
+#~ msgid "Configure contacts and autocompletion here"
+#~ msgstr "Configure los contactos y el autocompletado aquÃ"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Libreta de direcciones de Evolution"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "DirecciÃ³n emergente en la libreta de direcciones de Evolution"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Componente de libreta de direcciones de Evolution"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Control de gestiÃ³n de certificados S/MIME de Evolution"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Control de configuraciÃ³n de preferencias de carpetas de Evolution"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Gestione sus certificados S/MIME aquÃ"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "FallÃ³ al actualizar la configuraciÃ³n de la libreta o las carpetas."
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Renombrar la carpeta Â«%sÂ» a:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "Renombrar carpeta"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Guardar como vCardâ?¦"
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "Selector de origen de contactos"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "PosiciÃ³n del panel vertical, entre las vistas de tarjeta y la vista de "
+#~ "lista y el panel de vista previa, en pÃxeles."
+
+#~ msgid "Look up in address books"
+#~ msgstr "Buscar en las libretas de direcciones"
+
+#~ msgid "Name begins with"
+#~ msgstr "El nombre empieza por"
+
+#~ msgid "_Print"
+#~ msgstr "Im_primir"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "_Copiar a la libreta de direccionesâ?¦"
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "Mo_ver a la libreta de direccionesâ?¦"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "P_aste"
+#~ msgstr "_Pegar"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "Consultando la libreta de direccionesâ?¦"
+
+#~ msgid "Calendars"
+#~ msgstr "Calendarios"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "Configure su zona horaria, calendario y lista de tareas aquÃ"
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Calendario y tareas de Evolution"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Control de configuraciÃ³n del calendario de Evolution"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Visor de mensajes de planificaciÃ³n del calendario de Evolution"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Editor de calendario/tareas de Evolution"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Componente de Calendario de Evolution"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Componente de Notas de Evolution"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Componente de Tareas de Evolution"
+
+#~ msgid "Memo_s"
+#~ msgstr "_Notas"
+
+#~ msgid "_Calendars"
+#~ msgstr "_Calendarios"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Servicio de notificaciÃ³n por alerta del Calendario de Evolution"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "No es posible inicializar Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr ""
+#~ "No es posible crear la fÃ¡brica del servicio de la alerta de notificaciÃ³n, "
+#~ "quizÃ¡ ya se estÃ© ejecutandoâ?¦"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "PosiciÃ³n del la hoja vertical, entre la lista de tareas y el la hoja de "
+#~ "vista previa de tareas, en pÃxeles."
+
+#~ msgid "Category is"
+#~ msgstr "CategorÃa es"
+
+#~ msgid "Comment contains"
+#~ msgstr "El comentario contiene"
+
+#~ msgid "Location contains"
+#~ msgstr "El lugar contiene"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Hacer esto disponible para su uso desconectado"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "_No hacer esto disponible sin conexiÃ³n"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "FallÃ³ al actualizar calendarios."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "No es posible abrir el calendario Â«%sÂ» para crear acontecimientos y "
+#~ "reuniones"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr ""
+#~ "No hay un calendario disponible para crear acontecimientos y reuniones"
+
+#~ msgid "New appointment"
+#~ msgstr "Cita nueva"
+
+#~ msgid "New meeting"
+#~ msgstr "ReuniÃ³n nueva"
+
+#~ msgid "New all day appointment"
+#~ msgstr "Cita nueva para todo el dÃa"
+
+#~ msgid "New calendar"
+#~ msgstr "Calendario nuevo"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Error al abrir el calendario"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "MÃ©todo no soportado al abrir el calendario"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Permiso denegado para abrir el calendario"
+
+#~ msgid "_Add "
+#~ msgstr "_AÃ±adir "
+
+#~ msgid "_Save As..."
+#~ msgstr "Guardar _comoâ?¦"
+
+#~ msgid "P_rint..."
+#~ msgstr "_Imprimirâ?¦"
+
+#~ msgid "C_ut"
+#~ msgstr "C_ortar"
+
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_Marcar tareas seleccionadas como terminadas"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_Marcar tareas seleccionadas como incompletas"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "_Borrar las tareas seleccionadas"
+
+#~ msgid "Select T_oday"
+#~ msgstr "Seleccionar _hoy"
+
+#~ msgid "_Select Date..."
+#~ msgstr "_Seleccionar fechaâ?¦"
+
+#~ msgid "Pri_nt..."
+#~ msgstr "_Imprimirâ?¦"
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "_Borrar las notas seleccionadas"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "Terminando tareasâ?¦"
+
+#~ msgid "Expunging"
+#~ msgstr "Compactando"
+
+#~ msgid "_Custom View"
+#~ msgstr "Vista _personalizada"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Guardar vista personalizada"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_Definir vistasâ?¦"
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "Cargando tareas de %s"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "Cargando notas en %s"
+
+#~ msgid "Purging"
+#~ msgstr "Compactando"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Fallo al actualizar las notas."
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "No es posible abrir la lista de notas Â«%sÂ» para crear acontecimientos y "
+#~ "reuniones"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "No hay un calendario disponible para crear notas"
+
+#~ msgid "New shared memo"
+#~ msgstr "Nota nueva compartida"
+
+#~ msgid "New memo list"
+#~ msgstr "Lista de notas nueva"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "_Lista de notas"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "Fallo al actualizar las tareas."
+
+#~ 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 acontecimientos y "
+#~ "reuniones"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "No hay un calendario disponible para crear tareas"
+
+#~ msgid "New task"
+#~ msgstr "Tarea nueva"
+
+#~ msgid "New assigned task"
+#~ msgstr "Nueva tarea asignada"
+
+#~ msgid "New task list"
+#~ msgstr "Lista de tareas nueva"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Lista de ta_reas"
+
+# #En conflicto con _Mensaje
+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgid "Hide"
+#~ msgstr "Ocultar"
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "Opciones de envÃo sÃ³lo disponibles para cuentas Novell Groupwise y "
+#~ "Microsoft Exchange."
+
+#~ msgid "Send options not available."
+#~ msgstr "Opciones de envÃo no disponibles."
+
+#~ msgid "Evolution Information"
+#~ msgstr "InformaciÃ³n de Evolution"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Consulta de Evolution"
+
+#~ msgid "Component"
+#~ msgstr "Componente"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "El nombre de la etiqueta no puede estar vacÃo."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr ""
+#~ "Ya existe una etiqueta con el mismo nombre en el servidor. Renombre la "
+#~ "etiqueta."
+
+#~ msgid "Test"
+#~ msgstr "Prueba"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr ""
+#~ "Configure las preferencias de correo incluyendo seguridad y visualizaciÃ³n "
+#~ "de mensajes, aquÃ"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "Configure la ortografÃa, firmas y el editor de mensajes aquÃ"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "Configure sus cuentas de correo aquÃ"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "Configure sus conexiones de red aquÃ"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Correo de Evolution"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Control de configuraciÃ³n de cuentas de correo de Evolution"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Componente de correo de Evolution"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Redactor de correo de Evolution"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Control de configuraciÃ³n del redactor de correo de Evolution"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Control de preferencias de Evolution"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Control de configuraciÃ³n de red de Evolution"
+
+#~ msgid "[Default]"
+#~ msgstr "[Predeterminada]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "Firma(s)"
+
+#~ msgid "Account Search"
+#~ msgstr "BÃºsqueda en la cuenta"
+
+#~ msgid "All Account Search"
+#~ msgstr "BÃºsqueda en todas las cuentas"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Copiar a la carpeta"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_Mover a la carpeta"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "Cancelar _arrastre"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Abrir en una ventana _nueva"
+
+#~ msgid "_Move..."
+#~ msgstr "_Moverâ?¦"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Actuali_zar"
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "Carpeta de bÃºsqueda de _no leÃdos"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Recuperar"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Ma_rcar como terminado"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "_Quitar marca"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Crear re_gla desde el mensaje"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "Carpeta de bÃºsqueda segÃºn el a_sunto"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "Carpeta de bÃºsqueda segÃºn el r_emitente"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatarios"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "Filtro segÃºn el _asunto"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "Filtro segÃºn el _remitente"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "Filtro segÃºn los _destinatarios"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "Filtro segÃºn la lista de _correo"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "_Ajustar al ancho"
+
+#~ msgid "Show _Original Size"
+#~ msgstr "Mostrar tamaÃ±o _original"
+
+#~ msgid "Tag"
+#~ msgstr "Etiqueta"
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "imagen-_sin-tÃtulo.%s"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "_Responder al remitente"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Abrir en %sâ?¦"
+
+#~ msgid "Add address"
+#~ msgstr "AÃ±adir direcciÃ³n"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "Altura predeterminada de la ventana del mensaje."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "Anchura predeterminada de la ventana de mensajes."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "Si el panel de Â«Vista previaÂ» estÃ¡ activado, entonces lo muestra en el "
+#~ "lateral en vez de verticalmente."
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr ""
+#~ "Habilita/deshabilita la caracterÃstica donde la pregunta de si se "
+#~ "requiere sincronizaciÃ³n antes de pasar al modo trabajar desconectado se "
+#~ "repite."
+
+#~ msgid "Message Window default height"
+#~ msgstr "Altura predeterminada de la ventana de mensajes"
+
+#~ msgid "Message Window default width"
+#~ msgstr "Anchura predeterminada de la ventana de mensajes"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr ""
+#~ "Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "Usar distribuciÃ³n lado a lado o ancha"
+
+#~ msgid "New Mail Message"
+#~ msgstr "Mensaje de correo nuevo"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "Carpeta de correo nueva"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "FallÃ³ al actualizar la configuraciÃ³n de correo o carpetas."
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "BÃ¡ltico (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "BÃ¡ltico (ISO-8859-4)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Cuentas de correo-e"
+
+#~ msgid ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+#~ msgstr ""
+#~ "Si el servidor usa un puerto no estÃ¡ndar especifique la direcciÃ³n del "
+#~ "servidor como Â«nombre-del-servidor:nÃºmero-del-puertoÂ»"
+
+#~ msgid "Signatures Table"
+#~ msgstr "Tabla de firmas"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "Â¿Borrar Â«{0}Â»?"
+
+#~ msgid "Delete account?"
+#~ msgstr "Â¿Desea borrar la cuenta?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "Â¿Borrar los mensajes en la carpeta de bÃºsqueda?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "Â¿Desea descartar los cambios?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "Marca todos los mensajes como leÃdos"
+
+#~ msgid "Querying server"
+#~ msgstr "Consultando al servidor"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "El asunto o el destinatarios contiene"
+
+#~ msgid "Subject or Sender contains"
+#~ msgstr "El asunto o el remitente contiene"
+
+#~ msgid "Audio Inline"
+#~ msgstr "Sonido en lÃnea"
+
+#~ msgid "Copy Tool"
+#~ msgstr "Herramienta de copia"
+
+#~ msgid "_Account:"
+#~ msgstr "_Cuenta:"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Nombre de la _carpeta:"
+
+#~ msgid "_User:"
+#~ msgstr "_Usuario:"
+
+#~ msgid "Secure Password"
+#~ msgstr "ContraseÃ±a segura"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "Esta opciÃ³n conectarÃ¡ con el servidor Exchange usando autenticaciÃ³n con "
+#~ "contraseÃ±a segura (NTLM)."
+
+#~ msgid "Plaintext Password"
+#~ msgstr "ContraseÃ±a en texto simple"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "Esta opciÃ³n conectarÃ¡ con el servidor Exchange usando autenticaciÃ³n con "
+#~ "contraseÃ±a estÃ¡ndar de texto simple."
+
+#~ msgid "Out Of Office"
+#~ msgstr "Fuera de la oficina"
+
+#~ msgid ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+#~ msgstr ""
+#~ "El mensaje especificado abajo se enviarÃ¡ automÃ¡ticamente a cada\n"
+#~ "persona que le envÃe correo mientras estÃ¡ fuera de la oficina."
+
+#~ msgid "I am out of the office"
+#~ msgstr "Ahora estoy fuera de la oficina"
+
+#~ msgid "I am in the office"
+#~ msgstr "Ahora estoy en la oficina"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "Cambie la contraseÃ±a para la cuenta de Exchange"
+
+#~ msgid "Change Password"
+#~ msgstr "Cambiar contraseÃ±a"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "Gestione los ajustes de delegaciones para la cuenta Exchange"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "Asistente de delegaciones"
+
+#~ msgid "Miscelleneous"
+#~ msgstr "MiscelÃ¡neo"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "Vea el tamaÃ±o de todas las carpetas Exchange"
+
+#~ msgid "Folders Size"
+#~ msgstr "TamaÃ±o de las carpetas"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "URL _OWA:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "A_utenticar"
+
+#~ msgid "Mailbox name is _different than user name"
+#~ msgstr "El nombre del buzÃ³n es _diferente del nombre de usuario"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "_BuzÃ³n:"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "Tipo de _autenticaciÃ³n"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KiB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KiB"
+
+#~ msgid "Size:"
+#~ msgstr "TamaÃ±o:"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Evolution estÃ¡ en modo desconectado. No puede crear o modificar carpetas "
+#~ "ahora.\n"
+#~ "Cambie a modo conectado para dichas operaciones."
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "La contraseÃ±a actual no coincide con la contraseÃ±a existente para su "
+#~ "cuenta. Introduzca la contraseÃ±a correcta"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr ""
+#~ "Las dos contraseÃ±as no coinciden. Vuelva a introducir las contraseÃ±as."
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirme la contraseÃ±a:"
+
+#~ msgid "Current Password:"
+#~ msgstr "ContraseÃ±a actual:"
+
+#~ msgid "New Password:"
+#~ msgstr "ContraseÃ±a nueva:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "Su contraseÃ±a actual ha caducado. Cambie su contraseÃ±a ahora."
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "Su contraseÃ±a caducarÃ¡ en los siguientes %d dÃas"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizado"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "Editor (lectura, creaciÃ³n, ediciÃ³n)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "Autor (lectura, creaciÃ³n)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "Revisor (sÃ³lo lectura)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "Permisos de delegados"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "Permisos para %s"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "Este mensaje se enviÃ³ automÃ¡ticamente por Evolution para informarle de "
+#~ "que ha sido designado como delegado. Ahora puede enviar mensajes en mi "
+#~ "nombre."
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "Se le han otorgado los siguientes permisos sobre mis carpetas:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "TambiÃ©n se le permite ver mis elementos privados."
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "No obstante no se le permite ver mis elementos privados."
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "Ha sido designado como delegado para %s"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "Â¿Desea quitar el delegado %s?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "No es posible acceder al Active Directory"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "No es posible encontrarse a sÃ mismo en el Active Directory"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "No es posible encontrar al delegado %s en el Active Directory"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "No es posible quitar al delegado %s"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "No es posible actualizar la lista de delegados."
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "No es posible aÃ±adir el delegado %s"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "Error al leer la lista de delegados."
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Calendario:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Co_ntactos:"
+
+#~ msgid "Delegates"
+#~ msgstr "Delegados"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+#~ msgstr ""
+#~ "Ninguno\n"
+#~ "Revisor (sÃ³lo lectura)\n"
+#~ "Autor (leer, crear)\n"
+#~ "Editor (leer, crear, editar)"
+
+#~ msgid "Permissions for"
+#~ msgstr "Permisos para"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "Estos usuarios podrÃ¡n enviar correo por usted y acceder a sus\n"
+#~ "carpetas con los permisos que usted les dÃ©."
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "El _delegado puede ver los elementos privados"
+
+#~ msgid "_Inbox:"
+#~ msgstr "_Bandeja de entrada:"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "_Resumir permisos"
+
+#~ msgid "Permissions..."
+#~ msgstr "Permisosâ?¦"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nombre de la carpeta"
+
+#~ msgid "Folder Size"
+#~ msgstr "TamaÃ±o de la carpeta"
+
+#~ msgid "User"
+#~ msgstr "_Usuario"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "Subscribirse a la carpeta de otro usuario"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "Ã?rbol de carpetas de Exchange"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "Desuscribirse de la carpetaâ?¦"
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "Â¿Seguro que desea desuscribirse de la carpeta Â«%sÂ»?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "Desuscribirse de Â«%sÂ»"
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>Actualmente, su estado es Â«Fuera de la oficinaÂ».</b>\n"
+#~ "\n"
+#~ "Â¿Quiere cambiar su estado a Â«En la oficinaÂ»? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>Mensaje para cuando estÃ© fuera de la oficina</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Estado:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>El mensaje especificado abajo se enviarÃ¡ automÃ¡ticamente a cada "
+#~ "persona que le envÃe correo mientras estÃ© fuera de la oficina. </small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "Ahora estoy en la oficina"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "Ahora no estoy en la oficina"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "No, no cambiar el estado"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "Asistente para fuera de la oficina"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "SÃ, cambiar estado"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "Alerta de caducidad de contraseÃ±aâ?¦"
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "Su contraseÃ±a caducarÃ¡ en 7 dÃasâ?¦"
+
+#~ msgid "_Change Password"
+#~ msgstr "_Cambiar contraseÃ±a"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(Permiso denegado.)"
+
+#~ msgid "Add User:"
+#~ msgstr "AÃ±adir usuario:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>Permisos</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "No es posible borrar"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "No es posible editar"
+
+#~ msgid "Create items"
+#~ msgstr "Crear elementos"
+
+#~ msgid "Create subfolders"
+#~ msgstr "Crear subcarpetas"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "Borrar cualquier elemento"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "Borrar los elementos propios"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "Editar cualquier elemento"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "Editar los elementos propios"
+
+#~ msgid "Folder contact"
+#~ msgstr "Contacto de la carpeta"
+
+#~ msgid "Folder owner"
+#~ msgstr "Propietario de la carpeta"
+
+#~ msgid "Folder visible"
+#~ msgstr "Carpeta visible"
+
+#~ msgid "Read items"
+#~ msgstr "Leer elementos"
+
+#~ msgid "Role: "
+#~ msgstr "Rol: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>ConfiguraciÃ³n del mensaje</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>Opciones de seguimiento</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchange - Opciones de envÃo"
+
+#~ msgid "I_mportance: "
+#~ msgstr "_Importacia: "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Alta\n"
+#~ "Baja"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Privado\n"
+#~ "Confidencial"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "Pedir una confirmaciÃ³n de _entrega para este mensaje"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "Pedir una confirmaciÃ³n de _lectura para este mensaje"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "Enviar como delegado"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "_Sensibilidad: "
+
+#~ msgid "_User"
+#~ msgstr "_Usuario"
+
+#~ msgid "Select User"
+#~ msgstr "Seleccionar usuario"
+
+#~ msgid "Address Book..."
+#~ msgstr "Libreta de direccionesâ?¦"
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "Subscribirse a los contactos de otro usuario"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "Subscribirse al calendario de otro usuario"
+
+#~ msgid "Activates the Evolution-Exchange extension package."
+#~ msgstr "Activa el paquete de extensiÃ³n de Evolution Exchange."
+
+#~ msgid "Exchange Operations"
+#~ msgstr "Operaciones de Exchange"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr ""
+#~ "No se puede acceder a la solapa Â«ConfiguraciÃ³n de ExchangeÂ» en modo "
+#~ "desconectado."
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr ""
+#~ "No es posible cambiar la contraseÃ±a debido a problemas de configuraciÃ³n."
+
+#~ msgid "Cannot display folders."
+#~ msgstr "No es posible mostrar carpetas."
+
+#~ msgid "Cannot perform the operation."
+#~ msgstr "No es posible efectuar la operaciÃ³n."
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "Los cambios a las opciones de la cuenta Exchange Â«{0}Â» sÃ³lo tendrÃ¡n lugar "
+#~ "despuÃ©s de reiniciar Evolution."
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "No es posible autenticar con el servidor."
+
+#~ msgid "Could not change password."
+#~ msgstr "No es posible cambiar la contraseÃ±a."
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "No es posible configurar la cuenta de Exchange porque\n"
+#~ "ocurriÃ³ un error desconocido. Compruebe el URL,\n"
+#~ "usuario y contraseÃ±a e intÃ©ntelo otra vez."
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "No es posible conectar con el servidor Exchange."
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "No es posible conectar con el servidor {0}."
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr ""
+#~ "No se pudieron determinar los permisos de la carpeta para delegados."
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr ""
+#~ "No es posible encontrar el sistema de almacenamiento Web de Exchange."
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "No es posible localizar el servidor {0}."
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "No es posible hacer de {0} un delegado"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "No se pudieron leer los permisos de la carpeta"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "No se pudieron leer los permisos de la carpeta."
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "No es posible leer el estado de disponibilidad"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "No es posible actualizar los permisos de la carpeta."
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "No es posible actualizar el estado de disponibilidad"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr ""
+#~ "Evolution requiere reiniciarse para cargar el buzÃ³n de correo del usuario "
+#~ "suscrito"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "La cuenta de Exchange estÃ¡ desconectada."
+
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "Exchange Connector requiere acceso a cierta funcionalidad\n"
+#~ "en el servidor de Exchange que parece estar desactivada\n"
+#~ "o bloqueada. (Esto normalmente no es intencional). Su \n"
+#~ "administrador de Exchange tendrÃ¡ que activar esta\n"
+#~ "funcionalidad para que usted pueda usar Ximian Connector.\n"
+#~ "\n"
+#~ "La informaciÃ³n que puede proporcionar a su administrador\n"
+#~ "de Exchange, puede obtenerla del enlace de abajo:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+
+#~ msgid "Failed to update delegates:"
+#~ msgstr "FallÃ³ al actualizar delegados:"
+
+#~ msgid "Folder already exists"
+#~ msgstr "La carpeta ya existe"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "La carpeta no existe"
+
+#~ msgid "Folder offline"
+#~ msgstr "Carpeta desconectada"
+
+#~ msgid "Generic error"
+#~ msgstr "Error genÃ©rico"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "No es posible llegar al Servidor de CatÃ¡logo Global"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "Si OWA se estÃ¡ ejecutando en una ruta diferente, debe especificarla en el "
+#~ "diÃ¡logo de configuraciÃ³n de cuenta."
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "El buzÃ³n de {0} no estÃ¡ en este servidor."
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "AsegÃºrese de que la URL es correcta e intente de nuevo."
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr ""
+#~ "AsegÃºrese de que el nombre del servidor estÃ© escrito correctamente e "
+#~ "intÃ©ntelo de nuevo."
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr ""
+#~ "AsegÃºrese de que el usuario y contraseÃ±a son correctos e intente de nuevo."
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "No hay un servidor de CatÃ¡logo Global configurado para esta cuenta."
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "No hay buzÃ³n para el usuario {0} en {1}."
+
+#~ msgid "No such user {0}"
+#~ msgstr "No existe ese usuario {0}"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "ContraseÃ±a cambiada con Ã©xito."
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr ""
+#~ "Introduzca la Id del delegado o deseleccione la opciÃ³n Enviar como "
+#~ "delegado."
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr ""
+#~ "AsegÃºrese de que el nombre del Servidor de CatÃ¡logo Global es correcto."
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
+
+#~ msgid "Please select a user."
+#~ msgstr "Seleccione un usuario."
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "El servidor rechazÃ³ la contraseÃ±a porque es demasiado dÃ©bil."
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "La cuenta de Exchange se desactivarÃ¡ cuando salga de Evolution"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "La cuenta de Exchange se eliminarÃ¡ cuando salga de Evolution"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "El servidor Exchange no es compatible con Exchange Connector."
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "El servidor estÃ¡ funcionando con Exchange 5.5. Exchange Connector\n"
+#~ "sÃ³lo soporta Microsoft Exchange 2000 y 2003."
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "Esto probablemente significa que su servidor requiere \n"
+#~ "que le especifique el nombre de dominio de Windows \n"
+#~ "como parte del nombre de usuario (ej, Â«DOMINIO\\usuarioÂ»).\n"
+#~ "\n"
+#~ "O quizÃ¡ tan sÃ³lo ha escrito mal la contraseÃ±a."
+
+#~ msgid "Try again with a different password."
+#~ msgstr "IntÃ©ntelo con una contraseÃ±a diferente."
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "No puede aÃ±adirse el usuario a la lista de control de acceso:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "Imposible editar delegados."
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "Error desconocido al buscar {0}"
+
+#~ msgid "Unknown type"
+#~ msgstr "Tipo desconocido"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "OperaciÃ³n no soportada"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr ""
+#~ "EstÃ¡ cerca de su cuota disponible para almacenar correo en este servidor."
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr ""
+#~ "Le estÃ¡ permitido mandar un mensaje en nombre de a un solo delegado cada "
+#~ "vez."
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "No puede hacerse asÃ mismo su propio delegado"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "Ha excedido su cuota para almacenar correo en este servidor."
+
+#~ msgid "You may only configure a single Exchange account."
+#~ msgstr "SÃ³lo puede configurar una sola cuenta de Exchange."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr ""
+#~ "Su uso actual es: {0} Kib. Intente hacer algo de espacio borrando algunos "
+#~ "mensajes."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr ""
+#~ "Su uso actual es: {0} Kib. No podrÃ¡ ni enviar ni recibir correo ahora."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "Su uso actual es: {0} Kib. No podrÃ¡ enviar correo hasta que haga algo de "
+#~ "espacio borrando algunos mensajes."
+
+#~ msgid "Your password has expired."
+#~ msgstr "Su contraseÃ±a ha caducado."
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} no puede aÃ±adirse a la lista de control de acceso"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} ya es un delegado"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} ya estÃ¡ en la lista"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "Suscribirse a las tareas de otros usuarios"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "Compruebe los permisos de la carpeta"
+
+#~ msgid "PNG files"
+#~ msgstr "Archivos PNG"
+
+#~ msgid "_Face"
+#~ msgstr "_Cara"
+
+#~ msgid ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+#~ msgstr ""
+#~ "Adjuntar una cabecera de cara a los correos salientes. \n"
+#~ "\n"
+#~ "Primero el usuario debe configurar una imagen PNG de 48*48 pÃxeles. EstÃ¡ "
+#~ "codificada en base64 y almacenada en ~/.evolution/faces Ã?sta opciÃ³n se "
+#~ "usarÃ¡ en los correos que se envÃen a partir de ahora."
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "Desuscribirse de carpetas"
+
+#~ msgid ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+#~ msgstr ""
+#~ "Desuscribirse de una carpeta IMAP pulsando sobre ella con el botÃ³n "
+#~ "derecho del ratÃ³n en la carpeta del Ã¡rbol."
+
+#~ msgid "Add Novell GroupWise support to Evolution."
+#~ msgstr "AÃ±adir soporte Novell GroupWise para Evolution."
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "ConfiguraciÃ³n de la cuenta GroupWise"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "La capa de abstracciÃ³n de hardware (HAL) no estÃ¡ cargada"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "Se requiere el servicio Â«haldÂ» pero actualmente no se estÃ¡ ejecutando. "
+#~ "Active el servicio y vuelva a este programa o contacte con el "
+#~ "administrador de su sistema."
+
+#~ msgid "Search for an iPod failed"
+#~ msgstr "FallÃ³ la bÃºsqueda de un iPod"
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "Evolution no pudo encontrar un iPod con el que sincronizarse. O no estÃ¡ "
+#~ "conectado al sistema o no estÃ¡ encendido."
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "Sincronizar con iPod"
+
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "Sincronizar sus datos con su iPod de Apple."
+
+#~ msgid "iPod Synchronization"
+#~ msgstr "SincronizaciÃ³n con iPod"
+
+#~ msgid "Disable an account by right-clicking on it in the folder tree."
+#~ msgstr ""
+#~ "Desactivar una cuenta pulsando con el botÃ³n derecho sobre ella en la "
+#~ "carpeta del Ã¡rbol."
+
+#~ msgid "Specify _filename:"
+#~ msgstr "Especificar nombre de a_rchivo:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "Reprod_ucir"
+
+#~ msgid "Mail-to-Task"
+#~ msgstr "Correo a tarea"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "_Responsable de la lista de contactos"
+
+#~ msgid "Get list _archive"
+#~ msgstr "Obtener _archivador de la lista"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "Obtener informaciÃ³n de _uso de la lista"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_Publicar un mensaje a la lista"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Suscribirse a la lista"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "Des_uscribirse de la lista"
+
+#~ msgid "Mono Loader"
+#~ msgstr "Cargador de Mono"
+
+#~ msgid "Support plugins written in Mono."
+#~ msgstr "Soportar complementos escritos en Mono."
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "Preferir sin formato"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "Un complemento que carga otros complementos escritos en Python."
+
+#~ msgid "Python Loader"
+#~ msgstr "Cargador de Python"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "_Guardar al disco"
+
+#~ msgid "Quickly select a single calendar or task list for viewing."
+#~ msgstr "Seleccionar rÃ¡pidamente un sÃ³lo calendario o tarea para verlo."
+
+#~ msgid "Select One Source"
+#~ msgstr "Seleccionar un origen"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "IntÃ©rprete de Evolution"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "FÃ¡brica de configuraciÃ³n del intÃ©rprete de Evolution"
+
+#~ msgid "Evolution Test"
+#~ msgstr "Prueba de Evolution"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "Componente de Prueba de Evolution"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>Conexiones activas</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "Conexiones activas"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "Pulse Â«AceptarÂ» para cerrar estas conexiones y desconectarse"
+
+#~ msgid "_Import"
+#~ msgstr "_Importar"
+
+#~ 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."
+
+#~ msgid "Error executing %s. (%s)"
+#~ msgstr "Error al ejecutar %s. (%s)"
+
+#~ msgid "Work Offline"
+#~ msgstr "Trabajar desconectado"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "Evolution estÃ¡ en proceso de desconectarse."
+
+#~ msgid "Unknown system error."
+#~ msgstr "Error del sistema desconocido."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos invÃ¡lidos"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "No es posible registrar en OAF"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "No se encontrÃ³ la base de datos de configuraciÃ³n"
+
+#~ msgid "New Test"
+#~ msgstr "Prueba nueva"
+
+#~ msgid "Import File"
+#~ msgstr "Importar archivo"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "No se pudo iniciar Evolution"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution no se pudo iniciar."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\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"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\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."
+
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "No es posible ejecutar: Â«%sÂ»: %s\n"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "Cerrando %s (%s)\n"
+
+#~ msgid "Copy"
+#~ msgstr "Copiar"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiar a la carpetaâ?¦"
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "Crear una libreta de direcciones nueva"
+
+#~ msgid "Cut"
+#~ msgstr "Cortar"
+
+#~ msgid "Forward Contact"
+#~ msgstr "Reenviar contacto"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mover a la carpetaâ?¦"
+
+#~ msgid "Paste"
+#~ msgstr "Pegar"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Guardar como VCardâ?¦"
+
+#~ msgid "Select _All"
+#~ msgstr "Seleccionar _todo"
+
+#~ msgid "Send message to contact"
+#~ msgstr "Enviar un mensaje al contacto"
+
+#~ msgid "St_op"
+#~ msgstr "_Parar"
+
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Copiar carpeta de contactos a"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_Mover contactos de la carpeta a"
+
+#~ msgid "_Rename"
+#~ msgstr "_Renombrar"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "G_uardar contacto como vCardâ?¦"
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "_Guardar los contactos de la carpeta como una VCard"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Borrar _todas las repeticiones"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostrar la semana laboral"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "Ver la consola de depuraciÃ³n para los mensajes de sucesos"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "_Depurar sucesos"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "Mostrar la vista previa de mensajes al lado de la lista de mensajes"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Copiar mensaje(s) seleccionado(s) al portapapeles"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "Pegar mensaje(s) desde el portapapeles"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr ""
+#~ "Selecciona todos los mensajes que no estÃ¡n seleccionados actualmente"
+
+#~ msgid "Cut selected messages to the clipboard"
+#~ msgstr "Corta los mensajes seleccionados al portapapeles"
+
+#~ msgid "Not Junk"
+#~ msgstr "No es SPAM"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "Pega los mensajes desde el portapapeles"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_Guardar mensajeâ?¦"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Barra de herramientas principal"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "_Marcar como terminado"
+
+#~ msgid "Show task preview window"
+#~ msgstr "Mostrar una ventana de vista previa de tarea"
+
+#~ msgid "About Evolution..."
+#~ msgstr "Acerca de Evolutionâ?¦"
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Cambia la visibilidad de la barra de herramientas"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr ""
+#~ "Olvida las contraseÃ±as almacenadas asÃ que se le preguntarÃ¡n de nuevo"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "Ocultar los botones de la ventana"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Config_uraciÃ³n de pÃ¡ginaâ?¦"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Prefere_ncias"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar / Recibir"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "EnvÃa un informe de fallos"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "Cambiar si se estÃ¡ trabajando desconectado."
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "Ver/Ocultar la barra de lateral"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "Ver/Ocultar la barra de estado"
+
+#~ msgid "Work _Offline"
+#~ msgstr "Trabajar _desconectado"
+
+#~ msgid "_About"
+#~ msgstr "Acerca _de"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "_Preguntas mÃ¡s frecuentes"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "_Ocultar botones"
+
+#~ msgid "_Quit"
+#~ msgstr "_Salir"
+
+#~ msgid "Save Custom View"
+#~ msgstr "Guardar vista personalizada"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Conjunto de caracteres desconocido: %s"
+
+#~ msgid "_Searches"
+#~ msgstr "_BÃºsquedas"
+
+#~ msgid "Choose Image"
+#~ msgstr "Elija una imagen"
+
+#~ msgid "Empty message"
+#~ msgstr "Mensaje vacÃo"
+
+#~ msgid "Reflow model"
+#~ msgstr "Modelo de reflujo"
+
+#~ msgid "Column width"
+#~ msgstr "Anchura de columna"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+# Conflicto con _Ver del menÃº principal
+#~ msgid "_Clear"
+#~ msgstr "_Vaciar"
+
+#~ msgid "Item ID"
+#~ msgstr "ID de elemento"
+
 #~ msgid " Ch_eck for Supported Types "
 #~ msgstr "_Comprobar tipos soportados "
 
@@ -23370,14 +24600,6 @@ msgstr "Tirador emergente"
 #~ msgid "Add attachment"
 #~ msgstr "AÃ±adir adjunto"
 
-# #En conflicto con _Mensaje
-#~ msgid "Show CC"
-#~ msgstr "Mostrar Cc"
-
-# #En conflicto con _Mensaje
-#~ msgid "Show BCC"
-#~ msgstr "Mostrar Cco"
-
 #~ msgid "Retrieving Message..."
 #~ msgstr "Obteniendo mensajeâ?¦"
 
@@ -24241,9 +25463,6 @@ msgstr "Tirador emergente"
 #~ msgid "Serbia And Montenegro"
 #~ msgstr "Serbia y Montenegro"
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychelles"
-
 #~ msgid "Sierra Leone"
 #~ msgstr "Sierra Leona"
 
@@ -24481,9 +25700,6 @@ msgstr "Tirador emergente"
 #~ msgid "Immediately follow each other"
 #~ msgstr "Uno inmediatamente detrÃ¡s del otro"
 
-#~ msgid "Include:"
-#~ msgstr "Incluye:"
-
 #~ msgid "Landscape"
 #~ msgstr "Horizontal"
 
@@ -24648,9 +25864,6 @@ msgstr "Tirador emergente"
 #~ msgid "Text of the expander's label"
 #~ msgstr "Texto de la etiqueta del expansor"
 
-#~ msgid "Use underline"
-#~ msgstr "Usar subrayado"
-
 #~ msgid ""
 #~ "If set, an underline in the text indicates the next character should be "
 #~ "used for the mnemonic accelerator key"
@@ -24841,9 +26054,6 @@ msgstr "Tirador emergente"
 #~ msgid "months"
 #~ msgstr "meses"
 
-#~ msgid "the current time"
-#~ msgstr "la fecha actual"
-
 #~ msgid "the time you specify"
 #~ msgstr "la fecha que especifique"
 
@@ -24853,9 +26063,6 @@ msgstr "Tirador emergente"
 #~ msgid "Do not quote"
 #~ msgstr "No entrecomillar"
 
-#~ msgid "Inline"
-#~ msgstr "Incluido en lÃnea"
-
 #~ msgid "Inline (Outlook style)"
 #~ msgstr "En lÃnea (estilo Outlook)"
 
@@ -24895,9 +26102,6 @@ msgstr "Tirador emergente"
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "Esto deberÃa probar el widget de estilo de impresiÃ³n de contactos"
 
-#~ msgid "Contact Print Test"
-#~ msgstr "Prueba de impresiÃ³n de contactos"
-
 #~ msgid "This should test the contact print code"
 #~ msgstr "Esto deberÃa probar el cÃ³digo de impresiÃ³n de los contactos"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]