[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: Thu, 19 Nov 2009 19:09:58 +0000 (UTC)
commit afdb7e97d9e5117d471a92802d27227d4aaa9c35
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Thu Nov 19 20:09:50 2009 +0100

    Updated Spanish translation

 po/es.po | 6791 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 3060 insertions(+), 3731 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index bace5e9..effd085 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:531
+#: ../shell/main.c:530
 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-11-15 13:51+0000\n"
-"PO-Revision-Date: 2009-11-15 17:34+0100\n"
+"POT-Creation-Date: 2009-11-19 14:43+0000\n"
+"PO-Revision-Date: 2009-11-19 20:03+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"
@@ -231,10 +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:517
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:518
 msgid "_Add"
 msgstr "_AÃ±adir"
 
@@ -278,209 +275,16 @@ msgstr "No se pudo cargar la libreta de direcciones"
 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/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>Correo-e</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Domicilio</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>MensajerÃa instantÃ¡nea</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>Trabajo</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>MiscelÃ¡neo</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>Notas</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>Otro</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>TelÃ©fono</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>PÃ¡gina web</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>Trabajo</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ca_tegorÃasâ?¦"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../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: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"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Full _Name..."
-msgstr "_Nombre completoâ?¦"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Image"
-msgstr "Imagen"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Mailing Address"
-msgstr "DirecciÃ³n de correo"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Nic_kname:"
-msgstr "Apo_do:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../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"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "Personal Information"
-msgstr "InformaciÃ³n personal"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Telephone"
-msgstr "TelÃ©fono"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Address:"
-msgstr "_DirecciÃ³n:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Anniversary:"
-msgstr "_Aniversario:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Assistant:"
-msgstr "_SecretarÃa:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "_Birthday:"
-msgstr "_CumpleaÃ±os:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:824
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1909
-msgid "_Calendar:"
-msgstr "_Calendario:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_City:"
-msgstr "_Ciudad:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Company:"
-msgstr "_Empresa:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Country:"
-msgstr "_PaÃs:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Department:"
-msgstr "_Departamento:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_File under:"
-msgstr "A_rchivar como:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Free/Busy:"
-msgstr "_Disponibilidad:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Home Page:"
-msgstr "_PÃ¡gina personal:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Manager:"
-msgstr "_Jefe:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Office:"
-msgstr "_Oficina:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_PO Box:"
-msgstr "_Apdo. de correos:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Profession:"
-msgstr "_ProfesiÃ³n:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Spouse:"
-msgstr "_CÃ³nyuge:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
-msgid "_Title:"
-msgstr "_Tratamiento:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "_Video Chat:"
-msgstr "_Charla por vÃdeo:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "_Wants to receive HTML mail"
-msgstr "_Quiere recibir el correo como HTML"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "_Web Log:"
-msgstr "_Diario web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "_Where:"
-msgstr "_DÃ³nde:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "_Zip/Postal Code:"
-msgstr "_CÃ³digo postal:"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
 #: ../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-define-views-dialog.c:338
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "Nombre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
 #: ../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
@@ -490,67 +294,67 @@ msgstr "Nombre"
 #: ../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
+#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
 #: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Editable"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:476
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:479
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:481
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:538
+#: ../addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:480
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:534
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/widgets/eab-contact-display.c:477
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/widgets/eab-contact-display.c:483
 msgid "Skype"
 msgstr "Skype"
 
 #. red
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/widgets/eab-contact-display.c:506
 #: ../modules/mail/e-mail-shell-migrate.c:957
 msgid "Work"
 msgstr "Trabajo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
 msgid "Home"
 msgstr "Domicilio"
 
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/widgets/eab-contact-display.c:389
 #: ../calendar/gui/e-calendar-view.c:1542
 msgid "Other"
 msgstr "Otro"
@@ -576,6 +380,12 @@ msgstr "Libro origen"
 msgid "Target Book"
 msgstr "Libro destino"
 
+#: ../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/e-contact-editor.c:319
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
@@ -592,21 +402,27 @@ msgstr "Campos requeridos"
 msgid "Changed"
 msgstr "Modificados"
 
+#: ../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:2494
+msgid "Contact Editor"
+msgstr "Editor de contactos"
+
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2489
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3156
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -614,23 +430,23 @@ msgstr ""
 "Los datos del contacto son invÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3160
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â«%sÂ» tiene un formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
 #, 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:3181
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3193
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ«%sÂ» estÃ¡ vacÃo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3206
 msgid "Invalid contact."
 msgstr "Contacto invÃ¡lido."
 
@@ -664,88 +480,16 @@ msgstr "Shell"
 msgid "The EShell singleton"
 msgstr "El Â«singletonÂ» EShell"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"Dr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
-msgid "_First:"
-msgstr "_Nombre:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
-msgid "_Last:"
-msgstr "_Apellidos:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
-msgid "_Middle:"
-msgstr "_2Âº Nombre:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
-msgid "_Suffix:"
-msgstr "_Sufijo:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-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:692
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:694
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-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: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:785
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:787
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:954
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:935
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1342
 msgid "_Members"
 msgstr "_Miembros"
 
@@ -773,79 +517,41 @@ msgstr "Libro"
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Contacto modificado:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Contacto en conflicto:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
-msgid "Duplicate Contact Detected"
-msgstr "Se ha detectado un contacto duplicado"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
-msgstr ""
-"El nombre o la direcciÃ³n de correo-e de este contacto ya existe en esta "
-"carpeta. Â¿Quiere aÃ±adirlo de todos modos?"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
-msgid "New Contact:"
-msgstr "Contacto nuevo:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
-msgid "Original Contact:"
-msgstr "Contacto original:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
-msgid ""
-"The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
-msgstr ""
-"El nombre o la direcciÃ³n de correo-e de este contacto ya existe\n"
-"en esta carpeta.  Â¿Quiere aÃ±adirlo de todos modos?"
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
+msgid "Merge Contact"
+msgstr "Combinar contacto"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "Co_mbinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
-msgid "Merge Contact"
-msgstr "Combinar contacto"
-
 #: ../addressbook/gui/merging/eab-contact-merging.c:285
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:454
+#: ../addressbook/gui/widgets/eab-contact-display.c:459
+#: ../addressbook/gui/widgets/eab-contact-display.c:462
+#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Correo-e"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:999
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 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:1013
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Name contains"
 msgstr "El nombre contiene"
 
@@ -945,7 +651,7 @@ 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:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:497
 msgid "Assistant"
 msgstr "Secretario"
 
@@ -974,7 +680,6 @@ msgid "Car Phone"
 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-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -982,7 +687,7 @@ msgid "Categories"
 msgstr "CategorÃas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:492
 msgid "Company"
 msgstr "Empresa"
 
@@ -1006,6 +711,10 @@ msgstr "Apellidos"
 msgid "File As"
 msgstr "Archivar como"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "Nombre completo"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Nombre dado"
@@ -1031,22 +740,22 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:496
 msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
 msgid "Mobile Phone"
 msgstr "TelÃ©fono mÃ³vil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:470
 msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:530
 msgid "Note"
 msgstr "Nota"
 
@@ -1081,7 +790,7 @@ msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
 msgid "Spouse"
 msgstr "CÃ³nyuge"
 
@@ -1100,7 +809,7 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:519
+#: ../shell/e-shell-view.c:520
 msgid "Title"
 msgstr "Tratamiento"
 
@@ -1284,95 +993,93 @@ msgstr "Contacto: "
 msgid "evolution minicard"
 msgstr "minitarjeta de Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
 msgid "Copy _Email Address"
 msgstr "Copiar direcciÃ³n de _correo-e"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../widgets/misc/e-web-view.c:362
+msgid "Copy the email address to the clipboard"
+msgstr "Copiar la direcciÃ³n de correo-e al portapapeles"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:180
 #: ../widgets/misc/e-web-view.c:367
 msgid "_Send New Message To..."
 msgstr "_Enviar un correo nuevo aâ?¦"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:206
-#: ../widgets/misc/e-web-view.c:340
-msgid "_Copy Link Location"
-msgstr "_Copiar direcciÃ³n del enlace"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
-#: ../widgets/misc/e-web-view.c:350
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en el navegador"
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
+#: ../widgets/misc/e-web-view.c:369
+msgid "Send a mail message to this address"
+msgstr "Enviar un correo a esta direcciÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../addressbook/gui/widgets/eab-contact-display.c:233
+#: ../addressbook/gui/widgets/eab-contact-display.c:235
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:309
-#: ../addressbook/gui/widgets/eab-contact-display.c:320
+#: ../addressbook/gui/widgets/eab-contact-display.c:253
+#: ../addressbook/gui/widgets/eab-contact-display.c:264
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:404
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/widgets/eab-contact-display.c:697
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:493
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:494
 msgid "Profession"
 msgstr "ProfesiÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:495
 msgid "Position"
 msgstr "PosiciÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:498
 msgid "Video Chat"
 msgstr "Charla por vÃdeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:499
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../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:461
+#: ../modules/calendar/e-cal-shell-view.c:464
 #: ../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:556
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:500
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:501
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:502
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:513
 msgid "Home Page"
 msgstr "PÃ¡gina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:514
 msgid "Web Log"
 msgstr "Diario web"
 
@@ -1381,12 +1088,12 @@ msgstr "Diario web"
 #. 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:1833 ../shell/main.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:114
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:520
 #: ../calendar/gui/e-calendar-view.c:1834
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -1396,7 +1103,7 @@ msgstr "Aniversario"
 #. Create the default Person memo list
 #. Create the default Person task list
 #. orange
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:523
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:167
@@ -1406,22 +1113,28 @@ msgstr "Aniversario"
 #: ../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
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgid "Personal"
 msgstr "Privado"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:771
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
 msgid "Job Title"
 msgstr "Puesto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:751
 msgid "Home page"
 msgstr "PÃ¡gina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:759
 msgid "Blog"
 msgstr "Diario web"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:956
+#: ../widgets/misc/e-web-view.c:708
+#, c-format
+msgid "Click to mail %s"
+msgstr "Pulse para enviar correo a %s"
+
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
@@ -2254,15 +1967,13 @@ msgstr "No es posible leer los datos de la aplicaciÃ³n ToDo del Pilot"
 msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicaciÃ³n ToDo del Pilot"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../plugins/caldav/caldav-source.c:449
 #: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
@@ -2274,66 +1985,10 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:296
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "Hora de inicio"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Citas"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Dismiss _All"
-msgstr "Descartar _todo"
-
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
-#: ../calendar/gui/e-itip-control.c:1173
-#: ../plugins/itip-formatter/itip-view.c:1022
-msgid "Location:"
-msgstr "Lugar:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "Snooze _time:"
-msgstr "_Posponer durante:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-msgid "_Dismiss"
-msgstr "_Descartar"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1065
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../shell/e-shell-window-actions.c:1627
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-msgid "_Snooze"
-msgstr "_Posponer"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-msgid "location of appointment"
-msgstr "lugar de la cita"
-
-#: ../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:1437
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1559
 msgid "No summary available."
@@ -2353,6 +2008,14 @@ msgstr "No hay informaciÃ³n del lugar disponible."
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/e-itip-control.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1022
+msgid "Location:"
+msgstr "Lugar:"
+
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1671
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 #: ../e-util/e-non-intrusive-error-dialog.h:40
@@ -3115,9 +2778,9 @@ msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
 #: ../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:695
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:336
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -3125,7 +2788,6 @@ msgstr "Confidencial"
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../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"
 msgstr "DescripciÃ³n"
 
@@ -3146,7 +2808,7 @@ 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:724
+#: ../plugins/publish-calendar/publish-calendar.c:720
 #: ../plugins/save-calendar/csv-format.c:370
 msgid "Location"
 msgstr "Lugar"
@@ -3157,19 +2819,19 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../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:694
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../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-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
 #: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Recurrence"
 msgstr "RepeticiÃ³n"
 
@@ -3207,494 +2869,82 @@ msgstr "es"
 msgid "is not"
 msgstr "no es"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:627
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Editar alerta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Mostrar una alerta emergente"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo-e"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>Alerta</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>Opciones</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>RepeticiÃ³n</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
-msgid "Add Alarm"
-msgstr "AÃ±adir alerta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
-msgid "Custom _message"
-msgstr "_Mensaje personalizado"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
-msgid "Custom alarm sound"
-msgstr "Sonido de alerta personalizado"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
-msgid "Mes_sage:"
-msgstr "_Mensaje:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-msgid "Select A File"
-msgstr "Seleccione un archivo"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-msgid "Send To:"
-msgstr "Enviar a:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-msgid "_Arguments:"
-msgstr "_Argumentos:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
-msgid "_Program:"
-msgstr "_Programa:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-msgid "_Repeat the alarm"
-msgstr "_Repetir la alerta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-msgid "_Sound:"
-msgstr "_Sonido:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"antes\n"
-"despuÃ©s"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
-msgid "extra times every"
-msgstr "veces adicionales cada"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"minuto(s)\n"
-"hora(s)\n"
-"dÃa(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"minutos\n"
-"horas\n"
-"dÃas"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"comienzo de la cita\n"
-"final de la cita"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "AcciÃ³n/Disparador"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
-msgid "A_dd"
-msgstr "AÃ±a_dir"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
-msgid "Alarms"
-msgstr "Alertas"
-
 #. an empty string is the same as 'None'
-#: ../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:2936
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
+#: ../calendar/gui/dialogs/event-page.c:2940
 #: ../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
+#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
 #: ../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/email-custom-header/email-custom-header.c:380
 #: ../plugins/itip-formatter/itip-formatter.c:2297
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1559
-#: ../widgets/misc/e-dateedit.c:1776
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
+#: ../widgets/misc/e-dateedit.c:1894
 #: ../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:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
 #: ../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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 msgid "Time and date:"
 msgstr "Fecha y hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Date only:"
 msgstr "SÃ³lo fecha:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(Mostrado en la Vista diaria)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 minutos\n"
-"30 minutos\n"
-"15 minutos\n"
-"10 minutos\n"
-"5 minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u y %d se reemplazarÃ¡n por el usuario y el dominio de la direcciÃ³n de "
-"correo-e.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">Alarmas</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alertas</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">Formato de hora/fecha</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Servidor de disponibilidad predeterminado</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">General</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Lista de tareas</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Tiempo</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Semana laboral</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Day _ends:"
-msgstr "La jornada _acaba a las:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Display"
-msgstr "Mostrar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-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: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:2644
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "General"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"minutos\n"
-"horas\n"
-"dÃas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Monday"
-msgstr "lunes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"lunes\n"
-"martes\n"
-"miÃ©rcoles\n"
-"jueves\n"
-"viernes\n"
-"sÃ¡bado\n"
-"domingo"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:101
-msgid "Pick a color"
-msgstr "Elija un color"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "S_un"
-msgstr "_Dom"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:741
-msgid "Saturday"
-msgstr "sÃ¡bado"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Sc_roll Month View by a week"
-msgstr "Desplazar la vista mens_ual una semana"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Se_cond zone:"
-msgstr "Zona se_cundaria:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Select the calendars for alarm notification"
-msgstr "Seleccione los calendarios para las alertas de notificaciÃ³n"
-
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Sh_ow a reminder"
-msgstr "Mos_\ttrar un recordatorio"
-
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Show a _reminder"
-msgstr "Mostrar un _recordatorio"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Show week _numbers in date navigator"
-msgstr "Mostrar los _nÃºmeros de las semanas en el navegador de fechas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Show week n_umber in Day and Work Week View"
-msgstr ""
-"Mostrar los nÃºme_ros de las semanas en la Vista diaria y en la Vista de la "
-"semana laboral"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "T_asks due today:"
-msgstr "_Tareas que vencen hoy:"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "T_hu"
-msgstr "_Jue"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Template:"
-msgstr "Plantilla:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Thursday"
-msgstr "jueves"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-msgid "Time _zone:"
-msgstr "_Zona horaria:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Time format:"
-msgstr "Formato de la hora:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Tuesday"
-msgstr "martes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-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:1111
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Wednesday"
-msgstr "miÃ©rcoles"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Wee_k starts on:"
-msgstr "La sema_na empieza en:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Work days:"
-msgstr "DÃas laborables:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "_12 hour (AM/PM)"
-msgstr "_12 horas (AM/PM)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-msgid "_24 hour"
-msgstr "_24 horas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "_Ask for confirmation when deleting items"
-msgstr "Pedir con_firmaciÃ³n al borrar elementos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "_Compress weekends in month view"
-msgstr "_Comprimir fines de semana en la vista mensual"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "_Day begins:"
-msgstr "La jornada laboral c_omienza a las:"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
-msgid "_Fri"
-msgstr "Vi_e"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
-msgid "_Hide completed tasks after"
-msgstr "_Ocultar tareas terminadas tras"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
-msgid "_Mon"
-msgstr "_Lun"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
-msgid "_Overdue tasks:"
-msgstr "Tareas fuera de pla_zo:"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
-msgid "_Sat"
-msgstr "_SÃ¡b"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
-msgid "_Show appointment end times in week and month view"
-msgstr ""
-"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
-msgid "_Time divisions:"
-msgstr "Divisiones de _hora:"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
-msgid "_Tue"
-msgstr "_Mar"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
-msgid "_Wed"
-msgstr "M_iÃ©"
-
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
-msgid "before every anniversary/birthday"
-msgstr "antes de cada aniversario/cumpleaÃ±os"
-
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-msgid "before every appointment"
-msgstr "antes de cada cita"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:542
+#: ../modules/addressbook/addressbook-config.c:500
 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:"
@@ -3720,6 +2970,15 @@ msgstr ""
 msgid "Colo_r:"
 msgstr "Colo_r:"
 
+#: ../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
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2644
+msgid "General"
+msgstr "General"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Lista de tareas"
@@ -3803,23 +3062,23 @@ 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:190 ../calendar/gui/print.c:2393
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2393
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2397
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2397
 msgid " (Completed "
 msgstr " (Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2399
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2399
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2404
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2404
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2406
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2406
 msgid "Due "
 msgstr "Vence "
 
@@ -3900,14 +3159,19 @@ msgstr "Selecciona todo el texto"
 msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
+#: ../calendar/gui/dialogs/comp-editor.c:1065 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1642
+msgid "_Edit"
+msgstr "_Editar"
+
 #: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1649
 #: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1079
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -3920,7 +3184,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1676
+#: ../shell/e-shell-window-actions.c:1691
 msgid "_View"
 msgstr "_Ver"
 
@@ -4010,29 +3274,29 @@ msgstr "Conmuta indicando si se muestra el campo Â«Tipo de participanteÂ»"
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1697
+#: ../calendar/gui/dialogs/comp-editor.c:1690
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1752
+#: ../calendar/gui/dialogs/comp-editor.c:1745
 msgid "Save"
 msgstr "Guardar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2027
-#: ../calendar/gui/dialogs/comp-editor.c:2076
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2022
+#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2960
 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:2933
+#: ../calendar/gui/dialogs/comp-editor.c:2928
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:2990
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versiÃ³n actual."
 
@@ -4100,147 +3364,137 @@ msgstr "No se pudo borrar el elemento debido a un error"
 msgid "The item could not be deleted due to an error"
 msgstr "No se pudo borrar el elemento debido a un error"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Contacts..."
-msgstr "Contactosâ?¦"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-msgid "Delegate To:"
-msgstr "Delegar en:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
-msgid "Enter Delegate"
-msgstr "Introducir un delegado"
-
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "_Alertas"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "Pulse aquÃ para poner o quitar alertas para este acontecimiento"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "_RepeticiÃ³n"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "Convertir en acontecimiento repetitivo"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
 msgid "Send Options"
 msgstr "Opciones de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Opciones de envÃo avanzadas"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "Acontecimiento para todo el _dÃa"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "Se activa cuando se tiene un Â«Acontecimiento para todo el dÃaÂ»"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como _ocupada"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "Se activa cuando se deben mostrar la hora como ocupada"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "_Disponibilidad"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃ³n de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:292
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:751
 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:756
+#: ../calendar/gui/dialogs/event-page.c:755
 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:768
-#: ../calendar/gui/dialogs/event-page.c:2691
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2695
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:831
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../plugins/itip-formatter/itip-view.c:1909
+msgid "_Calendar:"
+msgstr "_Calendario:"
+
+#: ../calendar/gui/dialogs/event-page.c:830
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1070
+#: ../calendar/gui/dialogs/event-page.c:1069
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1073
+#: ../calendar/gui/dialogs/event-page.c:1072
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1244
+#: ../calendar/gui/dialogs/event-page.c:1243
 #: ../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:1254
+#: ../calendar/gui/dialogs/event-page.c:1253
 msgid "End date is wrong"
 msgstr "La fecha de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1277
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "Start time is wrong"
 msgstr "La hora de inicio estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1284
+#: ../calendar/gui/dialogs/event-page.c:1283
 msgid "End time is wrong"
 msgstr "La hora de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1446
+#: ../calendar/gui/dialogs/event-page.c:1445
 #: ../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:1452
+#: ../calendar/gui/dialogs/event-page.c:1451
 #: ../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:1477
+#: ../calendar/gui/dialogs/event-page.c:1476
 #: ../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:2564
+#: ../calendar/gui/dialogs/event-page.c:2568
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario Â«%sÂ»."
@@ -4251,112 +3505,39 @@ 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:2608
-#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/event-page.c:2612
+#: ../calendar/gui/dialogs/memo-page.c:916
 #: ../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:2910
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2916
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2922
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2935
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalizar"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 minutos antes de la cita\n"
-"1 hora antes de la cita\n"
-"1 dÃa antes de la cita"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:5
-msgid "Attendee_s..."
-msgstr "_Participantesâ?¦"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Participantes"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "Custom Alarm:"
-msgstr "Alerta personalizada:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Event Description"
-msgstr "DescripciÃ³n del acontecimiento"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
-msgid "Su_mmary:"
-msgstr "Resu_men:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-msgid "_Alarm"
-msgstr "_Alerta"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
-msgid "_Description:"
-msgstr "_DescripciÃ³n:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
-msgid "_Location:"
-msgstr "_Lugar:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-msgid "_Time:"
-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:166 ../mail/mail-dialogs.glade.h:21
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"durante\n"
-"hasta"
-
-#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2542
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2542
 msgid "Memo"
 msgstr "Nota"
 
@@ -4368,33 +3549,18 @@ msgstr "La nota no se puede editar porque es de sÃ³lo lectura"
 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:874
+#: ../calendar/gui/dialogs/memo-page.c:877
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1041 ../em-format/em-format-quote.c:224
+#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
 #: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
 #: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "Fecha de ini_cio:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-msgid "T_o:"
-msgstr "_Para:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Group:"
-msgstr "_Grupo:"
-
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
@@ -4538,6 +3704,41 @@ msgstr "del 21 al 31"
 msgid "day"
 msgstr "dÃa"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:736
+msgid "Monday"
+msgstr "lunes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:737
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:738
+msgid "Wednesday"
+msgstr "miÃ©rcoles"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:739
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:740
+msgid "Friday"
+msgstr "viernes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:741
+msgid "Saturday"
+msgstr "sÃ¡bado"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:735
+msgid "Sunday"
+msgstr "domingo"
+
 #. 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])."
 #.
@@ -4569,55 +3770,6 @@ msgstr "No es posible obtener una selecciÃ³n que borrar."
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>Excepciones</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>Vista previa</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>RepeticiÃ³n</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Every"
-msgstr "Cada"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "This appointment rec_urs"
-msgstr "Esta cita se _repite"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"dÃa(s)\n"
-"semana(s)\n"
-"mes(es)\n"
-"aÃ±o(s)"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"durante\n"
-"hasta\n"
-"siempre"
-
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "Enviar mis alarmas con este evento"
@@ -4631,81 +3783,28 @@ msgstr "Notificar sÃ³l_o a los participantes"
 msgid "Completed date is wrong"
 msgstr "La fecha de terminaciÃ³n es errÃ³nea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:484
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Varios</span>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Estado</span>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"Alta\n"
-"Normal\n"
-"Baja\n"
-"Sin definir"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"Sin iniciar\n"
-"En progreso\n"
-"Completada\n"
-"Cancelada"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "P_ercent complete:"
-msgstr "_Porcentaje completado:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "Stat_us:"
-msgstr "_Estado:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-msgid "_Date completed:"
-msgstr "_Fecha de terminaciÃ³n:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
-msgid "_Priority:"
-msgstr "_Prioridad:"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
-msgid "_Web Page:"
-msgstr "PÃ¡gina _web:"
-
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "Detalles de _estado"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 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
+#: ../calendar/gui/dialogs/task-editor.c:122
 #: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "Opciones de _envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:335
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:338
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "Detalles"
 
@@ -4717,8 +3816,11 @@ msgstr "La tarea no se puede editar porque es de sÃ³lo lectura"
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "La tarea no se puede editar completamente porque no es el organizador"
 
+#: ../calendar/gui/dialogs/task-page.c:380
+msgid "_Group:"
+msgstr "_Grupo:"
+
 #: ../calendar/gui/dialogs/task-page.c:388
-#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
@@ -4731,22 +3833,6 @@ msgstr "La fecha de vencimiento es errÃ³nea"
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "_Participantesâ?¦"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "Categor_ies..."
-msgstr "_CategorÃasâ?¦"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_ue date:"
-msgstr "Fecha de _vencimiento:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Time zone:"
-msgstr "Zona horaria:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:394
 #, c-format
@@ -4833,7 +3919,6 @@ msgstr "CategorÃas:"
 
 #: ../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:"
 
@@ -4898,7 +3983,7 @@ msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/e-cal-component-preview.c:220
-#: ../calendar/gui/e-cal-model.c:1270 ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
 msgid "Normal"
 msgstr "Normal"
@@ -4911,7 +3996,6 @@ 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:"
 
@@ -4962,7 +4046,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1276
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
 #: ../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
@@ -4970,45 +4054,50 @@ msgstr ""
 msgid "Yes"
 msgstr "SÃ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1276
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
 #: ../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
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
 #: ../shell/e-shell.c:737
 msgid "Shell Settings"
 msgstr "ConfiguraciÃ³n de Shell"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:523
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
 #: ../shell/e-shell.c:738
 msgid "Application-wide settings"
 msgstr "Ajustes globales de la aplicaciÃ³n"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
+#: ../calendar/gui/e-cal-model.c:538 ../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:911
+#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52 ../mail/em-utils.c:928
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2322
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:1272
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "RepeticiÃ³n"
 
-#: ../calendar/gui/e-cal-model.c:1274
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "Asignado"
 
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
 #: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
 msgid "* No Summary *"
 msgstr "* Sin resumen *"
@@ -5093,10 +4182,9 @@ msgstr "100%"
 #: ../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:429
+#: ../modules/calendar/e-task-shell-view.c:432
 #: ../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"
 
@@ -5258,7 +4346,7 @@ msgstr "%A %e de %B"
 #: ../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:907
+#: ../modules/calendar/e-cal-shell-view-private.c:910
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
@@ -5270,7 +4358,7 @@ msgstr "%a, %e de %b"
 #: ../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:943
+#: ../modules/calendar/e-cal-shell-view-private.c:946
 msgid "%d %b"
 msgstr "%e de %b"
 
@@ -5682,39 +4770,11 @@ msgid "Send Latest Information"
 msgstr "Enviar la Ãºltima informaciÃ³n"
 
 #: ../calendar/gui/e-itip-control.c:2482
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
-msgid "--to--"
-msgstr "--a--"
-
-#: ../calendar/gui/e-itip-control.glade.h:2
-msgid "Calendar Message"
-msgstr "Mensaje de calendario"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
-msgid "Date:"
-msgstr "Fecha:"
-
-#: ../calendar/gui/e-itip-control.glade.h:5
-msgid "Loading Calendar"
-msgstr "Cargando calendario"
-
-#: ../calendar/gui/e-itip-control.glade.h:6
-msgid "Loading calendar..."
-msgstr "Cargando calendarioâ?¦"
-
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Organizador:"
-
-#: ../calendar/gui/e-itip-control.glade.h:8
-msgid "Server Message:"
-msgstr "Mensaje del servidor:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Presidencia"
@@ -5731,6 +4791,10 @@ msgstr "Participantes opcionales"
 msgid "Resources"
 msgstr "Recursos"
 
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Participantes"
+
 #: ../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
@@ -5739,7 +4803,7 @@ msgstr "Individual"
 
 #: ../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
+#: ../calendar/gui/print.c:974
 msgid "Group"
 msgstr "Grupo"
 
@@ -5908,7 +4972,7 @@ msgstr "Miembro"
 #: ../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:282
+#: ../modules/calendar/e-memo-shell-view.c:285
 msgid "Memos"
 msgstr "Notas"
 
@@ -6021,16 +5085,16 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o mÃ¡s dÃas"
 
 #: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
 #: ../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:910
-#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 #: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -6038,10 +5102,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../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:936
-#: ../modules/calendar/e-cal-shell-view-private.c:947
-#: ../modules/calendar/e-cal-shell-view-private.c:954
+#: ../modules/calendar/e-cal-shell-view-private.c:939
+#: ../modules/calendar/e-cal-shell-view-private.c:950
 #: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:960
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -6077,51 +5141,14 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o mÃ¡s semanas"
 
-#: ../calendar/gui/gnome-cal.c:1945
+#: ../calendar/gui/gnome-cal.c:1946
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2031
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"Enero\n"
-"Febrero\n"
-"Marzo\n"
-"Abril\n"
-"Mayo\n"
-"Junio\n"
-"Julio\n"
-"Agosto\n"
-"Septiembre\n"
-"Octubre\n"
-"Noviembre\n"
-"Diciembre"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "Select Date"
-msgstr "Seleccionar fecha"
-
-#: ../calendar/gui/goto-dialog.glade.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar hoy"
+#: ../calendar/gui/gnome-cal.c:2567
+msgid "Purging"
+msgstr "Compactando"
 
 #: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
 #: ../calendar/gui/itip-utils.c:552
@@ -7052,7 +6079,6 @@ msgid "America/Nassau"
 msgstr "AmÃ©rica/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "AmÃ©rica/Nueva York"
 
@@ -8232,7 +7258,7 @@ msgstr "_De:"
 
 #: ../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
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
@@ -8288,19 +7314,19 @@ msgid "Save draft"
 msgstr "Guardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:146
+#: ../composer/e-msg-composer.c:189 ../mail/em-utils.c:147
 #: ../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:987
+#: ../composer/e-msg-composer.c:985
 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:994
+#: ../composer/e-msg-composer.c:992
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8308,15 +7334,15 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1383
+#: ../composer/e-msg-composer.c:1381
 msgid "Unable to reconstruct message from autosave file"
 msgstr "No se pudo reconstruir el mensaje desde el archivo autoguardado"
 
-#: ../composer/e-msg-composer.c:1449 ../composer/e-msg-composer.c:2176
+#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:2174
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3406
+#: ../composer/e-msg-composer.c:3404
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8599,7 +7625,7 @@ msgstr "visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
@@ -8699,7 +7725,7 @@ msgid "Log Level"
 msgstr "Nivel de sucesos"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:497
+#: ../widgets/misc/e-dateedit.c:608
 msgid "Time"
 msgstr "Hora"
 
@@ -8709,7 +7735,7 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -8733,10 +7759,9 @@ msgstr "Depurar"
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuraciÃ³n"
 
-#: ../e-util/e-plugin.c:292 ../filter/e-rule-editor.c:827
-#: ../modules/mail/em-composer-prefs.c:474
+#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:474
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.c:716
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Activado"
@@ -8793,11 +7818,11 @@ msgstr "Â¿Sobreescribir archivo?"
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../e-util/e-util.c:139
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
-#: ../e-util/e-util.c:189
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
@@ -8828,16 +7853,15 @@ msgid "Bcc"
 msgstr "Cco"
 
 #: ../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
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
 #: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
 #: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
-#: ../modules/mail/em-mailer-prefs.c:1126
+#: ../modules/mail/em-mailer-prefs.c:1131
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -8846,8 +7870,8 @@ msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
 #: ../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
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Date"
 msgstr "Fecha"
 
@@ -8906,120 +7930,120 @@ msgstr "No es posible interpretar el mensaje PGP"
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:71
 #, 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/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:72
 #, 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/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %d horas"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:73
 #, 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/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace un dÃa"
 msgstr[1] "hace %d dÃas"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:74
 #, 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/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace una semana"
 msgstr[1] "hace %d semanas"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, 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/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace un mes"
 msgstr[1] "hace %d meses"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, 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/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace un aÃ±o"
 msgstr[1] "hace %d aÃ±os"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:77
 #, 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/e-filter-datespec.c:117
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<pulse aquÃ para seleccionar una fecha>"
 
-#: ../filter/e-filter-datespec.c:120 ../filter/e-filter-datespec.c:131
-#: ../filter/e-filter-datespec.c:142
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:127
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%e/%b/%Y"
 
 # AquÃ time se refiere a fecha
-#: ../filter/e-filter-datespec.c:271
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
@@ -9071,27 +8095,22 @@ msgstr "Sin respuesta o antecesor"
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/e-filter-rule.c:1114 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:297
+#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:298
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:298
+#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:299
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: ../filter/e-rule-editor.c:260
+#: ../filter/e-rule-editor.c:261
 msgid "Add Rule"
 msgstr "AÃ±adir regla"
 
-#: ../filter/e-rule-editor.c:343
+#: ../filter/e-rule-editor.c:344
 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}Â»."
@@ -9136,79 +8155,7 @@ msgstr "Debe dar un nombre a este filtro."
 msgid "You must specify a file name."
 msgstr "Debe especificar un nombre de archivo."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Reglas de _filtrado</b>"
-
-#: ../filter/filter.glade.h:2
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: ../filter/filter.glade.h:4
-msgid "Show filters for mail:"
-msgstr "Mostrar filtros para el correo:"
-
-#: ../filter/filter.glade.h:5
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"La fecha del mensaje se compararÃ¡ con las\n"
-"12:00am de la fecha especificada aquÃ."
-
-#: ../filter/filter.glade.h:7
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"La fecha del mensaje se compararÃ¡ con una\n"
-"fecha relativa al momento del filtrado."
-
-#: ../filter/filter.glade.h:9
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"La fecha del mensaje se compararÃ¡ con la\n"
-"fecha actual del momento del filtrado."
-
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"hace\n"
-"en el futuro"
-
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"segundos\n"
-"minutos\n"
-"horas\n"
-"dÃas\n"
-"semanas\n"
-"meses\n"
-"aÃ±os"
-
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"el momento actual\n"
-"el hora que especifique\n"
-"una fecha relativa al momento actual"
-
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:998
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9326,7 +8273,7 @@ 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
+#: ../plugins/templates/templates.c:575
 msgid "Templates"
 msgstr "Plantillas"
 
@@ -9666,7 +8613,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
 #: ../mail/e-mail-reader.c:1402
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Responder a _todos"
@@ -9852,13 +8799,13 @@ msgstr "_Todas las cabeceras del mensaje"
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1861
 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:2330
+#: ../mail/e-mail-reader.c:2335
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:612
 #: ../plugins/google-account-setup/google-source.c:783
@@ -9866,37 +8813,37 @@ msgstr "No se pudo obtener el mensaje"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-reader.c:2446
+#: ../mail/e-mail-reader.c:2451
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2452
 msgid "Forward the selected message to someone"
 msgstr "ReenvÃa a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2495 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
-#: ../modules/calendar/e-cal-shell-view-actions.c:1706
-#: ../modules/calendar/e-memo-shell-view-actions.c:948
-#: ../modules/calendar/e-task-shell-view-actions.c:1149
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../mail/e-mail-reader.c:2500 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:1139
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../mail/e-mail-reader.c:2499
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../mail/e-mail-reader.c:2504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:2503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../mail/e-mail-reader.c:2508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1184
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2507 ../mail/message-tag-followup.c:62
+#: ../mail/e-mail-reader.c:2512
 msgid "Reply"
 msgstr "Responder"
 
@@ -9963,32 +8910,36 @@ msgstr "Se llegÃ³ al principio de la pÃ¡gina, continuando desde el final"
 msgid "On This Computer"
 msgstr "En este equipo"
 
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Marcar para seguimiento"
+
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:485
+#: ../mail/em-account-editor.c:484
 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:489
+#: ../mail/em-account-editor.c:488
 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:493
+#: ../mail/em-account-editor.c:492
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:584
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:591
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -10001,27 +8952,23 @@ msgstr ""
 "para %s mostrado abajo\n"
 "y marque la casilla para aceptarlo.\n"
 
-#: ../mail/em-account-editor.c:664 ../mail/em-filter-folder-element.c:255
-msgid "Select Folder"
-msgstr "Seleccionar carpeta"
-
-#: ../mail/em-account-editor.c:999
+#: ../mail/em-account-editor.c:948
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:1000
+#: ../mail/em-account-editor.c:949
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:1001
+#: ../mail/em-account-editor.c:950
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
-#: ../mail/em-account-editor.c:2076
+#: ../mail/em-account-editor.c:2025
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃ³n del correo"
 
-#: ../mail/em-account-editor.c:2077
+#: ../mail/em-account-editor.c:2026
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10031,12 +8978,11 @@ msgstr ""
 "\n"
 "Pulse Â«AdelanteÂ» para comenzar. "
 
-#: ../mail/em-account-editor.c:2079 ../mail/em-account-editor.c:2214
-#: ../mail/mail-config.glade.h:86
+#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:2080
+#: ../mail/em-account-editor.c:2029
 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 "
@@ -10046,20 +8992,19 @@ msgstr ""
 "Â«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
+#: ../mail/em-account-editor.c:2031 ../mail/em-account-editor.c:2201
 msgid "Receiving Email"
 msgstr "RecepciÃ³n de correo"
 
-#: ../mail/em-account-editor.c:2083
+#: ../mail/em-account-editor.c:2032
 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
+#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/em-account-editor.c:2086
+#: ../mail/em-account-editor.c:2035
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10068,11 +9013,11 @@ msgstr ""
 "no estÃ¡ seguro, pregÃºntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2037
 msgid "Account Management"
 msgstr "AdministraciÃ³n de cuentas"
 
-#: ../mail/em-account-editor.c:2089
+#: ../mail/em-account-editor.c:2038
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10080,11 +9025,11 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usarÃ¡ sÃ³lo para mostrarlo."
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2042
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2043
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10098,37 +9043,37 @@ msgstr ""
 "\n"
 "Pulse Â«AplicarÂ» para guardar su configuraciÃ³n."
 
-#: ../mail/em-account-editor.c:2527
+#: ../mail/em-account-editor.c:2473
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2535
+#: ../mail/em-account-editor.c:2481
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2777 ../mail/mail-config.glade.h:62
+#: ../mail/em-account-editor.c:2715
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:112
+#: ../mail/em-account-editor.c:2777
 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:2880 ../mail/em-account-editor.c:2948
+#: ../mail/em-account-editor.c:2814 ../mail/em-account-editor.c:2882
 msgid "Receiving Options"
 msgstr "Opciones de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:3412 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3346
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:3412
+#: ../mail/em-account-editor.c:3346
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -10171,10 +9116,14 @@ msgstr "Destino de publicaciÃ³n"
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../mail/em-filter-editor.c:188
+#: ../mail/em-filter-editor.c:185
 msgid "_Filter Rules"
 msgstr "Reglas de _filtrado"
 
+#: ../mail/em-filter-folder-element.c:255
+msgid "Select Folder"
+msgstr "Seleccionar carpeta"
+
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
@@ -10288,7 +9237,7 @@ msgstr "no estÃ¡ establecida"
 msgid "is set"
 msgstr "estÃ¡ establecida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:87
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk"
 msgstr "SPAM"
 
@@ -10336,8 +9285,7 @@ msgstr "Encauzar al programa"
 msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#: ../mail/em-filter-i18n.h:54
 msgid "Read"
 msgstr "LeÃdo"
 
@@ -10452,7 +9400,6 @@ msgid "Quota usage"
 msgstr "Uso de cuota"
 
 #: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
@@ -10558,7 +9505,7 @@ msgid "Copy Folder To"
 msgstr "Copiar carpeta a"
 
 #: ../mail/em-folder-utils.c:495
-#: ../plugins/groupwise-features/share-folder-common.c:142
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta Â«%sÂ»"
@@ -10569,7 +9516,7 @@ msgstr "Crear carpeta"
 
 #: ../mail/em-folder-utils.c:658
 #: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:351
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
@@ -10578,11 +9525,11 @@ msgstr "Especifique donde crear la carpeta:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "DesuscribiÃ©ndose de la carpeta Â«%sÂ»"
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10590,11 +9537,11 @@ msgstr ""
 "Este mensaje no estÃ¡ firmado. No hay garantÃa de que el mensaje sea "
 "autÃ©ntico."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
 msgid "Valid signature"
 msgstr "Firma vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10602,11 +9549,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:107 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
 msgid "Invalid signature"
 msgstr "Firma no vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10614,11 +9561,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma vÃ¡lida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10626,11 +9573,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:109 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pÃºblica"
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10638,11 +9585,11 @@ msgstr ""
 "Este mensaje estÃ¡ firmado con una firma pero no existe una clave pÃºblica "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10650,11 +9597,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:117 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
 msgid "Encrypted, weak"
 msgstr "Cifrado, dÃ©bil"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -10664,11 +9611,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:118 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:118
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10676,11 +9623,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:119 ../mail/em-format-html.c:1549
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:119
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -10690,15 +9637,15 @@ msgstr ""
 "difÃcil que un espÃa vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:250 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:263
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:509
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10706,28 +9653,28 @@ 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:735
+#: ../mail/em-format-html-display.c:730
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:743
+#: ../mail/em-format-html-display.c:738
 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:747
+#: ../mail/em-format-html-display.c:742
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:931 ../mail/em-format-html-display.c:970
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:928
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:990
+#: ../mail/em-format-html-display.c:985
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -10803,36 +9750,32 @@ msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:853
+#: ../mail/em-subscribe-editor.c:846
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:889
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningÃºn servidor"
 
-#: ../mail/em-utils.c:307
+#: ../mail/em-utils.c:308
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:795
+#: ../mail/em-utils.c:812
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "Carpetas de _bÃºsqueda"
 
-#: ../mail/em-vfolder-rule.c:517
+#: ../mail/em-vfolder-rule.c:518
 msgid "Add Folder"
 msgstr "AÃ±adir 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
 msgid "\"Filter Editor\" window height"
 msgstr "Altura de la ventana Â«Editor de filtrosÂ»"
@@ -11144,7 +10087,7 @@ msgstr "Activar para mostrar la parte de texto del mensaje de tamaÃ±o limitado."
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.glade.h:73
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
@@ -11939,8 +10882,7 @@ msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
 #: ../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
+#: ../modules/mail/e-mail-shell-view.c:588
 msgid "Mail"
 msgstr "Correo"
 
@@ -11997,7 +10939,7 @@ msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
 #: ../mail/importers/pine-importer.c:383
-#: ../modules/addressbook/addressbook-config.c:1047
+#: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
@@ -12033,706 +10975,6 @@ msgstr "Lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "AÃ±adir regla de filtrado"
 
-#: ../mail/mail-config.glade.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: Requiere reiniciar la aplicaciÃ³n)"
-
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL no estÃ¡ soportado en esta compilaciÃ³n de Evolution</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>Foto del remitente</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>_Firmas</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>OpciÃ³n publicar por encima</b> (no se recomienda)"
-
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>_Idiomas</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n de la cuenta</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">AutenticaciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">RedacciÃ³n de mensajes</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">ConfiguraciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Borrar correo</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">_Cabeceras de correo mostradas</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Etiquetas</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Carga de imÃ¡genes</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">PresentaciÃ³n del mensaje</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">TipografÃas del mensaje</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Notificaciones de recepciÃ³n de mensajes</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n opcional</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">Opciones</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">TipografÃa para impresiÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Ajustes del proxy</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n requerida</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Seguridad</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ConfiguraciÃ³n del servidor</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">Tipo de _autenticaciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Add Ne_w Signature..."
-msgstr "AÃ±adir firma _nuevaâ?¦"
-
-#: ../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: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:38
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Siempre enviar _copia de carbÃ³n (Cc) a:"
-
-#: ../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: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: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:42
-msgid "Always request rea_d receipt"
-msgstr "Siempre _solicitar confirmaciÃ³n de lectura"
-
-#: ../mail/mail-config.glade.h:43
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"Adjunto\n"
-"En lÃnea\n"
-"Citado"
-
-#: ../mail/mail-config.glade.h:46
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"Adjunto\n"
-"En lÃnea (estilo Outlook)\n"
-"Citado\n"
-"No citar"
-
-#: ../mail/mail-config.glade.h:50
-msgid "Automatically insert _emoticon images"
-msgstr "Insertar imÃ¡genes de _emoticonos automÃ¡ticamente"
-
-#: ../mail/mail-config.glade.h:51
-msgid "C_haracter set:"
-msgstr "Conjunto de carac_teres:"
-
-#: ../mail/mail-config.glade.h:52
-msgid "Ch_eck for Supported Types"
-msgstr "_Comprobar tipos soportados"
-
-#: ../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:54
-msgid "Check incoming _messages for junk"
-msgstr "Comprobar si los _mensajes entrantes son basura"
-
-#: ../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:56
-msgid "Checks incoming mail messages to be Junk"
-msgstr "Comprueba si los mensajes de correo entrantes son SPAM"
-
-#: ../mail/mail-config.glade.h:57
-msgid "Cle_ar"
-msgstr "_Vaciar"
-
-#: ../mail/mail-config.glade.h:58 ../mail/message-tag-followup.c:321
-msgid "Clea_r"
-msgstr "Vacia_r"
-
-#: ../mail/mail-config.glade.h:59
-msgid "Color for _misspelled words:"
-msgstr "Color para las palabras _mal escritas:"
-
-#: ../mail/mail-config.glade.h:60
-msgid "Confirm _when expunging a folder"
-msgstr "_Confirmar antes de compactar una carpeta"
-
-#: ../mail/mail-config.glade.h:61
-msgid "Default character e_ncoding:"
-msgstr "_CodificaciÃ³n de caracteres predeterminada:"
-
-#: ../mail/mail-config.glade.h:63
-msgid "Delete junk messages on e_xit"
-msgstr "Borrar los mensajes SPAM al _salir"
-
-#: ../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: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: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:68
-msgid "Drafts _Folder:"
-msgstr "Carpeta de _borradores:"
-
-#: ../mail/mail-config.glade.h:69
-msgid "Email _Address:"
-msgstr "Dir_ecciÃ³n de correo-e:"
-
-#: ../mail/mail-config.glade.h:70
-msgid "Empty trash folders on e_xit"
-msgstr "Vaciar _papelera al salir"
-
-#: ../mail/mail-config.glade.h:71
-msgid "Enable Magic S_pacebar"
-msgstr "Activar la barra e_spaciadora mÃ¡gica"
-
-#: ../mail/mail-config.glade.h:72
-msgid "Enable Sea_rch Folders"
-msgstr "Activar las Carpetas de _bÃºsqueda"
-
-#: ../mail/mail-config.glade.h:74
-msgid "Encry_ption certificate:"
-msgstr "Certificado de ci_frado:"
-
-#: ../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:76
-msgid "Fi_xed-width:"
-msgstr "Anchura _fija:"
-
-#: ../mail/mail-config.glade.h:77
-msgid "Fix_ed width Font:"
-msgstr "TipografÃa de anchura _fija:"
-
-#: ../mail/mail-config.glade.h:78
-msgid "Font Properties"
-msgstr "Propiedades de tipografÃas"
-
-#: ../mail/mail-config.glade.h:79
-msgid "Format messages in _HTML"
-msgstr "Dar formato _HTML a los mensajes"
-
-#: ../mail/mail-config.glade.h:80
-msgid "Full Nam_e:"
-msgstr "Nombre _completo:"
-
-#: ../mail/mail-config.glade.h:82
-msgid "HTML Messages"
-msgstr "Mensajes HTML"
-
-#: ../mail/mail-config.glade.h:83
-msgid "H_TTP Proxy:"
-msgstr "Proxy H_TTP:"
-
-#: ../mail/mail-config.glade.h:84
-msgid "Headers"
-msgstr "Cabeceras"
-
-# Esta cadena debe permanecer asÃ
-#: ../mail/mail-config.glade.h:85
-msgid "Highlight _quotations with"
-msgstr "Resaltar texto _citado con este color:"
-
-#: ../mail/mail-config.glade.h:88
-msgid "KB"
-msgstr "Kib"
-
-#: ../mail/mail-config.glade.h:89 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Etiquetas"
-
-#: ../mail/mail-config.glade.h:90
-msgid "Languages Table"
-msgstr "Tabla de idiomas"
-
-#: ../mail/mail-config.glade.h:91
-msgid "Mail Headers Table"
-msgstr "Tabla de cabeceras de correo"
-
-#: ../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:94
-msgid "Message Composer"
-msgstr "Editor de mensajes"
-
-#: ../mail/mail-config.glade.h:95
-msgid "No _Proxy for:"
-msgstr "Sin _proxy para:"
-
-#: ../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: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:98
-msgid "Or_ganization:"
-msgstr "Organi_zaciÃ³n:"
-
-#: ../mail/mail-config.glade.h:99
-msgid "PGP/GPG _Key ID:"
-msgstr "ID de c_lave GPG/PGP:"
-
-#: ../mail/mail-config.glade.h:100
-msgid "Pass_word:"
-msgstr "_ContraseÃ±a:"
-
-#: ../mail/mail-config.glade.h:102
-msgid "Port:"
-msgstr "Puerto:"
-
-#: ../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:104
-msgid "Re_member password"
-msgstr "_Recordar contraseÃ±a"
-
-#: ../mail/mail-config.glade.h:105
-msgid "Re_ply-To:"
-msgstr "Res_ponder a:"
-
-#: ../mail/mail-config.glade.h:107
-msgid "Remember _password"
-msgstr "Recordar _contraseÃ±a"
-
-#: ../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:109
-msgid "S_elect..."
-msgstr "S_eleccionarâ?¦"
-
-#: ../mail/mail-config.glade.h:110
-msgid "S_end message receipts:"
-msgstr "_Enviar confirmaciones de mensajes:"
-
-#: ../mail/mail-config.glade.h:111
-msgid "S_tandard Font:"
-msgstr "TipografÃa _estÃ¡ndar:"
-
-#: ../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:114
-msgid "Select HTML fixed width font for printing"
-msgstr "Selecciona letra de anchura fija en HTML para imprimir"
-
-#: ../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:116
-msgid "Select HTML variable width font for printing"
-msgstr "Selecciona letra de anchura variable en HTML para imprimir"
-
-#: ../mail/mail-config.glade.h:117
-msgid "Sending Mail"
-msgstr "EnvÃo de correo"
-
-#: ../mail/mail-config.glade.h:118
-msgid "Sent _Messages Folder:"
-msgstr "Carpeta de _mensajes enviados:"
-
-#: ../mail/mail-config.glade.h:119
-msgid "Ser_ver requires authentication"
-msgstr "El ser_vidor requiere autenticaciÃ³n"
-
-#: ../mail/mail-config.glade.h:120
-msgid "Server _Type:"
-msgstr "_Tipo de servidor:"
-
-#: ../mail/mail-config.glade.h:121
-msgid "Sig_ning certificate:"
-msgstr "Certificado de _firma:"
-
-#: ../mail/mail-config.glade.h:122
-msgid "Signat_ure:"
-msgstr "_Firma:"
-
-#: ../mail/mail-config.glade.h:123
-msgid "Signatures"
-msgstr "Firmas"
-
-#: ../mail/mail-config.glade.h:124
-msgid "Spell Checking"
-msgstr "OrtografÃa"
-
-#: ../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:126
-msgid "T_ype:"
-msgstr "T_ipo:"
-
-#: ../mail/mail-config.glade.h:127
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"La lista de idiomas de aquÃ refleja Ãºnicamente los idiomas para los cuÃ¡les "
-"hay instalado un diccionario."
-
-#: ../mail/mail-config.glade.h:128
-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. \n"
-"El nombre que especifique se usarÃ¡ Ãºnicamente \n"
-"para mostrarlo por pantalla. "
-
-#: ../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\""
-msgstr ""
-"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
-"Por ejemplo: Â«TrabajoÂ» o Â«PersonalÂ»"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Us_ername:"
-msgstr "_Usuario:"
-
-#: ../mail/mail-config.glade.h:134
-msgid "Use Authe_ntication"
-msgstr "Usar aute_nticaciÃ³n"
-
-#: ../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:136
-msgid "V_ariable-width:"
-msgstr "An_chura variable:"
-
-#: ../mail/mail-config.glade.h:137
-msgid "_Add Signature"
-msgstr "_AÃ±adir firma"
-
-#: ../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:139
-msgid "_Default junk plugin:"
-msgstr "Complemento SPAM pre_determinado:"
-
-#: ../mail/mail-config.glade.h:140
-msgid "_Direct connection to the Internet"
-msgstr "ConexiÃ³n _directa a Internet"
-
-#: ../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:142
-msgid "_Forward style:"
-msgstr "_Estilo de reenvÃo:"
-
-#: ../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:144
-msgid "_Load images in messages from contacts"
-msgstr "_Cargar imÃ¡genes en los mensajes de mis contactos"
-
-#: ../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:146
-msgid "_Make this my default account"
-msgstr "_Hacer que Ã©sta sea mi cuenta predeterminada"
-
-#: ../mail/mail-config.glade.h:147
-msgid "_Manual proxy configuration:"
-msgstr "ConfiguraciÃ³n _manual del proxy:"
-
-#: ../mail/mail-config.glade.h:148
-msgid "_Mark messages as read after"
-msgstr "_Marcar mensajes como leÃdos tras"
-
-#: ../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:151
-msgid "_Path:"
-msgstr "R_uta:"
-
-#: ../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: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:154
-msgid "_Reply style:"
-msgstr "Estilo de _respuesta:"
-
-#: ../mail/mail-config.glade.h:155
-msgid "_Script:"
-msgstr "_Script:"
-
-#: ../mail/mail-config.glade.h:156
-msgid "_Secure HTTP Proxy:"
-msgstr "Proxy HTTP _seguro:"
-
-#: ../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:160
-msgid "_Show image animations"
-msgstr "_Mostrar animaciones"
-
-#: ../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 mensaje"
-
-#: ../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:163
-msgid "_Use Secure Connection:"
-msgstr "_Usar conexiÃ³n segura:"
-
-#: ../mail/mail-config.glade.h:164
-msgid "_Use system defaults"
-msgstr "_Usar los valores predeterminados del sistema"
-
-#: ../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:168
-msgid "addresses"
-msgstr "direcciones"
-
-# Esta traducciÃ³n debe mantenerse asÃ
-#: ../mail/mail-config.glade.h:169
-msgid "color"
-msgstr "color"
-
-#: ../mail/mail-config.glade.h:170
-msgid "description"
-msgstr "descripciÃ³n"
-
-#: ../mail/mail-config.glade.h:171
-msgid "seconds"
-msgstr "segundos"
-
-#: ../mail/mail-dialogs.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>OrÃgenes de la carpeta de bÃºsqueda</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Firma digital</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Cifrado</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
-msgid "All active remote folders"
-msgstr "Todas las carpetas remotas activas"
-
-#: ../mail/mail-dialogs.glade.h:6
-msgid "All local and active remote folders"
-msgstr "Todas las carpetas locales y remotas activas"
-
-#: ../mail/mail-dialogs.glade.h:7
-msgid "All local folders"
-msgstr "Todas las carpetas locales"
-
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Co_mpleted"
-msgstr "_Terminado"
-
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:268
-msgid "Flag to Follow Up"
-msgstr "Marcar para seguimiento"
-
-#: ../mail/mail-dialogs.glade.h:10
-msgid "Folder Subscriptions"
-msgstr "Suscripciones de carpetas"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "License Agreement"
-msgstr "Acuerdo de licencia"
-
-#: ../mail/mail-dialogs.glade.h:12
-msgid "S_erver:"
-msgstr "S_ervidor:"
-
-#: ../mail/mail-dialogs.glade.h:13
-msgid "Security Information"
-msgstr "InformaciÃ³n de seguridad"
-
-#: ../mail/mail-dialogs.glade.h:14
-msgid "Specific folders"
-msgstr "Carpetas especÃficas"
-
-#: ../mail/mail-dialogs.glade.h:15
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
-"Por favor, seleccione una acciÃ³n de seguimiento desde el menÃº Â«MarcarÂ»."
-
-#: ../mail/mail-dialogs.glade.h:17
-msgid "_Accept License"
-msgstr "_Aceptar licencia"
-
-#: ../mail/mail-dialogs.glade.h:18
-msgid "_Due By:"
-msgstr "_Vence el:"
-
-#: ../mail/mail-dialogs.glade.h:19
-msgid "_Flag:"
-msgstr "_Marca:"
-
-#: ../mail/mail-dialogs.glade.h:20
-msgid "_Tick this to accept the license agreement"
-msgstr "_Marque esto para aceptar el acuerdo de licencia"
-
 #: ../mail/mail-folder-cache.c:890
 #, c-format
 msgid "Pinging %s"
@@ -13645,7 +11887,7 @@ msgid "_Do not Synchronize"
 msgstr "_No sincronizar"
 
 #: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1012
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -13723,7 +11965,7 @@ msgstr "%e de %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:534
+#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
 msgid "Shell Backend"
 msgstr "Â«BackendÂ» de la shell"
 
@@ -13768,6 +12010,10 @@ msgstr "Marcado"
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
+#: ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Etiquetas"
+
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Recibido"
@@ -13785,60 +12031,28 @@ msgstr "TamaÃ±o"
 msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "Llamar"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "No reenviar"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "Seguimiento"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "Para su informaciÃ³n"
-
-#: ../mail/message-tag-followup.c:58
-msgid "Forward"
-msgstr "Reenviar"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "No es necesaria una respuesta"
-
-#: ../mail/message-tag-followup.c:63
-msgid "Reply to All"
-msgstr "Responder a todos"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "Revisar"
-
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-shell-view-actions.c:1416
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1423
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1430
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1478
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
@@ -13846,7 +12060,7 @@ msgstr "El asunto contiene"
 msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/addressbook/addressbook-config.c:212
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13854,7 +12068,7 @@ 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
+#: ../modules/addressbook/addressbook-config.c:208
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13862,7 +12076,7 @@ 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
+#: ../modules/addressbook/addressbook-config.c:210
 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 "
@@ -13872,19 +12086,15 @@ msgstr ""
 "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
+#: ../modules/addressbook/addressbook-config.c:592
 msgid "Use in _Birthday & Anniversaries calendar"
 msgstr "Usar en el calendario Cu_mpleaÃ±os y aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:674
+#: ../modules/addressbook/addressbook-config.c:628
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../modules/addressbook/addressbook-config.c:785
+#: ../modules/addressbook/addressbook-config.c:736
 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 "
@@ -13894,7 +12104,7 @@ msgstr ""
 "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
+#: ../modules/addressbook/addressbook-config.c:810
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13904,7 +12114,7 @@ msgstr ""
 "establecer esto a Â«DirecciÃ³n de correo-eÂ» requiere acceso anÃ³nimo a su "
 "servidor ldap."
 
-#: ../modules/addressbook/addressbook-config.c:942
+#: ../modules/addressbook/addressbook-config.c:885
 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 "
@@ -13916,34 +12126,31 @@ msgstr ""
 "Â«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
+#: ../modules/addressbook/addressbook-config.c:991
 msgid "Server Information"
 msgstr "InformaciÃ³n del servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1054
+#: ../modules/addressbook/addressbook-config.c:993
 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
+#: ../modules/addressbook/addressbook-config.c:996
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:1058
+#: ../modules/addressbook/addressbook-config.c:997
 msgid "Searching"
 msgstr "BÃºsqueda"
 
-#: ../modules/addressbook/addressbook-config.c:1060
+#: ../modules/addressbook/addressbook-config.c:999
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1270
-#: ../modules/addressbook/ldap-config.glade.h:9
+#: ../modules/addressbook/addressbook-config.c:1205
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
@@ -14040,6 +12247,7 @@ msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
 
 #: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1152
 msgid "Table column:"
 msgstr "Columna de tabla:"
 
@@ -14063,7 +12271,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
@@ -14073,7 +12281,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
@@ -14083,13 +12291,13 @@ msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:730
 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:385
+#: ../modules/addressbook/e-book-shell-view.c:388
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-migrate.c:480
 msgid "Contacts"
@@ -14206,7 +12414,6 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-sidebar.c:601
 #: ../modules/calendar/e-memo-shell-sidebar.c:536
 #: ../modules/calendar/e-task-shell-sidebar.c:534
-#| msgid "Memo Source Selector"
 msgid "Source Selector Widget"
 msgstr "Selector de fuentes"
 
@@ -14219,437 +12426,282 @@ msgstr "Este widget muestra grupos de libretas de direcciones"
 msgid "Save as vCard"
 msgstr "Guardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:730
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos los contactos aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:709
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar el contenido de la libreta de direcciones seleccionada a otra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
 msgid "Del_ete Address Book"
 msgstr "_Borrar la libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:716
 msgid "Delete the selected address book"
 msgstr "Borrar la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:744
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos los contactos aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:723
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover los contactos de la libreta de direcciones seleccionada a otra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:751
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:758
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
 msgid "Address _Book Properties"
 msgstr "Propiedades de la _libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:737
 msgid "Show properties of the selected address book"
 msgstr "Mostrar las propiedades de la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
-#: ../modules/calendar/e-task-shell-view-actions.c:778
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Rename..."
 msgstr "_Renombrarâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:744
 msgid "Rename the selected address book"
 msgstr "Renombrar la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
 msgid "S_ave Address Book as vCard"
 msgstr "G_uardar la libreta de direcciones como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:751
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 "Guardar los contactos de la libreta de direcciones seleccionada como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:781
+#: ../modules/addressbook/e-book-shell-view-actions.c:758
 msgid "Stop loading"
 msgstr "Parar la carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:788
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Copy the selection"
 msgstr "Copiar la selecciÃ³n"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:795
-#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Cut the selection"
 msgstr "Cortar la selecciÃ³n"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:802
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/addressbook/e-book-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
 msgid "_Copy Contact To..."
 msgstr "_Copiar contacto aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:809
+#: ../modules/addressbook/e-book-shell-view-actions.c:786
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
 msgid "_Delete Contact"
 msgstr "_Borrar contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:793
 msgid "Delete selected contacts"
 msgstr "Borrar los contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
 msgid "_Forward Contact..."
 msgstr "_Reenviar contactoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:800
 msgid "Send selected contacts to another person"
 msgstr "Enviar los contactos seleccionados a otra persona"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Move Contact To..."
 msgstr "_Mover contacto aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
 msgid "Move selected contacts to another address book"
 msgstr "Mover los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "_New Contact..."
 msgstr "Contacto _nuevoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nuevaâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "_Open Contact"
 msgstr "_Abrir contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensaje al contactoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Send a message to the selected contacts"
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:689
-#: ../modules/calendar/e-task-shell-view-actions.c:843
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "_Save as vCard..."
 msgstr "G_uardar como vCardâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Show contact preview window"
 msgstr "Mostrar una ventana de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:937
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "_Classic View"
 msgstr "Vista _clÃ¡sica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:944
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar la vista previa del contacto junto a la lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:982
-#: ../modules/calendar/e-cal-shell-view-actions.c:1569
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Any Category"
 msgstr "Cualquier categorÃa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1402
+#| msgid "Advanced Search"
+msgid "Advanced search"
+msgstr "BÃºsqueda avanzada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Print all shown contacts"
 msgstr "Imprimir todos los contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar los contactos que imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1054
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Save as vCard..."
 msgstr "Guardar como vCardâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "Save selected contacts as a vCard"
 msgstr "Guardar los contactos seleccionados como VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:336
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:338
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:362
+#: ../modules/addressbook/e-book-shell-view.c:365
 msgid "_Send Message to Contacts"
 msgstr "_Enviar un correo a los contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:364
+#: ../modules/addressbook/e-book-shell-view.c:367
 msgid "_Send Message to List"
 msgstr "_Enviar un correo a la lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:366
+#: ../modules/addressbook/e-book-shell-view.c:369
 msgid "_Send Message to Contact"
 msgstr "_Enviar un correo al contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:139
+#: ../modules/addressbook/eab-composer-util.c:137
 msgid "Multiple vCards"
 msgstr "vCards mÃºltiples"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:145
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../modules/addressbook/eab-composer-util.c:159
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
 #, c-format
 msgid "Contact information"
 msgstr "InformaciÃ³n de contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:188
+#: ../modules/addressbook/eab-composer-util.c:186
 #, 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"
@@ -14696,7 +12748,7 @@ msgid "_Appointment"
 msgstr "_Cita"
 
 #: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
@@ -14724,7 +12776,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
 #: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -14829,19 +12881,18 @@ msgstr "Purgar acontecimientos anteriores a"
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:528
 msgid "Copying Items"
 msgstr "Copiando elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:778
 msgid "Moving Items"
 msgstr "Moviendo elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1079
 #: ../modules/calendar/e-cal-shell-view-memopad.c:262
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 #: ../modules/calendar/e-memo-shell-view-actions.c:500
@@ -14849,210 +12900,210 @@ msgstr "Moviendo elementos"
 msgid "Save as iCalendar"
 msgstr "Guardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1193
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1170
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "_Copy..."
 msgstr "_Copiarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1186
 msgid "Go Back"
 msgstr "Retroceder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1216
+#: ../modules/calendar/e-cal-shell-view-actions.c:1193
 msgid "Go Forward"
 msgstr "Avanzar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1223
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Select today"
 msgstr "Selecciona hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Select _Date"
 msgstr "Seleccionar _fecha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Select a specific date"
 msgstr "Selecciona una fecha especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
-#: ../modules/calendar/e-task-shell-view-actions.c:827
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Purg_e"
 msgstr "Purg_ar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Purge old appointments and meetings"
 msgstr "Purgar reuniones y acontecimientos antiguos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Rename the selected calendar"
 msgstr "Renombrar el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
 msgid "Show _Only This Calendar"
 msgstr "Mostrar _sÃ³lo este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendarioâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reuniÃ³nâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Delete the appointment"
 msgstr "Borra la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Delete This _Occurrence"
 msgstr "Borrar esta _repeticiÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Delete this occurrence"
 msgstr "Borrar esta repeticiÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Delete all occurrences"
 msgstr "Borra todas las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "New All Day _Event..."
 msgstr "Acont_ecimiento nuevo para todo el dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Create a new all day event"
 msgstr "Crear un acontecimiento nuevo para todo el dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 #: ../modules/calendar/e-cal-shell-view-memopad.c:322
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "New _Meeting..."
 msgstr "_ReuniÃ³n nuevaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Create a new meeting"
 msgstr "Crear una reuniÃ³n nueva"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendarioâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New _Appointment..."
 msgstr "_Cita nuevaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repeticiÃ³n _movible"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "View the current appointment"
 msgstr "Ver la cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 #: ../modules/calendar/e-cal-shell-view-memopad.c:350
 msgid "Save as iCalendar..."
 msgstr "Guardar como iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reuniÃ³nâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1501
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1508
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "Show as list"
 msgstr "Mostrar como una lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1515
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1529
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Show one work week"
 msgstr "Mostrar una semana de trabajo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los prÃ³ximos 7 dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "La descripciÃ³n contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1607
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar el calendario que imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Go To"
 msgstr "Ir a"
 
@@ -15062,65 +13113,65 @@ msgid "Deleting selected memos..."
 msgstr "Borrando las notas seleccionadasâ?¦"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
 msgid "Copy selected memo"
 msgstr "Copia la nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:303
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "Cut selected memo"
 msgstr "Corta la nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
 msgid "Paste memo from the clipboard"
 msgstr "Pegar notas desde el portapapeles"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "_Borrar nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "Borra las notas seleccionadas"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:329
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "New _Memo"
 msgstr "_Nota nueva"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:331
 #: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:336
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:675
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
 msgid "View the selected memo"
 msgstr "Ver la nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:343
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:431
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Open _Web Page"
 msgstr "Abrir pÃ¡gina _web"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
 msgstr "Imprimir la nota seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:444
-#: ../modules/calendar/e-memo-shell-view.c:226
+#: ../modules/calendar/e-memo-shell-view.c:229
 msgid "Delete Memo"
 msgid_plural "Delete Memos"
 msgstr[0] "Borrar nota"
@@ -15132,42 +13183,42 @@ msgid "Deleting selected tasks..."
 msgstr "Borrando las tareas seleccionadasâ?¦"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:685
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "Copy selected tasks"
 msgstr "Copia las tareas seleccionadas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "Cut selected tasks"
 msgstr "Corta las tareas seleccionadas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "Paste tasks from the clipboard"
 msgstr "Pega las tareas del portapapeles"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "_Delete Task"
 msgstr "_Borrar tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mark selected tasks as complete"
 msgstr "Marcar tareas seleccionadas como terminadas"
 
@@ -15176,44 +13227,44 @@ msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleta"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:412
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar las tareas seleccionadas como incompletas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:419
 #: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:424
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:426
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "View the selected task"
 msgstr "Ver la tarea seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:438
-#: ../modules/calendar/e-memo-shell-view-actions.c:860
-#: ../modules/calendar/e-task-shell-view-actions.c:1061
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "G_uardar como iCalendarâ?¦"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:450
-#: ../modules/calendar/e-task-shell-view-actions.c:1046
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "Imprimir la tarea seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:555
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgid_plural "Delete Tasks"
 msgstr[0] "Borrar tarea"
@@ -15239,7 +13290,7 @@ msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -15251,12 +13302,18 @@ msgstr "El registro de lista de notas"
 msgid "The memo table model"
 msgstr "El modelo de la tabla de notas"
 
+#: ../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"
+
 #: ../modules/calendar/e-memo-shell-sidebar.c:185
 msgid "Loading memos"
 msgstr "Cargando notas"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:399
-#| msgid "Memo Source Selector"
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
@@ -15274,43 +13331,39 @@ msgstr "Abriendo notas en %s"
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#| msgid "Rename the selected folder"
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "Rename the selected memo list"
 msgstr "Renombrar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#| msgid "Show _only this Memo List"
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Show _Only This Memo List"
 msgstr "Mostrar _sÃ³lo esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "Vista pre_via de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
 msgstr "Mostrar el panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar la vista previa de la nota bajo la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar la vista previa de la nota junto a la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "Imprime la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
 msgstr "Vista previa de la lista de notas para imprimir"
 
@@ -15327,7 +13380,7 @@ msgstr[1] "%d notas"
 msgid "%d selected"
 msgstr "%d seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view.c:224
+#: ../modules/calendar/e-memo-shell-view.c:227
 msgid "Delete Memos"
 msgstr "Borrar notas"
 
@@ -15351,7 +13404,7 @@ msgid "Tas_k List"
 msgstr "Lista de _tareas"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -15415,76 +13468,71 @@ msgstr ""
 "\n"
 "Â¿Borrar realmente esas tareas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Copy..."
 msgstr "_Copiarâ?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Rename the selected task list"
 msgstr "Renombrar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Show _Only This Task List"
 msgstr "Mostrar _sÃ³lo esta lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#| msgid "_Mark as Incomplete"
+#: ../modules/calendar/e-task-shell-view-actions.c:776
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Delete completed tasks"
 msgstr "Borra las tareas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "_Vista previa de tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#| msgid "Show preview pane"
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:939
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "Mostrar la vista previa de tareas bajo la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:946
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar la vista previa de tareas junto a la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:968
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:975
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los prÃ³ximos 7 dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:982
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:989
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1032
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1039
-#| msgid "Previews the list of tasks to be printed"
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "Vista previa de la lista de tareas para imprimir"
 
@@ -15495,8 +13543,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../modules/calendar/e-task-shell-view.c:351
-#| msgid "Completed Tasks"
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "Borrar tareas"
 
@@ -15528,6 +13575,10 @@ msgstr "Crea una carpeta de correo nueva"
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
+#: ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
 #: ../modules/mail/e-mail-shell-backend.c:221
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
@@ -15629,314 +13680,303 @@ 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
-#| msgid "Disable Account"
+#: ../modules/mail/e-mail-shell-view-actions.c:984
+#: ../modules/mail/e-mail-shell-view.c:507
 msgid "_Disable Account"
 msgstr "_Desactivar cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
-#| msgid "Disable Account"
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar mensajes para trabajar sin conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
-#| msgid "Download messages of accounts/folders marked for offline"
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 msgid "Download messages of accounts and folders marked for offline"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas como sin conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
-#| msgid "Permanently remove all deleted messages from all folders"
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las carpetas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1019
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1074
+#: ../modules/mail/e-mail-shell-view-actions.c:1026
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta aâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../modules/mail/e-mail-shell-view-actions.c:1040
 msgid "E_xpunge"
 msgstr "C_ompactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta aâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New..."
 msgstr "_Nuevaâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:1077
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
 msgid "Select _All Messages"
 msgstr "Seleccionar _todos los mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versaciÃ³n del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los correos en la misma conversaciÃ³n que el correo "
 "seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversaciÃ³n del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
-#| msgid "Rename the selected folder"
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Unsubscribe from the selected folder"
 msgstr "Desuscribirse de la carpeta seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1172
-#| msgid "None"
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "Hide S_elected Messages"
 msgstr "Ocultar mensajes s_eleccionados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Show Hidde_n Messages"
 msgstr "_Mostrar mensajes ocultos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operaciÃ³n de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de correos nuevos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Search F_olders"
 msgstr "Carpetas de bÃºsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
-#| msgid "Create or edit Search Folder definitions"
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Create or edit search folder definitions"
 msgstr "Crear o edita definiciones para carpetas de bÃºsqueda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Subscriptions..."
 msgstr "_Suscripcionesâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_New Folder..."
 msgstr "Carpeta _nuevaâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar correos _borrados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ocultar los correos borrados en lugar de mostrarlos tachados por una lÃnea"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
-#| msgid "Show message preview window"
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1346
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1348
-#| msgid "Threaded Message list"
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
 msgid "Show message preview below the message list"
 msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
-#| msgid "Show message preview below the message list"
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los Ãºltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1419
+#: ../modules/mail/e-mail-shell-view-actions.c:1371
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 msgid "Read Messages"
 msgstr "Mensajes leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "Unread Messages"
 msgstr "Mensajes no leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
-#| msgid "Subject or Addresses contains"
+#: ../modules/mail/e-mail-shell-view-actions.c:1444
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1495
+#: ../modules/mail/e-mail-shell-view-actions.c:1454
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1502
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1509
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -15997,7 +14037,7 @@ msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view.c:508
+#: ../modules/mail/e-mail-shell-view.c:505
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesiÃ³n proxy"
 
@@ -16044,35 +14084,30 @@ 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
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
 #, 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
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
 #, 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:767
+#| msgid "No Junk plugin available"
+msgid "No junk plugin available"
+msgstr "No existe un complemento de SPAM disponible"
 
-#: ../modules/mail/em-mailer-prefs.c:1147
-#| msgid "Table column:"
-msgid "_Table column:"
-msgstr "Columna de _tabla:"
+#: ../modules/mail/em-mailer-prefs.c:1151
+#| msgid "_Date header:"
+msgid "Date header:"
+msgstr "Cabecera de fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1148
-#| msgid "Date header:"
-msgid "_Date header:"
-msgstr "Cabecera de _fecha:"
-
-#: ../modules/mail/em-mailer-prefs.c:1149
-#| msgid "Show _Original Size"
+#: ../modules/mail/em-mailer-prefs.c:1153
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
@@ -16116,8 +14151,8 @@ msgstr ""
 "Lista de indicios para que el complemento de recuerdo de adjuntos busque en "
 "el cuerpo de un mensaje."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:378
+#: ../plugins/attachment-reminder/attachment-reminder.c:515
+#: ../plugins/templates/templates.c:414
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16152,12 +14187,10 @@ 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 "Inline"
 msgid "Inline Audio"
 msgstr "Sonido en lÃnea"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#| msgid "Play audio attachments directly from Evolution."
 msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
@@ -16210,7 +14243,6 @@ msgid "_Backup Settings..."
 msgstr "_Respaldar ajustesâ?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:349
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Respaldar y restaurar los datos y la configuraciÃ³n a un archivador"
 
@@ -16219,7 +14251,6 @@ msgid "R_estore Settings..."
 msgstr "R_estaurar ajustesâ?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:356
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Respaldar y restaurar los datos y la configuraciÃ³n desde un archivador"
 
@@ -16513,6 +14544,13 @@ msgstr "_URL:"
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../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:"
+
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
 #: ../plugins/calendar-file/calendar-file.c:274
@@ -16523,6 +14561,15 @@ msgstr "Usar _SSL"
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
+#: ../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"
+
 #: ../plugins/caldav/caldav-source.c:451
 #: ../plugins/calendar-file/calendar-file.c:296
 #: ../plugins/calendar-http/calendar-http.c:326
@@ -16632,6 +14679,10 @@ msgstr "MeteorologÃa: Tormenta"
 msgid "Select a location"
 msgstr "Seleccione un lugar"
 
+#: ../plugins/calendar-weather/calendar-weather.c:363
+msgid "_Location:"
+msgstr "_Lugar:"
+
 #: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "_Unidades:"
@@ -16681,7 +14732,6 @@ msgid "Mark as _default address book"
 msgstr "Marcar como libreta de direcciones pre_determinada"
 
 #: ../plugins/default-source/default-source.c:119
-#| msgid "Show autocompleted name with an address"
 msgid "A_utocomplete with this address book"
 msgstr "A_utocompletar con esta libreta de direcciones"
 
@@ -16722,41 +14772,32 @@ msgstr ""
 "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
+#: ../plugins/email-custom-header/email-custom-header.c:319
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgid "Unclassified"
 msgstr "Sin clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:335
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Protected"
 msgstr "Protegido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:337
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:580
+#: ../plugins/email-custom-header/email-custom-header.c:570
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
-#: ../plugins/email-custom-header/email-custom-header.c:905
-msgid "Key"
-msgstr "Clave"
-
-#: ../plugins/email-custom-header/email-custom-header.c:916
-#: ../plugins/templates/templates.c:384
-msgid "Values"
-msgstr "Valores"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:895
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16765,6 +14806,15 @@ msgstr ""
 "es:\n"
 "Valores clave del nombre de la cabecera personalizada separados por Â«;Â»."
 
+#: ../plugins/email-custom-header/email-custom-header.c:949
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:960
+#: ../plugins/templates/templates.c:420
+msgid "Values"
+msgstr "Valores"
+
 #. 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."
@@ -16774,10 +14824,6 @@ msgstr "AÃ±adir una cabecera personalizada a los mensajes salientes."
 msgid "Custom Header"
 msgstr "Cabecera personalizada"
 
-#: ../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"
 msgstr ""
@@ -16875,12 +14921,10 @@ msgid "Unknown error"
 msgstr "Error desconocido"
 
 #: ../plugins/face/face.c:286
-#| msgid "Select a (48*48) png of size < 700bytes"
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "Seleccionar una imagen png (el mejor tamaÃ±o es 48*48 < 720bytes)"
 
 #: ../plugins/face/face.c:296
-#| msgid "Importing files"
 msgid "Image files"
 msgstr "Archivos de imÃ¡genes"
 
@@ -16893,7 +14937,6 @@ msgid "Load new _Face picture"
 msgstr "Cargar una nueva imagen de _rostro"
 
 #: ../plugins/face/face.c:415
-#| msgid "Include:"
 msgid "Include _Face"
 msgstr "Incluir _rostro"
 
@@ -16902,27 +14945,22 @@ msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Adjuntar una imagen pequeÃ±a de su rostro en mensajes salientes."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
-#| msgid "Table header"
 msgid "Failed Read"
 msgstr "Lectura fallida"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-#| msgid "Invalid Date Value"
 msgid "Invalid Image Size"
 msgstr "TamaÃ±o de imagen no vÃ¡lido"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-#| msgid "_No image"
 msgid "Not an image"
 msgstr "No es una imagen"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-#| msgid "Please select an image for this contact"
 msgid "Please select an image of size 48 * 48"
 msgstr "Seleccione una imagen de tamaÃ±o 48 * 48"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-#| msgid "The item could not be sent!\n"
 msgid "The file cannot be read"
 msgstr "El archivo no se puede leer"
 
@@ -17012,7 +15050,7 @@ msgid "Rese_nd Meeting..."
 msgstr "Reen_viar reuniÃ³nâ?¦"
 
 #: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:351
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Create folder"
 msgstr "Crear carpeta"
 
@@ -17054,45 +15092,14 @@ msgid "Junk Settings"
 msgstr "Opciones de SPAM"
 
 #: ../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-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Lista de SPAM:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
-msgid "Email:"
-msgstr "Correo-e:"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:484
-msgid "_Disable"
-msgstr "_Desactivar"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
-msgid "_Enable"
-msgstr "_Activar"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
-msgid "_Junk List"
-msgstr "Lista de _SPAM"
-
-#: ../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 correo"
 
 #: ../plugins/groupwise-features/mail-retract.c:87
-#| 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?"
@@ -17224,153 +15231,57 @@ msgstr "Â¿Quiere aceptarlo?"
 msgid "Would you like to decline it?"
 msgstr "Â¿Quiere rechazarlo?"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Usuarios:</b>"
-
-#: ../plugins/groupwise-features/properties.glade.h:2
-msgid "C_ustomize notification message"
-msgstr "_Personalizar el mensaje de notificaciÃ³n"
-
-#: ../plugins/groupwise-features/properties.glade.h:3
-msgid "Con_tacts..."
-msgstr "Con_tactosâ?¦"
-
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:512
-msgid "Message"
-msgstr "Mensaje"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
-msgid "Shared Folder Notification"
-msgstr "NotificaciÃ³n de carpeta compartida"
-
-#: ../plugins/groupwise-features/properties.glade.h:8
-msgid "The participants will receive the following notification.\n"
-msgstr "Los participantes recibirÃ¡n la notificaciÃ³n siguiente.\n"
-
-#: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Not Shared"
-msgstr "_Sin compartir"
-
-#: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With..."
-msgstr "_Compartir conâ?¦"
-
-#: ../plugins/groupwise-features/properties.glade.h:15
-msgid "_Sharing"
-msgstr "_Compartir"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Nombre</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
-msgid "Access Rights"
-msgstr "Derechos de acceso"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-msgid "Add/Edit"
-msgstr "AÃ±adir/Editar"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
-msgid "Con_tacts"
-msgstr "Con_tactos"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
-msgid "Modify _folders/options/rules/"
-msgstr "Modificar _carpetas/opciones/reglas/"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
-msgid "Read items marked _private"
-msgstr "Leer elementos marcados como _privados"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
-msgid "Reminder Notes"
-msgstr "Notas de recuerdo"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
-msgid "Subscribe to my _alarms"
-msgstr "Suscribirse a _mis alertas"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
-msgid "Subscribe to my _notifications"
-msgstr "Suscribirse a _mis notificaciones"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-msgid "_Write"
-msgstr "_Escribir"
-
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
-msgid "permission to read|_Read"
-msgstr "_Lectura"
-
-#. 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-listing.glade.h:2
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nombre de la cuenta</b>"
-
-#. 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-dialog.glade.h:3
-msgid "Proxy Login"
-msgstr "SesiÃ³n proxy"
-
 #: ../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
+#: ../plugins/groupwise-features/send-options.c:85
 #, 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.c:688
+#: ../plugins/groupwise-features/proxy.c:684
 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:694
+#: ../plugins/groupwise-features/proxy.c:690
 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
+#: ../plugins/groupwise-features/proxy.c:923
+#: ../plugins/groupwise-features/share-folder.c:699
 msgid "Add User"
 msgstr "AÃ±adir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "Opciones de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:734
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Introduzca los usuarios y establezca permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:416
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:527
 msgid "Custom Notification"
 msgstr "NotificaciÃ³n personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:739
 msgid "Add   "
 msgstr "AÃ±adir   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:745
 msgid "Modify"
 msgstr "Modificar"
 
@@ -17439,56 +15350,14 @@ msgstr "Imagen en lÃnea"
 msgid "View image attachments directly in mail messages."
 msgstr "Ver los adjuntos directamente en los mensajes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:331
+#: ../plugins/imap-features/imap-headers.c:328
 msgid "Custom Headers"
 msgstr "Cabeceras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:344
+#: ../plugins/imap-features/imap-headers.c:341
 msgid "IMAP Headers"
 msgstr "Cabeceras IMAP"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>Cabeceras personalizadas</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>Cabeceras IMAP</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceras bÃ¡sicas y de _listas de correo predeterminadas"
-
-#: ../plugins/imap-features/imap-headers.glade.h:4
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Proporcione las cabeceras extra que necesite obtener ademÃ¡s de las cabeceras "
-"estÃ¡ndar anteriores.\n"
-"Puede ignorar esto si elige Â«Todas las cabecerasÂ»"
-
-#: ../plugins/imap-features/imap-headers.glade.h:6
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"Seleccione sus preferencias para las cabeceras IMAP. \n"
-"Cuantas mÃ¡s cabeceras tenga mÃ¡s tiempo se tardarÃ¡ en descargar."
-
-#: ../plugins/imap-features/imap-headers.glade.h:8
-msgid ""
-"_Basic Headers - (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-"Cabeceras _bÃ¡sicas - (RÃ¡pido) \n"
-"Use esto si no tiene filtros basados en listas de correo"
-
-#: ../plugins/imap-features/imap-headers.glade.h:10
-msgid "_Fetch All Headers"
-msgstr "Obtener _todas las cabeceras"
-
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
 msgstr "Configurar sus cuentas IMAP."
@@ -18915,7 +16784,10 @@ msgid "Mount of %s failed:"
 msgstr "FallÃ³ al montar %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:484
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:484
 msgid "E_nable"
 msgstr "_Activar"
 
@@ -18923,108 +16795,14 @@ msgstr "_Activar"
 msgid "Are you sure you want to remove this location?"
 msgstr "Â¿Seguro que quiere eliminar este lugar?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:943
+#: ../plugins/publish-calendar/publish-calendar.c:939
 msgid "Could not create publish thread."
 msgstr "No se pudo publicar el hilo de publicaciÃ³n."
 
-#: ../plugins/publish-calendar/publish-calendar.c:950
+#: ../plugins/publish-calendar/publish-calendar.c:946
 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>"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Fuentes</span>"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"Diariamente\n"
-"Semanalmente\n"
-"Manual (por medio del menÃº Acciones)"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
-msgid "P_ort:"
-msgstr "_Puerto:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
-msgid "Publishing Location"
-msgstr "Lugar de publicaciÃ³n"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
-msgid "Publishing _Frequency:"
-msgstr "_Frecuencia de publicaciÃ³n:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"FTP seguro (SSH)\n"
-"FTP pÃºblico\n"
-"FTP (con autorizaciÃ³n)\n"
-"ComparticiÃ³n Windows\n"
-"WebDAV (HTTP)\n"
-"WebDAV seguro (HTTPS)\n"
-"Lugar personalizado"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
-msgid "Service _type:"
-msgstr "_Tipo de servicio:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-msgid "Time _duration:"
-msgstr "_DuraciÃ³n:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_File:"
-msgstr "_Archivo:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
-msgid "_Password:"
-msgstr "_ContraseÃ±a:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Publish as:"
-msgstr "_Publicar como:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Remember password"
-msgstr "_Recordar contraseÃ±a"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-msgid "_Username:"
-msgstr "_Usuario:"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"dÃas\n"
-"semanas\n"
-"meses"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"Disponibilidad\n"
-"iCal"
-
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
@@ -19032,11 +16810,11 @@ msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "No se pudo publicar el calendario: El Â«backendÂ» del calendario ya no existe."
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "UbicaciÃ³n nueva"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "Editar ubicaciÃ³n"
 
@@ -19247,12 +17025,12 @@ msgstr ""
 "Por favor pulse el botÃ³n Â«AdelanteÂ» para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../widgets/misc/e-import-assistant.c:388
+#: ../widgets/misc/e-import-assistant.c:387
 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:150
-#: ../widgets/misc/e-import-assistant.c:545
+#: ../widgets/misc/e-import-assistant.c:544
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
@@ -19298,15 +17076,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Borradores basados en el complemento de plantillas"
 
-#: ../plugins/templates/templates.c:582
+#: ../plugins/templates/templates.c:618
 msgid "No Title"
 msgstr "Sin tÃtulo"
 
-#: ../plugins/templates/templates.c:653
+#: ../plugins/templates/templates.c:689
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:655
+#: ../plugins/templates/templates.c:691
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -19525,7 +17303,7 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diÃ¡logo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:315
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -19690,32 +17468,32 @@ msgstr "Los botones de la ventana son visibles"
 #. * 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
+#: ../shell/e-shell-content.c:931
 msgid "Sho_w:"
 msgstr "M_ostrar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:897
+#: ../shell/e-shell-content.c:956
 msgid "Sear_ch:"
 msgstr "B_uscar:"
 
 #. Scope Combo Widgets
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:939
+#: ../shell/e-shell-content.c:998
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-content.c:1362
+#: ../shell/e-shell-content.c:1494
 msgid "Advanced Search"
 msgstr "BÃºsqueda avanzada"
 
-#: ../shell/e-shell-content.c:1419 ../shell/e-shell-content.c:1420
+#: ../shell/e-shell-content.c:1552 ../shell/e-shell-content.c:1553
 msgid "Searches"
 msgstr "BÃºsquedas"
 
-#: ../shell/e-shell-content.c:1465
+#: ../shell/e-shell-content.c:1598
 msgid "Save Search"
 msgstr "Guardar bÃºsqueda"
 
@@ -19740,72 +17518,72 @@ msgstr "Barra de herramientas visible"
 msgid "Whether the switcher is visible"
 msgstr "Indica si el selector es visible"
 
-#: ../shell/e-shell-view.c:485
+#: ../shell/e-shell-view.c:486
 msgid "Switcher Action"
 msgstr "AcciÃ³n del selector"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-view.c:487
 msgid "The switcher action for this shell view"
 msgstr "La acciÃ³n del selector para esta vista de la shell"
 
-#: ../shell/e-shell-view.c:501
+#: ../shell/e-shell-view.c:502
 msgid "Page Number"
 msgstr "NÃºmero de pÃ¡gina"
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:503
 msgid "The notebook page number of the shell view"
 msgstr "El nÃºmero de pÃ¡gina del libro de notas para esta vista de shell"
 
-#: ../shell/e-shell-view.c:520
+#: ../shell/e-shell-view.c:521
 msgid "The title of the shell view"
 msgstr "El tÃtulo de esta vista de shell"
 
-#: ../shell/e-shell-view.c:535
+#: ../shell/e-shell-view.c:536
 msgid "The EShellBackend for this shell view"
 msgstr "El Â«EShellBackendÂ» para esta vista de shell"
 
-#: ../shell/e-shell-view.c:550
+#: ../shell/e-shell-view.c:551
 msgid "Shell Content Widget"
 msgstr "Widget de contenido shell"
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:552
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 "El widget de contenido aparece en un panel derecho de la ventana de shell"
 
-#: ../shell/e-shell-view.c:567
+#: ../shell/e-shell-view.c:568
 msgid "Shell Sidebar Widget"
 msgstr "Widget de barra lateral de shell"
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:569
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 "El widget de barra lateral aparee en un panel izquierdo de la ventana de "
 "shell"
 
-#: ../shell/e-shell-view.c:583
+#: ../shell/e-shell-view.c:584
 msgid "Shell Taskbar Widget"
 msgstr "Widget de barra de tareas de shell"
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:585
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 "El widget de barra de tareas aparece en la parte inferior de una ventana de "
 "shell"
 
-#: ../shell/e-shell-view.c:599
+#: ../shell/e-shell-view.c:600
 msgid "Shell Window"
 msgstr "Ventana shell"
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:601
 msgid "The window to which the shell view belongs"
 msgstr "La ventana a la que pertenece la shell"
 
-#: ../shell/e-shell-view.c:615
+#: ../shell/e-shell-view.c:616
 msgid "Current View ID"
 msgstr "El ID de la vista actual"
 
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:617
 msgid "The current GAL view ID"
 msgstr "El ID de la vista GAL actual"
 
@@ -19827,292 +17605,292 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "PÃ¡gina web de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1280
+#: ../shell/e-shell-window-actions.c:1295
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1282
+#: ../shell/e-shell-window-actions.c:1297
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1384
+#: ../shell/e-shell-window-actions.c:1399
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot no estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1386
+#: ../shell/e-shell-window-actions.c:1401
 msgid "GNOME Pilot could not be run."
 msgstr "No se pudo ejecutar GNOME Pilot."
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃ³n acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1507
 msgid "_Contents"
 msgstr "Ã?nd_ice"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la GuÃa de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1514
 msgid "Evolution _FAQ"
 msgstr "P+_F de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1516
 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
+#: ../shell/e-shell-window-actions.c:1521
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseÃ±as"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseÃ±as recordadas"
 
-#: ../shell/e-shell-window-actions.c:1513
+#: ../shell/e-shell-window-actions.c:1528
 msgid "I_mport..."
 msgstr "I_mportarâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1535
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Quick Reference"
 msgstr "_Referencia rÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Advanced Search..."
 msgstr "BÃºsqueda _avanzadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1550
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Construct a more advanced search"
 msgstr "Construir una bÃºsqueda mÃ¡s avanzada"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Edit Saved Searches..."
 msgstr "_Editar bÃºsquedas guardadasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Manage your saved searches"
 msgstr "Gestionar sus bÃºsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1586
 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
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Save Search..."
 msgstr "_Guardar bÃºsquedaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Save the current search parameters"
 msgstr "Guardar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1605
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1607
 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
+#: ../shell/e-shell-window-actions.c:1612
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _falloâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1614
 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
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Synchronization Options..."
 msgstr "Opciones de _sincronizaciÃ³nâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1606
+#: ../shell/e-shell-window-actions.c:1621
 msgid "Set up Pilot configuration"
 msgstr "ConfiguraciÃ³n del Pilot"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1626
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1613
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1633
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1635
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1648
+#: ../shell/e-shell-window-actions.c:1663
 msgid "Lay_out"
 msgstr "_DistribuciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1662
+#: ../shell/e-shell-window-actions.c:1677
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1669
+#: ../shell/e-shell-window-actions.c:1684
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1698
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show the toolbar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1756
 msgid "_Icons Only"
 msgstr "SÃ³lo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1758
 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
+#: ../shell/e-shell-window-actions.c:1763
 msgid "_Text Only"
 msgstr "SÃ³lo _texto"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1765
 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
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1772
 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
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1779
 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"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Define Views..."
 msgstr "Definir vistasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1803
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuraciÃ³n de pÃ¡gina para la impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2082
+#: ../shell/e-shell-window-actions.c:2097
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2285
+#: ../shell/e-shell-window-actions.c:2300
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parÃ¡metros de bÃºsqueda"
 
@@ -20179,7 +17957,7 @@ msgid "Whether the shell is online"
 msgstr "Indica si la shell estÃ¡ conectada"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:164
+#: ../shell/main.c:163
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20215,7 +17993,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribuciÃ³n.\n"
 
-#: ../shell/main.c:188
+#: ../shell/main.c:187
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20223,47 +18001,47 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:195
+#: ../shell/main.c:194
 msgid "Do not tell me again"
 msgstr "No preguntarme mÃ¡s veces"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:312
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:323
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigraciÃ³n desde Evolution 1.4"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:326
 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:329
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:331
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:335
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:517
+#: ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:542
+#: ../shell/main.c:541
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20462,7 +18240,7 @@ msgstr "Opciones de gestiÃ³n de la sesiÃ³n:"
 msgid "Show session management options"
 msgstr "Mostrar las opciones de gestiÃ³n de la sesiÃ³n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20473,7 +18251,7 @@ msgstr ""
 "\n"
 "Edite la configuraciÃ³n de confianza:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20483,7 +18261,7 @@ msgstr ""
 "certificado, entonces confÃa en la autenticidad de este certificado a no ser "
 "que se indique otra cosa aquÃ"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20493,59 +18271,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:137
-#: ../smime/gui/certificate-manager.c:384
-#: ../smime/gui/certificate-manager.c:612
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importarâ?¦"
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "Todos los archivos PKCS12"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:399
-#: ../smime/gui/certificate-manager.c:626
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:489
-#: ../smime/gui/certificate-manager.c:714
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/certificate-manager.c:507
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "PropÃ³sito"
 
-#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
-#: ../smime/gui/certificate-manager.c:302
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:393
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "Todos los archivos de certificado de correos-e"
 
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "DirecciÃ³n de correo-e"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:1046
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visor de certificados: %s"
@@ -20565,7 +18342,7 @@ msgid "Enter new password"
 msgstr "Introduzca la contraseÃ±a nueva"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20574,7 +18351,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20583,193 +18360,10 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "Seleccione el certificado"
 
-#: ../smime/gui/smime-ui.glade.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<No es parte del certificado>"
-
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Campos del certificado</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>JerarquÃa del certificado</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>Valor del campo</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>Huellas</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>Emitido por</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Emitido a</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>Este certificado ha sido verificado para los siguientes usos:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>Validez</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
-msgid "Authorities"
-msgstr "Autoridades"
-
-#: ../smime/gui/smime-ui.glade.h:11
-msgid "Backup"
-msgstr "Respaldo"
-
-#: ../smime/gui/smime-ui.glade.h:12
-msgid "Backup All"
-msgstr "Respaldar todo"
-
-#: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Antes de confiar en esta AC para cualquier propÃ³sito, deberÃa examinar su "
-"certificado y su directiva y procedimientos (si estÃ¡n disponibles)."
-
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
-msgid "Certificate"
-msgstr "Certificado"
-
-#: ../smime/gui/smime-ui.glade.h:15
-msgid "Certificate Authority Trust"
-msgstr "Confianza en la autoridad certificadora"
-
-#: ../smime/gui/smime-ui.glade.h:16
-msgid "Certificate details"
-msgstr "Detalles del certificado"
-
-#: ../smime/gui/smime-ui.glade.h:17
-msgid "Certificates Table"
-msgstr "Tabla de certificados"
-
-#: ../smime/gui/smime-ui.glade.h:18
-msgid "Common Name (CN)"
-msgstr "Nombre comÃºn (CN)"
-
-#: ../smime/gui/smime-ui.glade.h:19
-msgid "Contact Certificates"
-msgstr "Certificados de contactos"
-
-#: ../smime/gui/smime-ui.glade.h:21
-msgid "Do not trust the authenticity of this certificate"
-msgstr "No confiar en la autenticidad de este certificado"
-
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "Ventana muda Ãºnicamente"
-
-#: ../smime/gui/smime-ui.glade.h:23
-msgid "Edit"
-msgstr "Editar"
-
-#: ../smime/gui/smime-ui.glade.h:24
-msgid "Email Certificate Trust Settings"
-msgstr "Ajustes de confianza de certificados de correo-e"
-
-#: ../smime/gui/smime-ui.glade.h:25
-msgid "Email Recipient Certificate"
-msgstr "Certificado del destinatario del correo-e"
-
-#: ../smime/gui/smime-ui.glade.h:26
-msgid "Email Signer Certificate"
-msgstr "Certificado del firmante del correo-e"
-
-#: ../smime/gui/smime-ui.glade.h:27
-msgid "Expires On"
-msgstr "Caduca el"
-
-#: ../smime/gui/smime-ui.glade.h:29
-msgid "Import"
-msgstr "Importar"
-
-#: ../smime/gui/smime-ui.glade.h:30
-msgid "Issued On"
-msgstr "Emitido el"
-
-#: ../smime/gui/smime-ui.glade.h:31
-msgid "MD5 Fingerprint"
-msgstr "Huella MD5"
-
-#: ../smime/gui/smime-ui.glade.h:32
-msgid "Organization (O)"
-msgstr "OrganizaciÃ³n (O)"
-
-#: ../smime/gui/smime-ui.glade.h:33
-msgid "Organizational Unit (OU)"
-msgstr "Unidad organizativa (OU)"
-
-#: ../smime/gui/smime-ui.glade.h:34
-msgid "SHA1 Fingerprint"
-msgstr "Huella SHA1"
-
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
-msgid "SSL Client Certificate"
-msgstr "Certificado de cliente SSL"
-
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
-msgid "SSL Server Certificate"
-msgstr "Certificado de servidor SSL"
-
-#: ../smime/gui/smime-ui.glade.h:38
-msgid "Trust the authenticity of this certificate"
-msgstr "Confiar en la autenticidad de este certificado"
-
-#: ../smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify email users."
-msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
-
-#: ../smime/gui/smime-ui.glade.h:40
-msgid "Trust this CA to identify software developers."
-msgstr "Confiar en esta AC para identificar a desarrolladores de software."
-
-#: ../smime/gui/smime-ui.glade.h:41
-msgid "Trust this CA to identify web sites."
-msgstr "Confiar en esta AC para identificar sitios web."
-
-#: ../smime/gui/smime-ui.glade.h:42
-msgid "View"
-msgstr "Ver"
-
-#: ../smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
-msgstr "Tiene certificados de estas organizaciones que le identifican:"
-
-#: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Tiene archivados los certificados que identifican a estas autoridades de "
-"certificaciÃ³n:"
-
-#: ../smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
-msgstr "Tiene archivados los certificados que identifican a estas personas:"
-
-#: ../smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
-msgstr "Sus certificados"
-
-#: ../smime/gui/smime-ui.glade.h:47
-msgid "_Edit CA Trust"
-msgstr "_Editar confianza en la AC"
-
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
@@ -20861,6 +18455,14 @@ msgstr "Clave pÃºblica del propÃ³sito"
 msgid "Error: Unable to process extension"
 msgstr "Erro: No es posible procesar la extensiÃ³n"
 
+#: ../smime/lib/e-cert.c:800
+msgid "SSL Client Certificate"
+msgstr "Certificado de cliente SSL"
+
+#: ../smime/lib/e-cert.c:804
+msgid "SSL Server Certificate"
+msgstr "Certificado de servidor SSL"
+
 #: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Firmante del objeto"
@@ -20918,6 +18520,10 @@ msgstr "Extensiones"
 msgid "%s = %s"
 msgstr "%s = %s"
 
+#: ../smime/lib/e-cert.c:1058
+msgid "Certificate"
+msgstr "Certificado"
+
 #: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
@@ -21023,61 +18629,29 @@ msgid "With _Status"
 msgstr "Con _estado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>Zonas horarias</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_SelecciÃ³n</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-msgid "Select a Time Zone"
-msgstr "Seleccione una zona horaria"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "Timezone drop-down combination box"
-msgstr "Cada de combinaciÃ³n desplegable de la zona horaria"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Use el botÃ³n izquierdo del ratÃ³n para ampliar un Ã¡rea del mapa y seleccionar "
-"una zona horaria.\n"
-"Use el botÃ³n derecho del ratÃ³n para reducir el mapa al tamaÃ±o anterior."
-
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ColecciÃ³n"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
-#, no-c-format
+#: ../widgets/menus/gal-define-views-dialog.c:350
+#, c-format
 msgid "Define Views for %s"
 msgstr "Definir vistas para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:360
 msgid "Define Views"
 msgstr "Definir vistas"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Definir vistas para Â«%sÂ»"
-
 #: ../widgets/menus/gal-view-factory-etable.c:37
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
@@ -21088,38 +18662,18 @@ msgstr "Tabla"
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Guardar vista actual"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid "_Create new view"
-msgstr "_Crear vista nueva"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-msgid "_Replace existing view"
-msgstr "_Reemplazar vista existente"
-
 #: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "FÃ¡brica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:99
 msgid "Define New View"
 msgstr "Definir vistas nuevas"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-msgid "Name of new view:"
-msgstr "Nombre de la vista nueva:"
-
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
-msgid "Type of View"
-msgstr "Tipo de vista"
-
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
-msgid "Type of view:"
-msgstr "Tipo de vista:"
-
 #: ../widgets/misc/e-account-manager.c:348
 msgid "De_fault"
 msgstr "_Predeterminada"
@@ -21148,6 +18702,10 @@ msgstr "Propiedades de adjuntos"
 msgid "_Filename:"
 msgstr "Nombre del _archivo:"
 
+#: ../widgets/misc/e-attachment-dialog.c:345
+msgid "_Description:"
+msgstr "_DescripciÃ³n:"
+
 #: ../widgets/misc/e-attachment-dialog.c:363
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
@@ -21375,45 +18933,45 @@ msgstr "Introduzca el conjunto de caracteres a usar"
 msgid "Other..."
 msgstr "Otroâ?¦"
 
-#: ../widgets/misc/e-dateedit.c:412
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:432
+#: ../widgets/misc/e-dateedit.c:543
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:454
+#: ../widgets/misc/e-dateedit.c:565
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botÃ³n para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:496
+#: ../widgets/misc/e-dateedit.c:607
 msgid "Drop-down combination box to select time"
 msgstr "Caja combo desplegable para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:572
+#: ../widgets/misc/e-dateedit.c:683
 msgid "No_w"
 msgstr "_Ahora"
 
-#: ../widgets/misc/e-dateedit.c:578
+#: ../widgets/misc/e-dateedit.c:689
 msgid "_Today"
 msgstr "_Hoy"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:586
+#: ../widgets/misc/e-dateedit.c:697
 msgid "_None"
 msgstr "_Ninguna"
 
-#: ../widgets/misc/e-dateedit.c:1679
+#: ../widgets/misc/e-dateedit.c:1797
 msgid "Invalid Date Value"
 msgstr "Valor de fecha invÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1715
+#: ../widgets/misc/e-dateedit.c:1833
 msgid "Invalid Time Value"
 msgstr "Valor de hora invÃ¡lido"
 
-#: ../widgets/misc/e-import-assistant.c:241
+#: ../widgets/misc/e-import-assistant.c:240
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21421,40 +18979,40 @@ msgstr ""
 "Elija el archivo que quiere importar en Evolution y seleccione de la lista "
 "el tipo de archivo que es."
 
-#: ../widgets/misc/e-import-assistant.c:258
+#: ../widgets/misc/e-import-assistant.c:257
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:268
+#: ../widgets/misc/e-import-assistant.c:267
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:282
-#: ../widgets/misc/e-import-assistant.c:458
+#: ../widgets/misc/e-import-assistant.c:281
+#: ../widgets/misc/e-import-assistant.c:457
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:325
+#: ../widgets/misc/e-import-assistant.c:324
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:350
+#: ../widgets/misc/e-import-assistant.c:349
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuraciÃ³n de programas _antiguos"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:365
 msgid "Import a _single file"
 msgstr "Importar un _Ãºnico archivo"
 
-#: ../widgets/misc/e-import-assistant.c:442
+#: ../widgets/misc/e-import-assistant.c:441
 msgid "Select what type of file you want to import from the list."
 msgstr "Seleccionar quÃ© tipo de archivo quiere importar de la lista"
 
-#: ../widgets/misc/e-import-assistant.c:519
+#: ../widgets/misc/e-import-assistant.c:518
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21465,17 +19023,17 @@ msgstr ""
 "configuraciÃ³n que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
 "botÃ³n Â«AtrÃ¡sÂ»."
 
-#: ../widgets/misc/e-import-assistant.c:1183
-#: ../widgets/misc/e-import-assistant.c:1210
+#: ../widgets/misc/e-import-assistant.c:1182
+#: ../widgets/misc/e-import-assistant.c:1209
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importaciÃ³n de Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1192
-#: ../widgets/misc/e-import-assistant.c:1244
+#: ../widgets/misc/e-import-assistant.c:1191
+#: ../widgets/misc/e-import-assistant.c:1243
 msgid "Import Location"
 msgstr "Lugar de importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:1203
+#: ../widgets/misc/e-import-assistant.c:1202
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21485,24 +19043,24 @@ msgstr ""
 "Este asistente le guiarÃ¡ a travÃ©s del proceso de importaciÃ³n de archivos "
 "externos dentro de Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1219
+#: ../widgets/misc/e-import-assistant.c:1218
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1228
+#: ../widgets/misc/e-import-assistant.c:1227
 msgid "Select Information to Import"
 msgstr "Seleccione la imformaciÃ³n para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1236
+#: ../widgets/misc/e-import-assistant.c:1235
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1251
+#: ../widgets/misc/e-import-assistant.c:1250
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Pulse Â«AplicarÂ» para comenzar a importar el archivo en Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1257
-#: ../widgets/misc/e-import-assistant.c:1267
+#: ../widgets/misc/e-import-assistant.c:1256
+#: ../widgets/misc/e-import-assistant.c:1266
 msgid "Import Data"
 msgstr "Importar datos"
 
@@ -21594,139 +19152,10 @@ msgstr "Modo de selecciÃ³n"
 msgid "Cursor Mode"
 msgstr "Modo del cursor"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Al _borrar:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>Opciones de entrega</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Respuestas</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Devolver notificaciÃ³n</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Seguimiento de estado</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
-msgid "A_uto-delete sent item"
-msgstr "_Autoborrar el elemento enviado"
-
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Creat_e a sent item to track information"
-msgstr "_Crear un elemento enviado para seguimiento de la informaciÃ³n"
-
-#: ../widgets/misc/e-send-options.glade.h:7
-msgid "Deli_vered and opened"
-msgstr "_Entregado y abierto"
-
-#: ../widgets/misc/e-send-options.glade.h:8
-msgid "Gene_ral Options"
-msgstr "Opciones gene_rales"
-
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"Ninguno\n"
-"Recibos de correo"
-
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"Normal\n"
-"Propietario\n"
-"Confidencial\n"
-"Secreto\n"
-"Alto secreto\n"
-"SÃ³lo para tus ojos"
-
-#: ../widgets/misc/e-send-options.glade.h:17
-msgid "R_eply requested"
-msgstr "_Respuesta solicitada"
-
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Sta_tus Tracking"
-msgstr "Seguimiento de es_tado"
-
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"Indefinido\n"
-"Alto\n"
-"EstÃ¡ndar\n"
-"Bajo"
-
-#: ../widgets/misc/e-send-options.glade.h:24
-msgid "When acce_pted:"
-msgstr "Al ace_ptar:"
-
-#: ../widgets/misc/e-send-options.glade.h:25
-msgid "When co_mpleted:"
-msgstr "Al _terminar:"
-
-#: ../widgets/misc/e-send-options.glade.h:26
-msgid "When decli_ned:"
-msgstr "Al _rehusar:"
-
-#: ../widgets/misc/e-send-options.glade.h:27
-msgid "Wi_thin"
-msgstr "_Dentro"
-
-#: ../widgets/misc/e-send-options.glade.h:28
-msgid "_After:"
-msgstr "_DespuÃ©s de:"
-
-#: ../widgets/misc/e-send-options.glade.h:29
-msgid "_All information"
-msgstr "_Toda la informaciÃ³n"
-
-#: ../widgets/misc/e-send-options.glade.h:30
-msgid "_Classification:"
-msgstr "_ClasificaciÃ³n:"
-
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
-msgid "_Delay message delivery"
-msgstr "_Retrasar la entrega del mensaje"
-
-#: ../widgets/misc/e-send-options.glade.h:33
-msgid "_Delivered"
-msgstr "_Entregado"
-
-#: ../widgets/misc/e-send-options.glade.h:35
-msgid "_Set expiration date"
-msgstr "_Establecer fecha de caducidad"
-
-#: ../widgets/misc/e-send-options.glade.h:36
-msgid "_Until:"
-msgstr "_Hasta:"
-
-#: ../widgets/misc/e-send-options.glade.h:37
-msgid "_When convenient"
-msgstr "_Cuando convenga"
-
-#: ../widgets/misc/e-send-options.glade.h:38
-msgid "_When opened:"
-msgstr "_Al abrir:"
-
 #: ../widgets/misc/e-signature-editor.c:130
 #: ../widgets/misc/e-signature-editor.c:489
 #: ../widgets/misc/e-signature-manager.c:349
@@ -21780,10 +19209,18 @@ msgstr "El script debe ser ejecutable."
 msgid "Click here to go to URL"
 msgstr "Pulse aquÃ para ir a la URL"
 
+#: ../widgets/misc/e-web-view.c:340
+msgid "_Copy Link Location"
+msgstr "_Copiar direcciÃ³n del enlace"
+
 #: ../widgets/misc/e-web-view.c:342
 msgid "Copy the link to the clipboard"
 msgstr "Copiar el enlace al portapapeles"
 
+#: ../widgets/misc/e-web-view.c:350
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en el navegador"
+
 #: ../widgets/misc/e-web-view.c:352
 msgid "Open the link in a web browser"
 msgstr "_Abrir enlace en el navegador"
@@ -21792,14 +19229,6 @@ msgstr "_Abrir enlace en el navegador"
 msgid "_Copy Email Address"
 msgstr "_Copiar direcciÃ³n de correo-e"
 
-#: ../widgets/misc/e-web-view.c:362
-msgid "Copy the email address to the clipboard"
-msgstr "Copiar la direcciÃ³n de correo-e al portapapeles"
-
-#: ../widgets/misc/e-web-view.c:369
-msgid "Send a mail message to this address"
-msgstr "Enviar un correo a esta direcciÃ³n"
-
 #: ../widgets/misc/e-web-view.c:379
 msgid "Copy the selection to the clipboard"
 msgstr "Copiar la selecciÃ³n al portapapeles"
@@ -21808,11 +19237,6 @@ msgstr "Copiar la selecciÃ³n al portapapeles"
 msgid "Select all text and images"
 msgstr "Seleccionar todo el texto y las imÃ¡genes"
 
-#: ../widgets/misc/e-web-view.c:708
-#, c-format
-msgid "Click to mail %s"
-msgstr "Pulse para enviar correo a %s"
-
 #: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
 #: ../widgets/misc/e-web-view.c:714
 #, c-format
@@ -21875,148 +19299,69 @@ msgstr "Columna enfocada"
 msgid "Unselected Column"
 msgstr "Columna deseleccionada"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Strikeout Column"
 msgstr "Tachar columna"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Underline Column"
 msgstr "Subrayar columna"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Bold Column"
 msgstr "Columna en negrita"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Color Column"
 msgstr "Color de la columna"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1836
 msgid "BG Color Column"
 msgstr "Color de fondo de la columna"
 
+#: ../widgets/table/e-table-click-to-add.c:512
+msgid "Message"
+msgstr "Mensaje"
+
 #: ../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
+#: ../widgets/table/e-table-config.c:151
 msgid "State"
 msgstr "Estado"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:389
 msgid "Not sorted"
 msgstr "Sin ordenar"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:430
 msgid "No grouping"
 msgstr "Sin agrupar"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:657
 msgid "Available Fields"
 msgstr "Campos disponibles"
 
-#: ../widgets/table/e-table-config.glade.h:1
-msgid "A_vailable Fields:"
-msgstr "Campos _disponibles:"
-
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1580
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../widgets/table/e-table-config.glade.h:3
-msgid "Clear All"
-msgstr "Quitar todo"
-
-#: ../widgets/table/e-table-config.glade.h:4
-msgid "Clear _All"
-msgstr "Quitar _todo"
-
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1580
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../widgets/table/e-table-config.glade.h:8
-msgid "Group Items By"
-msgstr "Agrupar elementos por"
-
-#: ../widgets/table/e-table-config.glade.h:9
-msgid "Move _Down"
-msgstr "_Bajar"
-
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Move _Up"
-msgstr "_Subir"
-
-#: ../widgets/table/e-table-config.glade.h:12
-msgid "Show _field in View"
-msgstr "Mostrar ca_mpo en la vista"
-
-#: ../widgets/table/e-table-config.glade.h:13
-msgid "Show field i_n View"
-msgstr "Mostrar campo e_n la vista"
-
-#: ../widgets/table/e-table-config.glade.h:14
-msgid "Show field in _View"
-msgstr "Mostrar campo en la _vista"
-
-#: ../widgets/table/e-table-config.glade.h:15
-msgid "Sort"
-msgstr "Ordenar"
-
-#: ../widgets/table/e-table-config.glade.h:16
-msgid "Sort Items By"
-msgstr "Ordenar elementos por"
-
-#: ../widgets/table/e-table-config.glade.h:17
-msgid "Then By"
-msgstr "Luego por"
-
-#: ../widgets/table/e-table-config.glade.h:19
-msgid "_Fields Shown..."
-msgstr "_Campos mostradosâ?¦"
-
-#: ../widgets/table/e-table-config.glade.h:20
-msgid "_Group By..."
-msgstr "_Agrupar porâ?¦"
-
-#: ../widgets/table/e-table-config.glade.h:22
-msgid "_Show field in View"
-msgstr "_Mostrar campo en la vista"
-
-#: ../widgets/table/e-table-config.glade.h:23
-msgid "_Show these fields in order:"
-msgstr "_Mostrar estos campos en orden:"
-
-#: ../widgets/table/e-table-config.glade.h:24
-msgid "_Sort..."
-msgstr "_Ordenarâ?¦"
-
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "AÃ±adir una columnaâ?¦"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "Selector de campos"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22173,6 +19518,14 @@ msgstr "_Ordenar por"
 msgid "_Custom"
 msgstr "_Personalizado"
 
+#: ../widgets/table/e-table-header-item.c:1580
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../widgets/table/e-table-header-item.c:1580
+msgid "Descending"
+msgstr "Descendente"
+
 #: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Cabecera de la tabla"
@@ -22198,6 +19551,17 @@ msgstr "Buscar siempre"
 msgid "Use click to add"
 msgstr "Pulsar para aÃ±adir"
 
+#: ../widgets/table/e-table.c:3351
+#| msgid "Vertical Position"
+msgid "Vertical Row Spacing"
+msgstr "Espaciado vertical de fila"
+
+#: ../widgets/table/e-table.c:3352
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+"Espacio vertical entre filas. Si aÃ±ade en la parte superior e inferior de "
+"una fila."
+
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
@@ -22390,6 +19754,1974 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>Correo-e</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>Domicilio</b>"
+
+#~ msgid "<b>Instant Messaging</b>"
+#~ msgstr "<b>MensajerÃa instantÃ¡nea</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>Trabajo</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>MiscelÃ¡neo</b>"
+
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>Notas</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>Otro</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>TelÃ©fono</b>"
+
+#~ msgid "<b>Web Addresses</b>"
+#~ msgstr "<b>PÃ¡gina web</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>Trabajo</b>"
+
+#~ msgid "Ca_tegories..."
+#~ msgstr "Ca_tegorÃasâ?¦"
+
+#~ msgid "Full _Name..."
+#~ msgstr "_Nombre completoâ?¦"
+
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid "Mailing Address"
+#~ msgstr "DirecciÃ³n de correo"
+
+#~ msgid "Nic_kname:"
+#~ msgstr "Apo_do:"
+
+#~ msgid "Personal Information"
+#~ msgstr "InformaciÃ³n personal"
+
+#~ msgid "Telephone"
+#~ msgstr "TelÃ©fono"
+
+#~ msgid "_Address:"
+#~ msgstr "_DirecciÃ³n:"
+
+#~ msgid "_Anniversary:"
+#~ msgstr "_Aniversario:"
+
+#~ msgid "_Assistant:"
+#~ msgstr "_SecretarÃa:"
+
+#~ msgid "_Birthday:"
+#~ msgstr "_CumpleaÃ±os:"
+
+#~ msgid "_City:"
+#~ msgstr "_Ciudad:"
+
+#~ msgid "_Company:"
+#~ msgstr "_Empresa:"
+
+#~ msgid "_Country:"
+#~ msgstr "_PaÃs:"
+
+#~ msgid "_Department:"
+#~ msgstr "_Departamento:"
+
+#~ msgid "_File under:"
+#~ msgstr "A_rchivar como:"
+
+#~ msgid "_Free/Busy:"
+#~ msgstr "_Disponibilidad:"
+
+#~ msgid "_Home Page:"
+#~ msgstr "_PÃ¡gina personal:"
+
+#~ msgid "_Manager:"
+#~ msgstr "_Jefe:"
+
+#~ msgid "_Office:"
+#~ msgstr "_Oficina:"
+
+#~ msgid "_PO Box:"
+#~ msgstr "_Apdo. de correos:"
+
+#~ msgid "_Profession:"
+#~ msgstr "_ProfesiÃ³n:"
+
+#~ msgid "_Spouse:"
+#~ msgstr "_CÃ³nyuge:"
+
+#~ msgid "_State/Province:"
+#~ msgstr "E_stado/Provincia:"
+
+#~ msgid "_Title:"
+#~ msgstr "_Tratamiento:"
+
+#~ msgid "_Video Chat:"
+#~ msgstr "_Charla por vÃdeo:"
+
+#~ msgid "_Wants to receive HTML mail"
+#~ msgstr "_Quiere recibir el correo como HTML"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Diario web:"
+
+#~ msgid "_Where:"
+#~ msgstr "_DÃ³nde:"
+
+#~ msgid "_Zip/Postal Code:"
+#~ msgstr "_CÃ³digo postal:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srta.\n"
+#~ "Dr."
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr."
+
+#~ msgid "_First:"
+#~ msgstr "_Nombre:"
+
+#~ msgid "_Last:"
+#~ msgstr "_Apellidos:"
+
+#~ msgid "_Middle:"
+#~ msgstr "_2Âº Nombre:"
+
+#~ msgid "_Suffix:"
+#~ msgstr "_Sufijo:"
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>Miembros</b>"
+
+#~ msgid "_Hide addresses when sending mail to this list"
+#~ msgstr "_Ocultar direcciones al enviar correo-e a esta lista"
+
+#~ msgid "_List name:"
+#~ msgstr "_Nombre de la lista:"
+
+#~ msgid "_Select..."
+#~ msgstr "_Seleccionarâ?¦"
+
+#~ 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:"
+
+#~ msgid "Changed Contact:"
+#~ msgstr "Contacto modificado:"
+
+#~ msgid "Conflicting Contact:"
+#~ msgstr "Contacto en conflicto:"
+
+#~ msgid "Duplicate Contact Detected"
+#~ msgstr "Se ha detectado un contacto duplicado"
+
+#~ msgid ""
+#~ "The name or email of this contact already exists in this folder.  Would "
+#~ "you like to add it anyway?"
+#~ msgstr ""
+#~ "El nombre o la direcciÃ³n de correo-e de este contacto ya existe en esta "
+#~ "carpeta. Â¿Quiere aÃ±adirlo de todos modos?"
+
+#~ msgid "New Contact:"
+#~ msgstr "Contacto nuevo:"
+
+#~ msgid "Original Contact:"
+#~ msgstr "Contacto original:"
+
+#~ msgid ""
+#~ "The name or email address of this contact already exists\n"
+#~ "in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "El nombre o la direcciÃ³n de correo-e de este contacto ya existe\n"
+#~ "en esta carpeta.  Â¿Quiere aÃ±adirlo de todos modos?"
+
+#~ msgid "Appointments"
+#~ msgstr "Citas"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "Descartar _todo"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "_Posponer durante:"
+
+#~ msgid "_Dismiss"
+#~ msgstr "_Descartar"
+
+#~ msgid "_Snooze"
+#~ msgstr "_Posponer"
+
+#~ msgid "location of appointment"
+#~ msgstr "lugar de la cita"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>Alerta</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Opciones</b>"
+
+#~ msgid "<b>Repeat</b>"
+#~ msgstr "<b>RepeticiÃ³n</b>"
+
+#~ msgid "Add Alarm"
+#~ msgstr "AÃ±adir alerta"
+
+#~ msgid "Custom _message"
+#~ msgstr "_Mensaje personalizado"
+
+#~ msgid "Custom alarm sound"
+#~ msgstr "Sonido de alerta personalizado"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "_Mensaje:"
+
+#~ msgid "Select A File"
+#~ msgstr "Seleccione un archivo"
+
+#~ msgid "Send To:"
+#~ msgstr "Enviar a:"
+
+#~ msgid "_Arguments:"
+#~ msgstr "_Argumentos:"
+
+#~ msgid "_Program:"
+#~ msgstr "_Programa:"
+
+#~ msgid "_Repeat the alarm"
+#~ msgstr "_Repetir la alerta"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Sonido:"
+
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "antes\n"
+#~ "despuÃ©s"
+
+#~ msgid "extra times every"
+#~ msgstr "veces adicionales cada"
+
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "minuto(s)\n"
+#~ "hora(s)\n"
+#~ "dÃa(s)"
+
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "minutos\n"
+#~ "horas\n"
+#~ "dÃas"
+
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "comienzo de la cita\n"
+#~ "final de la cita"
+
+#~ msgid "A_dd"
+#~ msgstr "AÃ±a_dir"
+
+#~ msgid "Alarms"
+#~ msgstr "Alertas"
+
+#~ msgid "(Shown in a Day View)"
+#~ msgstr "(Mostrado en la Vista diaria)"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 minutos\n"
+#~ "30 minutos\n"
+#~ "15 minutos\n"
+#~ "10 minutos\n"
+#~ "5 minutos"
+
+#~ msgid ""
+#~ "<i>%u and %d will be replaced by user and domain from the email address.</"
+#~ "i>"
+#~ msgstr ""
+#~ "<i>%u y %d se reemplazarÃ¡n por el usuario y el dominio de la direcciÃ³n de "
+#~ "correo-e.</i>"
+
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">Alarmas</span>"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">Alertas</span>"
+
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">Formato de hora/fecha</span>"
+
+#~ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\">Servidor de disponibilidad predeterminado</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">General</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">Lista de tareas</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">Tiempo</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">Semana laboral</span>"
+
+#~ msgid "Day _ends:"
+#~ msgstr "La jornada _acaba a las:"
+
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#~ msgid "Display alarms in _notification area only"
+#~ msgstr "Mostrar alarmas sÃ³lo en el Ã¡rea de _notificaciÃ³n"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "minutos\n"
+#~ "horas\n"
+#~ "dÃas"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "lunes\n"
+#~ "martes\n"
+#~ "miÃ©rcoles\n"
+#~ "jueves\n"
+#~ "viernes\n"
+#~ "sÃ¡bado\n"
+#~ "domingo"
+
+#~ msgid "Pick a color"
+#~ msgstr "Elija un color"
+
+#~ msgid "S_un"
+#~ msgstr "_Dom"
+
+#~ msgid "Sc_roll Month View by a week"
+#~ msgstr "Desplazar la vista mens_ual una semana"
+
+#~ msgid "Se_cond zone:"
+#~ msgstr "Zona se_cundaria:"
+
+#~ msgid "Select the calendars for alarm notification"
+#~ msgstr "Seleccione los calendarios para las alertas de notificaciÃ³n"
+
+#~ msgid "Sh_ow a reminder"
+#~ msgstr "Mos_\ttrar un recordatorio"
+
+#~ msgid "Show a _reminder"
+#~ msgstr "Mostrar un _recordatorio"
+
+#~ msgid "Show week _numbers in date navigator"
+#~ msgstr "Mostrar los _nÃºmeros de las semanas en el navegador de fechas"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr ""
+#~ "Mostrar los nÃºme_ros de las semanas en la Vista diaria y en la Vista de "
+#~ "la semana laboral"
+
+#~ msgid "T_asks due today:"
+#~ msgstr "_Tareas que vencen hoy:"
+
+#~ msgid "T_hu"
+#~ msgstr "_Jue"
+
+#~ msgid "Template:"
+#~ msgstr "Plantilla:"
+
+#~ msgid "Time _zone:"
+#~ msgstr "_Zona horaria:"
+
+#~ msgid "Time format:"
+#~ msgstr "Formato de la hora:"
+
+#~ msgid "Use s_ystem time zone"
+#~ msgstr "Usar la zona horaria del s_istema"
+
+#~ msgid "Wee_k starts on:"
+#~ msgstr "La sema_na empieza en:"
+
+#~ msgid "Work days:"
+#~ msgstr "DÃas laborables:"
+
+#~ msgid "_12 hour (AM/PM)"
+#~ msgstr "_12 horas (AM/PM)"
+
+#~ msgid "_24 hour"
+#~ msgstr "_24 horas"
+
+#~ msgid "_Ask for confirmation when deleting items"
+#~ msgstr "Pedir con_firmaciÃ³n al borrar elementos"
+
+#~ msgid "_Compress weekends in month view"
+#~ msgstr "_Comprimir fines de semana en la vista mensual"
+
+#~ msgid "_Day begins:"
+#~ msgstr "La jornada laboral c_omienza a las:"
+
+#~ msgid "_Fri"
+#~ msgstr "Vi_e"
+
+#~ msgid "_Hide completed tasks after"
+#~ msgstr "_Ocultar tareas terminadas tras"
+
+#~ msgid "_Mon"
+#~ msgstr "_Lun"
+
+#~ msgid "_Overdue tasks:"
+#~ msgstr "Tareas fuera de pla_zo:"
+
+#~ msgid "_Sat"
+#~ msgstr "_SÃ¡b"
+
+#~ msgid "_Show appointment end times in week and month view"
+#~ msgstr ""
+#~ "_Mostrar la hora del final de las citas en las vistas semanales y "
+#~ "mensuales"
+
+#~ msgid "_Time divisions:"
+#~ msgstr "Divisiones de _hora:"
+
+#~ msgid "_Tue"
+#~ msgstr "_Mar"
+
+#~ msgid "_Wed"
+#~ msgstr "M_iÃ©"
+
+#~ msgid "before every anniversary/birthday"
+#~ msgstr "antes de cada aniversario/cumpleaÃ±os"
+
+#~ msgid "before every appointment"
+#~ msgstr "antes de cada cita"
+
+#~ msgid "Contacts..."
+#~ msgstr "Contactosâ?¦"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Delegar en:"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Introducir un delegado"
+
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "15 minutos antes de la cita\n"
+#~ "1 hora antes de la cita\n"
+#~ "1 dÃa antes de la cita"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "_Participantesâ?¦"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Alerta personalizada:"
+
+#~ msgid "Event Description"
+#~ msgstr "DescripciÃ³n del acontecimiento"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Resu_men:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alerta"
+
+#~ msgid "_Time:"
+#~ msgstr "_Hora:"
+
+#~ msgid ""
+#~ "a\n"
+#~ "b"
+#~ msgstr ""
+#~ "a\n"
+#~ "b"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until"
+#~ msgstr ""
+#~ "durante\n"
+#~ "hasta"
+
+#~ msgid "Sta_rt date:"
+#~ msgstr "Fecha de ini_cio:"
+
+#~ msgid "T_o:"
+#~ msgstr "_Para:"
+
+#~ msgid "<b>Exceptions</b>"
+#~ msgstr "<b>Excepciones</b>"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Vista previa</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>RepeticiÃ³n</b>"
+
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgid "This appointment rec_urs"
+#~ msgstr "Esta cita se _repite"
+
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "dÃa(s)\n"
+#~ "semana(s)\n"
+#~ "mes(es)\n"
+#~ "aÃ±o(s)"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "durante\n"
+#~ "hasta\n"
+#~ "siempre"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">Varios</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">Estado</span>"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "Alta\n"
+#~ "Normal\n"
+#~ "Baja\n"
+#~ "Sin definir"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "Sin iniciar\n"
+#~ "En progreso\n"
+#~ "Completada\n"
+#~ "Cancelada"
+
+#~ msgid "P_ercent complete:"
+#~ msgstr "_Porcentaje completado:"
+
+#~ msgid "Stat_us:"
+#~ msgstr "_Estado:"
+
+#~ msgid "_Date completed:"
+#~ msgstr "_Fecha de terminaciÃ³n:"
+
+#~ msgid "_Priority:"
+#~ msgstr "_Prioridad:"
+
+#~ msgid "_Web Page:"
+#~ msgstr "PÃ¡gina _web:"
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "_Participantesâ?¦"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "_CategorÃasâ?¦"
+
+#~ msgid "D_ue date:"
+#~ msgstr "Fecha de _vencimiento:"
+
+#~ msgid "Time zone:"
+#~ msgstr "Zona horaria:"
+
+#~ msgid "--to--"
+#~ msgstr "--a--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "Mensaje de calendario"
+
+#~ msgid "Date:"
+#~ msgstr "Fecha:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "Cargando calendario"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "Cargando calendarioâ?¦"
+
+#~ msgid "Organizer:"
+#~ msgstr "Organizador:"
+
+#~ msgid "Server Message:"
+#~ msgstr "Mensaje del servidor:"
+
+#~ msgid ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+#~ msgstr ""
+#~ "Enero\n"
+#~ "Febrero\n"
+#~ "Marzo\n"
+#~ "Abril\n"
+#~ "Mayo\n"
+#~ "Junio\n"
+#~ "Julio\n"
+#~ "Agosto\n"
+#~ "Septiembre\n"
+#~ "Octubre\n"
+#~ "Noviembre\n"
+#~ "Diciembre"
+
+#~ msgid "Select Date"
+#~ msgstr "Seleccionar fecha"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Seleccionar hoy"
+
+#~ msgid "Rule name"
+#~ msgstr "Nombre de la regla"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>Reglas de _filtrado</b>"
+
+#~ msgid "Compare against"
+#~ msgstr "Comparar con"
+
+#~ msgid "Show filters for mail:"
+#~ msgstr "Mostrar filtros para el correo:"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "12:00am of the date specified."
+#~ msgstr ""
+#~ "La fecha del mensaje se compararÃ¡ con las\n"
+#~ "12:00am de la fecha especificada aquÃ."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "a time relative to when filtering occurs."
+#~ msgstr ""
+#~ "La fecha del mensaje se compararÃ¡ con una\n"
+#~ "fecha relativa al momento del filtrado."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "the current time when filtering occurs."
+#~ msgstr ""
+#~ "La fecha del mensaje se compararÃ¡ con la\n"
+#~ "fecha actual del momento del filtrado."
+
+#~ msgid ""
+#~ "ago\n"
+#~ "in the future"
+#~ msgstr ""
+#~ "hace\n"
+#~ "en el futuro"
+
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "segundos\n"
+#~ "minutos\n"
+#~ "horas\n"
+#~ "dÃas\n"
+#~ "semanas\n"
+#~ "meses\n"
+#~ "aÃ±os"
+
+#~ msgid ""
+#~ "the current time\n"
+#~ "the time you specify\n"
+#~ "a time relative to the current time"
+#~ msgstr ""
+#~ "el momento actual\n"
+#~ "el hora que especifique\n"
+#~ "una fecha relativa al momento actual"
+
+#~ msgid "Search Folder source"
+#~ msgstr "Origen de la carpeta de bÃºsqueda"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Nota: Requiere reiniciar la aplicaciÃ³n)"
+
+#~ msgid "<b>SSL is not supported in this build of Evolution</b>"
+#~ msgstr "<b>SSL no estÃ¡ soportado en esta compilaciÃ³n de Evolution</b>"
+
+#~ msgid "<b>Sender Photograph</b>"
+#~ msgstr "<b>Foto del remitente</b>"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>_Firmas</b>"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>OpciÃ³n publicar por encima</b> (no se recomienda)"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>_Idiomas</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n de la cuenta</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">AutenticaciÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">RedacciÃ³n de mensajes</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ConfiguraciÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">Borrar correo</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">_Cabeceras de correo mostradas</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">Etiquetas</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">Carga de imÃ¡genes</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">PresentaciÃ³n del mensaje</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">TipografÃas del mensaje</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\">Notificaciones de recepciÃ³n de mensajes</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n opcional</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">Opciones</span>"
+
+#~ msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+#~ msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">TipografÃa para impresiÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">Ajustes del proxy</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n requerida</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">Seguridad</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ConfiguraciÃ³n del servidor</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">Tipo de _autenticaciÃ³n</span>"
+
+#~ msgid "Add Ne_w Signature..."
+#~ msgstr "AÃ±adir firma _nuevaâ?¦"
+
+#~ msgid "Al_ways sign outgoing messages when using this account"
+#~ msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
+
+#~ msgid "Also encrypt to sel_f when sending encrypted messages"
+#~ msgstr "TambiÃ©n cifrar a _mÃ mismo cuando envÃe correo cifrado"
+
+#~ msgid "Alway_s carbon-copy (cc) to:"
+#~ msgstr "Siempre enviar _copia de carbÃ³n (Cc) a:"
+
+#~ msgid "Always _blind carbon-copy (bcc) to:"
+#~ msgstr "Siempre enviar copia de carbÃ³n _oculta (Cco) a:"
+
+#~ msgid "Always _trust keys in my keyring when encrypting"
+#~ msgstr "Siempre _confiar en las claves de mi almacÃ©n al cifrar"
+
+#~ msgid "Always encrypt to _myself when sending encrypted messages"
+#~ msgstr "Siempre cifrar a _mÃ mismo cuando envÃe correo cifrado"
+
+#~ msgid "Always request rea_d receipt"
+#~ msgstr "Siempre _solicitar confirmaciÃ³n de lectura"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "Adjunto\n"
+#~ "En lÃnea\n"
+#~ "Citado"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "Adjunto\n"
+#~ "En lÃnea (estilo Outlook)\n"
+#~ "Citado\n"
+#~ "No citar"
+
+#~ msgid "Automatically insert _emoticon images"
+#~ msgstr "Insertar imÃ¡genes de _emoticonos automÃ¡ticamente"
+
+#~ msgid "C_haracter set:"
+#~ msgstr "Conjunto de carac_teres:"
+
+#~ msgid "Ch_eck for Supported Types"
+#~ msgstr "_Comprobar tipos soportados"
+
+#~ msgid "Check cu_stom headers for junk"
+#~ msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
+
+#~ msgid "Check incoming _messages for junk"
+#~ msgstr "Comprobar si los _mensajes entrantes son basura"
+
+#~ msgid "Check spelling while I _type"
+#~ msgstr "Comprobar orto_grafÃa mientras se escribe"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Comprueba si los mensajes de correo entrantes son SPAM"
+
+#~ msgid "Cle_ar"
+#~ msgstr "_Vaciar"
+
+#~ msgid "Clea_r"
+#~ msgstr "Vacia_r"
+
+#~ msgid "Color for _misspelled words:"
+#~ msgstr "Color para las palabras _mal escritas:"
+
+#~ msgid "Confirm _when expunging a folder"
+#~ msgstr "_Confirmar antes de compactar una carpeta"
+
+#~ msgid "Default character e_ncoding:"
+#~ msgstr "_CodificaciÃ³n de caracteres predeterminada:"
+
+#~ msgid "Delete junk messages on e_xit"
+#~ msgstr "Borrar los mensajes SPAM al _salir"
+
+#~ msgid "Digitally sign o_utgoing messages (by default)"
+#~ msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃ³n)"
+
+#~ msgid "Do not format messages when text si_ze exceeds"
+#~ msgstr "No formatear mensajes si el ta_maÃ±o del texto excede"
+
+#~ 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"
+
+#~ msgid "Drafts _Folder:"
+#~ msgstr "Carpeta de _borradores:"
+
+#~ msgid "Email _Address:"
+#~ msgstr "Dir_ecciÃ³n de correo-e:"
+
+#~ msgid "Empty trash folders on e_xit"
+#~ msgstr "Vaciar _papelera al salir"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Activar la barra e_spaciadora mÃ¡gica"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Activar las Carpetas de _bÃºsqueda"
+
+#~ msgid "Encry_ption certificate:"
+#~ msgstr "Certificado de ci_frado:"
+
+#~ msgid "Encrypt out_going messages (by default)"
+#~ msgstr "Cifrar mensajes _salientes (por omisiÃ³n)"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Anchura _fija:"
+
+#~ msgid "Fix_ed width Font:"
+#~ msgstr "TipografÃa de anchura _fija:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Propiedades de tipografÃas"
+
+#~ msgid "Format messages in _HTML"
+#~ msgstr "Dar formato _HTML a los mensajes"
+
+#~ msgid "Full Nam_e:"
+#~ msgstr "Nombre _completo:"
+
+#~ msgid "HTML Messages"
+#~ msgstr "Mensajes HTML"
+
+#~ msgid "H_TTP Proxy:"
+#~ msgstr "Proxy H_TTP:"
+
+#~ msgid "Headers"
+#~ msgstr "Cabeceras"
+
+# Esta cadena debe permanecer asÃ
+#~ msgid "Highlight _quotations with"
+#~ msgstr "Resaltar texto _citado con este color:"
+
+#~ msgid "KB"
+#~ msgstr "Kib"
+
+#~ msgid "Languages Table"
+#~ msgstr "Tabla de idiomas"
+
+#~ msgid "Mail Headers Table"
+#~ msgstr "Tabla de cabeceras de correo"
+
+#~ msgid "Mailbox location"
+#~ msgstr "DirecciÃ³n del buzÃ³n"
+
+#~ msgid "Message Composer"
+#~ msgstr "Editor de mensajes"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "Sin _proxy para:"
+
+#~ 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"
+
+#~ 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."
+
+#~ msgid "Or_ganization:"
+#~ msgstr "Organi_zaciÃ³n:"
+
+#~ msgid "PGP/GPG _Key ID:"
+#~ msgstr "ID de c_lave GPG/PGP:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_ContraseÃ±a:"
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#~ msgstr "Preguntar al enviar mensajes que tan sÃ³lo tengan definido el _Cco"
+
+#~ msgid "Re_member password"
+#~ msgstr "_Recordar contraseÃ±a"
+
+#~ msgid "Re_ply-To:"
+#~ msgstr "Res_ponder a:"
+
+#~ msgid "Remember _password"
+#~ msgstr "Recordar _contraseÃ±a"
+
+#~ 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"
+
+#~ msgid "S_elect..."
+#~ msgstr "S_eleccionarâ?¦"
+
+#~ msgid "S_end message receipts:"
+#~ msgstr "_Enviar confirmaciones de mensajes:"
+
+#~ msgid "S_tandard Font:"
+#~ msgstr "TipografÃa _estÃ¡ndar:"
+
+#~ msgid "Select HTML fixed width font"
+#~ msgstr "Selecciona letra de anchura fija para HTML"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Selecciona letra de anchura fija en HTML para imprimir"
+
+#~ msgid "Select HTML variable width font"
+#~ msgstr "Selecciona letra de anchura variable en HTML"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "Selecciona letra de anchura variable en HTML para imprimir"
+
+#~ msgid "Sending Mail"
+#~ msgstr "EnvÃo de correo"
+
+#~ msgid "Sent _Messages Folder:"
+#~ msgstr "Carpeta de _mensajes enviados:"
+
+#~ msgid "Ser_ver requires authentication"
+#~ msgstr "El ser_vidor requiere autenticaciÃ³n"
+
+#~ msgid "Server _Type:"
+#~ msgstr "_Tipo de servidor:"
+
+#~ msgid "Sig_ning certificate:"
+#~ msgstr "Certificado de _firma:"
+
+#~ msgid "Signat_ure:"
+#~ msgstr "_Firma:"
+
+#~ msgid "Signatures"
+#~ msgstr "Firmas"
+
+#~ msgid "Spell Checking"
+#~ msgstr "OrtografÃa"
+
+#~ msgid "Start _typing at the bottom on replying"
+#~ msgstr "Comenzar a _escribir en la parte final al responder"
+
+#~ msgid "T_ype:"
+#~ msgstr "T_ipo:"
+
+#~ msgid ""
+#~ "The list of languages here reflects only the languages for which you have "
+#~ "a dictionary installed."
+#~ msgstr ""
+#~ "La lista de idiomas de aquÃ refleja Ãºnicamente los idiomas para los "
+#~ "cuÃ¡les hay instalado un diccionario."
+
+#~ 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. \n"
+#~ "El nombre que especifique se usarÃ¡ Ãºnicamente \n"
+#~ "para mostrarlo por pantalla. "
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to this account.\n"
+#~ "For example: \"Work\" or \"Personal\""
+#~ msgstr ""
+#~ "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
+#~ "Por ejemplo: Â«TrabajoÂ» o Â«PersonalÂ»"
+
+#~ msgid "Us_ername:"
+#~ msgstr "_Usuario:"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "Usar aute_nticaciÃ³n"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "An_chura variable:"
+
+#~ msgid "_Add Signature"
+#~ msgstr "_AÃ±adir firma"
+
+#~ msgid "_Always load images from the Internet"
+#~ msgstr "_Siempre cargar las imÃ¡genes desde Internet"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Complemento SPAM pre_determinado:"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "ConexiÃ³n _directa a Internet"
+
+#~ msgid "_Do not sign meeting requests (for Outlook compatibility)"
+#~ msgstr ""
+#~ "No _firmar las solicitudes de reuniÃ³n (para compatibilidad con Outlook)"
+
+#~ msgid "_Forward style:"
+#~ msgstr "_Estilo de reenvÃo:"
+
+#~ msgid "_Keep Signature above the original message on replying"
+#~ msgstr "_Mantener la firma por encima del mensaje original al responder"
+
+#~ msgid "_Load images in messages from contacts"
+#~ msgstr "_Cargar imÃ¡genes en los mensajes de mis contactos"
+
+#~ msgid "_Lookup in local address book only"
+#~ msgstr "_Buscar sÃ³lo en la libreta de direcciones local"
+
+#~ msgid "_Make this my default account"
+#~ msgstr "_Hacer que Ã©sta sea mi cuenta predeterminada"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "ConfiguraciÃ³n _manual del proxy:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Marcar mensajes como leÃdos tras"
+
+#~ msgid "_Never load images from the Internet"
+#~ msgstr "_Nunca cargar imÃ¡genes desde Internet"
+
+#~ msgid "_Path:"
+#~ msgstr "R_uta:"
+
+#~ 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"
+
+#~ msgid "_Prompt when sending messages with an empty subject line"
+#~ msgstr "Pr_eguntar al enviar mensajes con el asunto vacÃo"
+
+#~ msgid "_Reply style:"
+#~ msgstr "Estilo de _respuesta:"
+
+#~ msgid "_Script:"
+#~ msgstr "_Script:"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "Proxy HTTP _seguro:"
+
+#~ msgid "_Server:"
+#~ msgstr "_Servidor:"
+
+#~ msgid "_Show image animations"
+#~ msgstr "_Mostrar animaciones"
+
+#~ msgid "_Show the photograph of sender in the message preview"
+#~ msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "_Reducir las cabeceras Para / Cc / Cco a "
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_Usar conexiÃ³n segura:"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "_Usar los valores predeterminados del sistema"
+
+#~ msgid "_Use the same fonts as other applications"
+#~ msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
+
+#~ msgid "addresses"
+#~ msgstr "direcciones"
+
+# Esta traducciÃ³n debe mantenerse asÃ
+#~ msgid "color"
+#~ msgstr "color"
+
+#~ msgid "description"
+#~ msgstr "descripciÃ³n"
+
+#~ msgid "seconds"
+#~ msgstr "segundos"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>OrÃgenes de la carpeta de bÃºsqueda</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">Firma digital</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">Cifrado</span>"
+
+#~ msgid "All active remote folders"
+#~ msgstr "Todas las carpetas remotas activas"
+
+#~ msgid "All local and active remote folders"
+#~ msgstr "Todas las carpetas locales y remotas activas"
+
+#~ msgid "All local folders"
+#~ msgstr "Todas las carpetas locales"
+
+#~ msgid "Co_mpleted"
+#~ msgstr "_Terminado"
+
+#~ msgid "Folder Subscriptions"
+#~ msgstr "Suscripciones de carpetas"
+
+#~ msgid "License Agreement"
+#~ msgstr "Acuerdo de licencia"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgid "Security Information"
+#~ msgstr "InformaciÃ³n de seguridad"
+
+#~ msgid "Specific folders"
+#~ msgstr "Carpetas especÃficas"
+
+#~ msgid ""
+#~ "The messages you have selected for follow up are listed below.\n"
+#~ "Please select a follow up action from the \"Flag\" menu."
+#~ msgstr ""
+#~ "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
+#~ "Por favor, seleccione una acciÃ³n de seguimiento desde el menÃº Â«MarcarÂ»."
+
+#~ msgid "_Accept License"
+#~ msgstr "_Aceptar licencia"
+
+#~ msgid "_Due By:"
+#~ msgstr "_Vence el:"
+
+#~ msgid "_Flag:"
+#~ msgstr "_Marca:"
+
+#~ msgid "_Tick this to accept the license agreement"
+#~ msgstr "_Marque esto para aceptar el acuerdo de licencia"
+
+#~ msgid "Call"
+#~ msgstr "Llamar"
+
+#~ msgid "Do Not Forward"
+#~ msgstr "No reenviar"
+
+#~ msgid "Follow-Up"
+#~ msgstr "Seguimiento"
+
+#~ msgid "For Your Information"
+#~ msgstr "Para su informaciÃ³n"
+
+#~ msgid "Forward"
+#~ msgstr "Reenviar"
+
+#~ msgid "No Response Necessary"
+#~ msgstr "No es necesaria una respuesta"
+
+#~ msgid "Reply to All"
+#~ msgstr "Responder a todos"
+
+#~ msgid "Review"
+#~ msgstr "Revisar"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+#~ msgstr ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>AutenticaciÃ³n</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>Descarga</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>BÃºsqueda</b>"
+
+#~ 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)"
+
+#~ msgid "B_rowse this book until limit reached"
+#~ msgstr "_Examinar esta libreta hasta llegar al final"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr ""
+#~ "Evolution usarÃ¡ esta direcciÃ³n de correo-e para autenticarle con el "
+#~ "servidor."
+
+#~ msgid "Lo_gin:"
+#~ msgstr "_Inicio de sesiÃ³n:"
+
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "Uno\n"
+#~ "Sub"
+
+#~ msgid ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+#~ msgstr ""
+#~ "Cifrado SSL\n"
+#~ "Cifrado TLS\n"
+#~ "Sin cifrado"
+
+#~ msgid "Search Filter"
+#~ msgstr "Filtro de bÃºsqueda"
+
+#~ msgid "Search _base:"
+#~ msgstr "_Base de bÃºsqueda:"
+
+#~ msgid "Search _filter:"
+#~ msgstr "_Filtro de bÃºsqueda:"
+
+#~ 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Â»."
+
+#~ msgid "Supported Search Bases"
+#~ msgstr "Bases de bÃºsqueda soportadas"
+
+#~ 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."
+
+#~ 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Â»."
+
+#~ 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."
+
+#~ 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. "
+
+#~ msgid "_Download limit:"
+#~ msgstr "LÃmite de _descarga:"
+
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "_Buscar bases de bÃºsqueda posibles"
+
+#~ msgid "_Login method:"
+#~ msgstr "MÃ©todo de _inicio de sesiÃ³n:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Puerto:"
+
+#~ msgid "_Search scope:"
+#~ msgstr "Ã?_mbito de bÃºsqueda:"
+
+#~ msgid "_Timeout:"
+#~ msgstr "_Tiempo de expiraciÃ³n:"
+
+#~ msgid "_Use secure connection:"
+#~ msgstr "Usar _conexiÃ³n segura:"
+
+#~ msgid "cards"
+#~ msgstr "tarjetas"
+
+#~| msgid "Table column:"
+#~ msgid "_Table column:"
+#~ msgstr "Columna de _tabla:"
+
+#~ msgid "Email Custom Header"
+#~ msgstr "Cabeceras personalizadas del correo-e"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>Lista de SPAM:</b>"
+
+#~ msgid "Email:"
+#~ msgstr "Correo-e:"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activar"
+
+#~ msgid "_Junk List"
+#~ msgstr "Lista de _SPAM"
+
+#~ msgid "_Remove"
+#~ msgstr "_Quitar"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Usuarios:</b>"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "_Personalizar el mensaje de notificaciÃ³n"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tactosâ?¦"
+
+#~ msgid "Shared Folder Notification"
+#~ msgstr "NotificaciÃ³n de carpeta compartida"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Los participantes recibirÃ¡n la notificaciÃ³n siguiente.\n"
+
+#~ msgid "_Not Shared"
+#~ msgstr "_Sin compartir"
+
+#~ msgid "_Shared With..."
+#~ msgstr "_Compartir conâ?¦"
+
+#~ msgid "_Sharing"
+#~ msgstr "_Compartir"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>Nombre</b>"
+
+#~ msgid "Access Rights"
+#~ msgstr "Derechos de acceso"
+
+#~ msgid "Add/Edit"
+#~ msgstr "AÃ±adir/Editar"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Con_tactos"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Modificar _carpetas/opciones/reglas/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Leer elementos marcados como _privados"
+
+#~ msgid "Reminder Notes"
+#~ msgstr "Notas de recuerdo"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Suscribirse a _mis alertas"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Suscribirse a _mis notificaciones"
+
+#~ msgid "_Write"
+#~ msgstr "_Escribir"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lectura"
+
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Nombre de la cuenta</b>"
+
+#~ msgid "Proxy Login"
+#~ msgstr "SesiÃ³n proxy"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>Cabeceras personalizadas</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>Cabeceras IMAP</b>"
+
+#~ msgid "Basic and _Mailing List Headers (Default)"
+#~ msgstr "Cabeceras bÃ¡sicas y de _listas de correo predeterminadas"
+
+#~ msgid ""
+#~ "Give the extra headers that you need to fetch in addition to the above "
+#~ "standard headers. \n"
+#~ "You can ignore this if you choose \"All Headers\"."
+#~ msgstr ""
+#~ "Proporcione las cabeceras extra que necesite obtener ademÃ¡s de las "
+#~ "cabeceras estÃ¡ndar anteriores.\n"
+#~ "Puede ignorar esto si elige Â«Todas las cabecerasÂ»"
+
+#~ msgid ""
+#~ "Select your IMAP Header Preferences. \n"
+#~ "The more headers you have the more time it will take to download."
+#~ msgstr ""
+#~ "Seleccione sus preferencias para las cabeceras IMAP. \n"
+#~ "Cuantas mÃ¡s cabeceras tenga mÃ¡s tiempo se tardarÃ¡ en descargar."
+
+#~ msgid ""
+#~ "_Basic Headers - (Fastest) \n"
+#~ "Use this if you do not have filters based on mailing lists"
+#~ msgstr ""
+#~ "Cabeceras _bÃ¡sicas - (RÃ¡pido) \n"
+#~ "Use esto si no tiene filtros basados en listas de correo"
+
+#~ msgid "_Fetch All Headers"
+#~ msgstr "Obtener _todas las cabeceras"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">Lugar</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">Fuentes</span>"
+
+#~ msgid ""
+#~ "Daily\n"
+#~ "Weekly\n"
+#~ "Manual (via Actions menu)"
+#~ msgstr ""
+#~ "Diariamente\n"
+#~ "Semanalmente\n"
+#~ "Manual (por medio del menÃº Acciones)"
+
+#~ msgid "P_ort:"
+#~ msgstr "_Puerto:"
+
+#~ msgid "Publishing Location"
+#~ msgstr "Lugar de publicaciÃ³n"
+
+#~ msgid "Publishing _Frequency:"
+#~ msgstr "_Frecuencia de publicaciÃ³n:"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "FTP seguro (SSH)\n"
+#~ "FTP pÃºblico\n"
+#~ "FTP (con autorizaciÃ³n)\n"
+#~ "ComparticiÃ³n Windows\n"
+#~ "WebDAV (HTTP)\n"
+#~ "WebDAV seguro (HTTPS)\n"
+#~ "Lugar personalizado"
+
+#~ msgid "Service _type:"
+#~ msgstr "_Tipo de servicio:"
+
+#~ msgid "Time _duration:"
+#~ msgstr "_DuraciÃ³n:"
+
+#~ msgid "_File:"
+#~ msgstr "_Archivo:"
+
+#~ msgid "_Password:"
+#~ msgstr "_ContraseÃ±a:"
+
+#~ msgid "_Publish as:"
+#~ msgstr "_Publicar como:"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Recordar contraseÃ±a"
+
+#~ msgid "_Username:"
+#~ msgstr "_Usuario:"
+
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+#~ msgstr ""
+#~ "dÃas\n"
+#~ "semanas\n"
+#~ "meses"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "Disponibilidad\n"
+#~ "iCal"
+
+#~ msgid "<Not Part of Certificate>"
+#~ msgstr "<No es parte del certificado>"
+
+#~ msgid "<b>Certificate Fields</b>"
+#~ msgstr "<b>Campos del certificado</b>"
+
+#~ msgid "<b>Certificate Hierarchy</b>"
+#~ msgstr "<b>JerarquÃa del certificado</b>"
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>Valor del campo</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>Huellas</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>Emitido por</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>Emitido a</b>"
+
+#~ msgid "<b>This certificate has been verified for the following uses:</b>"
+#~ msgstr ""
+#~ "<b>Este certificado ha sido verificado para los siguientes usos:</b>"
+
+#~ msgid "<b>Validity</b>"
+#~ msgstr "<b>Validez</b>"
+
+#~ msgid "Authorities"
+#~ msgstr "Autoridades"
+
+#~ msgid "Backup"
+#~ msgstr "Respaldo"
+
+#~ msgid "Backup All"
+#~ msgstr "Respaldar todo"
+
+#~ msgid ""
+#~ "Before trusting this CA for any purpose, you should examine its "
+#~ "certificate and its policy and procedures (if available)."
+#~ msgstr ""
+#~ "Antes de confiar en esta AC para cualquier propÃ³sito, deberÃa examinar su "
+#~ "certificado y su directiva y procedimientos (si estÃ¡n disponibles)."
+
+#~ msgid "Certificate Authority Trust"
+#~ msgstr "Confianza en la autoridad certificadora"
+
+#~ msgid "Certificate details"
+#~ msgstr "Detalles del certificado"
+
+#~ msgid "Certificates Table"
+#~ msgstr "Tabla de certificados"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Nombre comÃºn (CN)"
+
+#~ msgid "Contact Certificates"
+#~ msgstr "Certificados de contactos"
+
+#~ msgid "Do not trust the authenticity of this certificate"
+#~ msgstr "No confiar en la autenticidad de este certificado"
+
+#~ msgid "Dummy window only"
+#~ msgstr "Ventana muda Ãºnicamente"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Email Certificate Trust Settings"
+#~ msgstr "Ajustes de confianza de certificados de correo-e"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "Certificado del destinatario del correo-e"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "Certificado del firmante del correo-e"
+
+#~ msgid "Expires On"
+#~ msgstr "Caduca el"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "Issued On"
+#~ msgstr "Emitido el"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "Huella MD5"
+
+#~ msgid "Organization (O)"
+#~ msgstr "OrganizaciÃ³n (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Unidad organizativa (OU)"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "Huella SHA1"
+
+#~ msgid "Trust the authenticity of this certificate"
+#~ msgstr "Confiar en la autenticidad de este certificado"
+
+#~ msgid "Trust this CA to identify email users."
+#~ msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
+
+#~ msgid "Trust this CA to identify software developers."
+#~ msgstr "Confiar en esta AC para identificar a desarrolladores de software."
+
+#~ msgid "Trust this CA to identify web sites."
+#~ msgstr "Confiar en esta AC para identificar sitios web."
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "You have certificates from these organizations that identify you:"
+#~ msgstr "Tiene certificados de estas organizaciones que le identifican:"
+
+#~ msgid ""
+#~ "You have certificates on file that identify these certificate authorities:"
+#~ msgstr ""
+#~ "Tiene archivados los certificados que identifican a estas autoridades de "
+#~ "certificaciÃ³n:"
+
+#~ msgid "You have certificates on file that identify these people:"
+#~ msgstr "Tiene archivados los certificados que identifican a estas personas:"
+
+#~ msgid "Your Certificates"
+#~ msgstr "Sus certificados"
+
+#~ msgid "_Edit CA Trust"
+#~ msgstr "_Editar confianza en la AC"
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>Zonas horarias</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>_SelecciÃ³n</b>"
+
+#~ msgid "Select a Time Zone"
+#~ msgstr "Seleccione una zona horaria"
+
+#~ msgid "Timezone drop-down combination box"
+#~ msgstr "Cada de combinaciÃ³n desplegable de la zona horaria"
+
+#~ msgid ""
+#~ "Use the left mouse button to zoom in on an area of the map and select a "
+#~ "time zone.\n"
+#~ "Use the right mouse button to zoom out."
+#~ msgstr ""
+#~ "Use el botÃ³n izquierdo del ratÃ³n para ampliar un Ã¡rea del mapa y "
+#~ "seleccionar una zona horaria.\n"
+#~ "Use el botÃ³n derecho del ratÃ³n para reducir el mapa al tamaÃ±o anterior."
+
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "Definir vistas para Â«%sÂ»"
+
+#~ msgid "_Create new view"
+#~ msgstr "_Crear vista nueva"
+
+#~ msgid "_Replace existing view"
+#~ msgstr "_Reemplazar vista existente"
+
+#~ msgid "Name of new view:"
+#~ msgstr "Nombre de la vista nueva:"
+
+#~ msgid "Type of View"
+#~ msgstr "Tipo de vista"
+
+#~ msgid "Type of view:"
+#~ msgstr "Tipo de vista:"
+
+#~ msgid "<b>Delivery Options</b>"
+#~ msgstr "<b>Opciones de entrega</b>"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>Respuestas</b>"
+
+#~ msgid "<b>Return Notification</b>"
+#~ msgstr "<b>Devolver notificaciÃ³n</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>Seguimiento de estado</b>"
+
+#~ msgid "A_uto-delete sent item"
+#~ msgstr "_Autoborrar el elemento enviado"
+
+#~ msgid "Creat_e a sent item to track information"
+#~ msgstr "_Crear un elemento enviado para seguimiento de la informaciÃ³n"
+
+#~ msgid "Deli_vered and opened"
+#~ msgstr "_Entregado y abierto"
+
+#~ msgid "Gene_ral Options"
+#~ msgstr "Opciones gene_rales"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt"
+#~ msgstr ""
+#~ "Ninguno\n"
+#~ "Recibos de correo"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Propietario\n"
+#~ "Confidencial\n"
+#~ "Secreto\n"
+#~ "Alto secreto\n"
+#~ "SÃ³lo para tus ojos"
+
+#~ msgid "R_eply requested"
+#~ msgstr "_Respuesta solicitada"
+
+#~ msgid "Sta_tus Tracking"
+#~ msgstr "Seguimiento de es_tado"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Indefinido\n"
+#~ "Alto\n"
+#~ "EstÃ¡ndar\n"
+#~ "Bajo"
+
+#~ msgid "When acce_pted:"
+#~ msgstr "Al ace_ptar:"
+
+#~ msgid "When co_mpleted:"
+#~ msgstr "Al _terminar:"
+
+#~ msgid "When decli_ned:"
+#~ msgstr "Al _rehusar:"
+
+#~ msgid "Wi_thin"
+#~ msgstr "_Dentro"
+
+#~ msgid "_After:"
+#~ msgstr "_DespuÃ©s de:"
+
+#~ msgid "_All information"
+#~ msgstr "_Toda la informaciÃ³n"
+
+#~ msgid "_Classification:"
+#~ msgstr "_ClasificaciÃ³n:"
+
+#~ msgid "_Delay message delivery"
+#~ msgstr "_Retrasar la entrega del mensaje"
+
+#~ msgid "_Delivered"
+#~ msgstr "_Entregado"
+
+#~ msgid "_Set expiration date"
+#~ msgstr "_Establecer fecha de caducidad"
+
+#~ msgid "_Until:"
+#~ msgstr "_Hasta:"
+
+#~ msgid "_When convenient"
+#~ msgstr "_Cuando convenga"
+
+#~ msgid "_When opened:"
+#~ msgstr "_Al abrir:"
+
+#~ msgid "A_vailable Fields:"
+#~ msgstr "Campos _disponibles:"
+
+#~ msgid "Clear All"
+#~ msgstr "Quitar todo"
+
+#~ msgid "Clear _All"
+#~ msgstr "Quitar _todo"
+
+#~ msgid "Group Items By"
+#~ msgstr "Agrupar elementos por"
+
+#~ msgid "Move _Down"
+#~ msgstr "_Bajar"
+
+#~ msgid "Move _Up"
+#~ msgstr "_Subir"
+
+#~ msgid "Show _field in View"
+#~ msgstr "Mostrar ca_mpo en la vista"
+
+#~ msgid "Show field i_n View"
+#~ msgstr "Mostrar campo e_n la vista"
+
+#~ msgid "Show field in _View"
+#~ msgstr "Mostrar campo en la _vista"
+
+#~ msgid "Sort"
+#~ msgstr "Ordenar"
+
+#~ msgid "Sort Items By"
+#~ msgstr "Ordenar elementos por"
+
+#~ msgid "Then By"
+#~ msgstr "Luego por"
+
+#~ msgid "_Fields Shown..."
+#~ msgstr "_Campos mostradosâ?¦"
+
+#~ msgid "_Group By..."
+#~ msgstr "_Agrupar porâ?¦"
+
+#~ msgid "_Show field in View"
+#~ msgstr "_Mostrar campo en la vista"
+
+#~ msgid "_Show these fields in order:"
+#~ msgstr "_Mostrar estos campos en orden:"
+
+#~ msgid "_Sort..."
+#~ msgstr "_Ordenarâ?¦"
+
+#~ msgid "Field Chooser"
+#~ msgstr "Selector de campos"
+
 #~ msgid ""
 #~ "%s already exists\n"
 #~ "Do you want to overwrite it?"
@@ -22669,9 +22001,6 @@ msgstr "Tirador emergente"
 #~ msgid "Loading memos at %s"
 #~ msgstr "Cargando notas en %s"
 
-#~ msgid "Purging"
-#~ msgstr "Compactando"
-
 #~ msgid "Failed upgrading memos."
 #~ msgstr "Fallo al actualizar las notas."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]