Updated Spanish translation

svn path=/trunk/; revision=5990

1 files changed, 548 insertions, 520 deletions

diff --git a/po/es.po b/po/es.po
index daa606e0d0..f1e6f7151d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.5.0\n"
-"POT-Creation-Date: 2000-10-07 19:57+0200\n"
+"POT-Creation-Date: 2000-10-16 13:39+0200\n"
 "PO-Revision-Date: 2000-09-26 16:58-04:00\n"
 "Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -20,8 +20,8 @@ msgstr ""
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1215
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1173 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1156
+#: calendar/conduits/todo/todo-conduit.c:1077 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
@@ -30,43 +30,43 @@ msgstr "No se puede inicializar Bonobo"
 #. Custom type implies Disabled state.
 #.
 #: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:70
 #: calendar/conduits/todo/todo-conduit-control-applet.c:70
 msgid "Disabled"
 msgstr "Deshabilitado"
 
 #: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:71
 #: calendar/conduits/todo/todo-conduit-control-applet.c:71
 msgid "Synchronize"
 msgstr "Sincronizar"
 
 #: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:72
 #: calendar/conduits/todo/todo-conduit-control-applet.c:72
 msgid "Copy From Pilot"
 msgstr "Copiar desde Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:73
 #: calendar/conduits/todo/todo-conduit-control-applet.c:73
 msgid "Copy To Pilot"
 msgstr "Copiar al Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:74
 #: calendar/conduits/todo/todo-conduit-control-applet.c:74
 msgid "Merge From Pilot"
 msgstr "Mezclar desde Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:75
 #: calendar/conduits/todo/todo-conduit-control-applet.c:75
 msgid "Merge To Pilot"
 msgstr "Mezclar al Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:116
 #: calendar/conduits/todo/todo-conduit-control-applet.c:116
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
@@ -76,7 +76,6 @@ msgid "Gpilotd address conduit"
 msgstr "Enlace con las direcciones de gpilotd"
 
 #: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
 msgid "(C) 1998 the Free Software Foundation"
 msgstr "(C) 1998 la Free Software Foundation"
 
@@ -85,27 +84,27 @@ msgid "Configuration utility for the address conduit.\n"
 msgstr "Utilidad de configuración para el enlace de direcciones.\n"
 
 #: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:124
 #: calendar/conduits/todo/todo-conduit-control-applet.c:124
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
 #: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:155
 #: calendar/conduits/todo/todo-conduit-control-applet.c:155
 msgid "Synchronize Action"
 msgstr "Acción de sincronización"
 
 #: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:214
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Estado del enlace"
 
 #: addressbook/conduit/address-conduit-control-applet.c:315
 #: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:266
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:279
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
 #: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
@@ -116,13 +115,13 @@ msgstr ""
 "el capplet 'Propiedades del enlace con Pilot'."
 
 #: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:285
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "No hay conexión con el demonio gnome-pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:290
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
@@ -139,7 +138,7 @@ msgstr "BLARG\n"
 #: addressbook/conduit/address-conduit.c:471
 #, c-format
 msgid "Address holds %ld address entries"
-msgstr "La direccion contiene %ld entradas de direcciones"
+msgstr "La dirección contiene %ld entradas de direcciones"
 
 #: addressbook/conduit/address-conduit.c:497
 #: addressbook/conduit/address-conduit.c:499
@@ -162,106 +161,106 @@ msgstr "Error mientras me comunicaba con el servidor de direcciones"
 #.
 #: addressbook/contact-editor/categories-strings.h:7
 msgid "categories"
-msgstr "categorias"
+msgstr "categorías"
 
 #: addressbook/contact-editor/categories-strings.h:8
 msgid "Item(s) belong to these categories:"
-msgstr "Elemento(s) pertenecientes a esas categorias:"
+msgstr "Elemento(s) pertenecientes a esas categorías:"
 
 #: addressbook/contact-editor/categories-strings.h:9
 msgid "Available Categories:"
 msgstr "Categorías disponibles:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1216
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
+#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1321
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1219
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1220
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Company"
-msgstr "Compañia"
+msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
+#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1322
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1225
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1227
 msgid "Mobile"
-msgstr "Movil"
+msgstr "Móvil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
+#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1323
 #: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1229
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1230
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1231
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1232
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1234
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -345,7 +344,7 @@ msgstr "_Fax del trabajo"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
-msgstr "_Movil"
+msgstr "_Móvil"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
@@ -353,7 +352,7 @@ msgstr "T_rabajo"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
-msgstr "Es_ta es la direción de correo"
+msgstr "Es_tá es la dirección de correo"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
@@ -362,7 +361,7 @@ msgstr "C_ontactos..."
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "Ca_tegories..."
-msgstr "Ca_tegorias..."
+msgstr "Ca_tegorías..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
@@ -370,7 +369,7 @@ msgstr "_Puesto:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
-msgstr "_Compañia:"
+msgstr "_Compañía:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:29
 msgid "_Address..."
@@ -399,7 +398,7 @@ msgstr "Nick:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:35
 msgid "_Spouse:"
-msgstr "_Conyuge:"
+msgstr "_Cónyuge:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:36
 msgid "_Birthday:"
@@ -466,12 +465,12 @@ msgid ""
 "Finland\n"
 msgstr ""
 "USA\n"
-"Canada\n"
+"Canadá\n"
 "Finlandia\n"
 
 #: addressbook/contact-editor/fulladdr.glade.h:18
 msgid "PO Box:"
-msgstr ""
+msgstr "Dirección:"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -532,11 +531,11 @@ msgstr "_Último:"
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/gui/component/addressbook.c:408
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:431
+#: addressbook/gui/component/addressbook.c:413
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -551,20 +550,20 @@ msgstr ""
 "significar que, o bien ha introducido un URI incorrecto,\n"
 "o que ha intentado acceder a un servidor LDAP y no ha\n"
 "compilado el soporte para LDAP. Si ha introducido un URI,\n"
-"compruebelo y reintentelo. De no ser así, posiblemente a\n"
+"compruebe lo y reintente lo. De no ser así, posiblemente a\n"
 "intentado acceder a un servidor LDAP. Si desea poder emplear\n"
 "LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
 "e instalar evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:548
+#: addressbook/gui/component/addressbook.c:530
 msgid "As _Minicards"
 msgstr "Como _mini tarjetas"
 
-#: addressbook/gui/component/addressbook.c:553
+#: addressbook/gui/component/addressbook.c:535
 msgid "As _Table"
 msgstr "Como _Tabla"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:575
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -738,15 +737,11 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-addressbook-view.c:414
 #: addressbook/gui/widgets/e-minicard.c:337
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:543
-msgid "* Click here to add a contact *"
-msgstr "* Pulse aquí para añadir un contacto *"
-
 #: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
@@ -765,9 +760,8 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un nuevo contacto."
 
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:405
+#: mail/folder-browser.c:490
 msgid "Search"
 msgstr "Buscar"
 
@@ -802,7 +796,7 @@ msgstr "Secciones:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Immediately follow each other"
-msgstr "Uno inmediatamente detras del otro"
+msgstr "Uno inmediatamente detrás del otro"
 
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Letter tabs on side"
@@ -810,7 +804,7 @@ msgstr "Las pestañas con las letras a la derecha"
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Headings for each letter"
-msgstr "Cabaceras para cada carta"
+msgstr "Cabeceras para cada carta"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Start on a new page"
@@ -822,7 +816,7 @@ msgstr "Número de columnas:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
 msgid "Blank forms at end:"
-msgstr "Formularios vacios al final:"
+msgstr "Formularios vacíos al final:"
 
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Fonts"
@@ -953,163 +947,123 @@ msgstr "Reverso en páginas impares"
 msgid "Header/Footer"
 msgstr "Cabecera/Pie"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:603
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
-msgid "Gpilotd calendar conduit"
-msgstr "Enlaze con el calendario del pilot"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Utilidad de configuracion para el enlace del calendario.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:398
-#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:554
-msgid "Error while communicating with calendar server"
-msgstr "Error mientras me comunicaba con el servidor de calendario"
-
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/calendar/calendar-conduit.c:780
-msgid "Could not start gnomecal server"
-msgstr "No pude iniciar el servidor gnomecal"
-
-#: calendar/conduits/calendar/calendar-conduit.c:808
-#: calendar/conduits/calendar/calendar-conduit.c:811
-msgid "Could not read pilot's DateBook application block"
-msgstr "No pude leer los datos de la aplicación DateBook de la pilot"
-
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:114
 #: calendar/conduits/todo/todo-conduit-control-applet.c:114
 msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr "JP Rosevear <jpr@helixcode.com>"
 
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:115
 #: calendar/conduits/todo/todo-conduit-control-applet.c:115
 msgid "Original Author:"
 msgstr "Autor Original:"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:120
-msgid "Evolution ToDo Conduit"
-msgstr "Enlace ToDo de Evolution"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:120
+msgid "Evolution Calendar Conduit"
+msgstr "Enlace con el Calendario de Evolution"
 
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
 #: calendar/conduits/todo/todo-conduit-control-applet.c:121
 msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilidad de configuración para el enlace \"todo\" de evolution.\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr ""
+"Utilidad de configuración para el enlace <<calendario>> de evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/calendar/calendar-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:577
+msgid "Error while communicating with calendar server"
+msgstr "Error mientras me comunicaba con el servidor de calendario"
+
+#: calendar/conduits/calendar/calendar-conduit.c:701
+#: calendar/conduits/todo/todo-conduit.c:622
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/calendar/calendar-conduit.c:702
+#: calendar/conduits/todo/todo-conduit.c:623
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: calendar/conduits/todo/todo-conduit.c:658
-#: calendar/conduits/todo/todo-conduit.c:661
+#: calendar/conduits/calendar/calendar-conduit.c:765
+#: calendar/conduits/calendar/calendar-conduit.c:768
+msgid "Could not read pilot's Calendar application block"
+msgstr "No pude leer información de la aplicación de calendario del pilot"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+msgid "Evolution ToDo Conduit"
+msgstr "Enlace Por Hacer de Evolution"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr "Utilidad de configuración para el enlace \"todo\" de evolution.\n"
+
+#: calendar/conduits/todo/todo-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:689
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicación ToDo de la pilot"
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "Titular:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "Cabeceras:"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
-msgstr "Días vacios:"
+msgstr "Días vacíos:"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "C_itas:"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "Día marcado:"
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
-msgstr "Numeros de los días:"
+msgstr "Números de los días:"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "Número del día actual:"
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr "Cosas por hacer pero no todavía:"
 
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr "Cosas por hacer para hoy:"
 
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr "Cosas por hacer que se han pasado:"
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:396
 msgid "File not found"
 msgstr "Archivo no encontrado"
 
-#: calendar/gui/calendar-commands.c:394
+#: calendar/gui/calendar-commands.c:420
 msgid "Open calendar"
 msgstr "Abrir calendario"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:459
 msgid "Save calendar"
 msgstr "Guardar calendario"
 
-#: calendar/gui/calendar-commands.c:464
-msgid "Day"
-msgstr "Día"
-
-#: calendar/gui/calendar-commands.c:464
-msgid "Show 1 day"
-msgstr "Mostrar 1 día"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "5 Days"
-msgstr "5 días"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "Show the working week"
-msgstr "Mostrar semana laboral"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Week"
-msgstr "Semana"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Show 1 week"
-msgstr "Mostrar 1 semana"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Month"
-msgstr "Mes"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Show 1 month"
-msgstr "Mostrar 1 mes"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Year"
-msgstr "Año"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Show 1 year"
-msgstr "Mostrar 1 año"
-
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
@@ -1184,8 +1138,8 @@ msgstr ""
 
 #. strptime format for a date.
 #: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
-#: widgets/misc/e-dateedit.c:475 widgets/misc/e-dateedit.c:507
-#: widgets/misc/e-dateedit.c:664 widgets/misc/e-dateedit.c:720
+#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
+#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -1255,7 +1209,7 @@ msgstr "No hay un sumario disponible."
 msgid "Close"
 msgstr "Cerrar"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1424
 msgid "Snooze"
 msgstr ""
 
@@ -1345,7 +1299,7 @@ msgstr "ARREGLAME: Pegado e_special..."
 
 #: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
 msgid "FIXME: Mark as U_nread"
-msgstr "ARREGLAME: Marcar como _no leido"
+msgstr "ARREGLAME: Marcar como _no leído"
 
 #: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1239
 msgid "_Object"
@@ -1361,7 +1315,7 @@ msgstr "ARREGLAME: _Elemento"
 #: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1245
 #: calendar/gui/event-editor.c:1252
 msgid "FIXME: _Unread Item"
-msgstr "ARREGLAME: Elemento no _leido"
+msgstr "ARREGLAME: Elemento no _leído"
 
 #: calendar/gui/dialogs/task-editor.c:502
 #: calendar/gui/dialogs/task-editor.c:510
@@ -1438,7 +1392,7 @@ msgstr "ARREGLAME: Pu_blicar formulario como..."
 
 #: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1299
 msgid "FIXME: Script _Debugger"
-msgstr "ARREGLAME: _Depurador de scipt"
+msgstr "ARREGLAME: _Depurador de script"
 
 #: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1304
 msgid "FIXME: _Spelling..."
@@ -1497,7 +1451,7 @@ msgid "_Insert"
 msgstr "_Insertar"
 
 #: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1335
-#: composer/e-msg-composer.c:1022
+#: composer/e-msg-composer.c:962
 msgid "F_ormat"
 msgstr "F_ormato"
 
@@ -1541,7 +1495,7 @@ msgstr "ARREGLAME: _Tarea"
 msgid "Assign the task to someone"
 msgstr "Asignar la tarea a alguien"
 
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:303
 #: calendar/gui/event-editor-dialog.glade.h:92
 #: calendar/gui/event-editor.c:1367 mail/mail-config.glade.h:13
 #: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
@@ -1619,7 +1573,7 @@ msgstr "Fecha de Ini_cio:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "_Due Date:"
-msgstr "Fecha _de Fín:"
+msgstr "Fecha _de Fin:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "% Comp_lete:"
@@ -1666,9 +1620,9 @@ msgid "C_lassification:"
 msgstr "C_lasificación:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:981
-#: widgets/misc/e-dateedit.c:332 widgets/misc/e-dateedit.c:704
-#: widgets/misc/e-dateedit.c:1027
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:992
+#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
+#: widgets/misc/e-dateedit.c:1171
 msgid "None"
 msgstr "Ninguno"
 
@@ -1688,128 +1642,74 @@ msgstr "Fecha Completada:"
 msgid "URL:"
 msgstr "URL:"
 
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "Categorías"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Clasificación"
-
-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr "Fecha a acabar"
-
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr "Fecha de fin"
-
-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
-msgstr "Fecha de comienzo"
-
-#: calendar/gui/e-calendar-table.c:201
-msgid "Due date"
-msgstr "Plazo"
-
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
-msgstr "Posición geográfica"
-
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
-msgstr "Porcentaje completado"
-
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-msgid "Priority"
-msgstr "Prioridad"
-
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
-msgstr "Transparencia"
-
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:297
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:319
+#: calendar/gui/e-calendar-table.c:298
 msgid "Open the task"
 msgstr "Abrir la tarea"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:300
 msgid "Mark Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:301
 msgid "Mark the task complete"
 msgstr "Marcar la tarea como completa"
 
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/e-calendar-table.c:304
 msgid "Delete the task"
 msgstr "Borrar la tarea"
 
-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:406
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisiones por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view.c:1172
 msgid "%A %d %B"
 msgstr "%A %b de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1187
+#: calendar/gui/e-day-view.c:1186
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1200
+#: calendar/gui/e-day-view.c:1199
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2594 calendar/gui/e-day-view.c:2601
-#: calendar/gui/e-day-view.c:2610 calendar/gui/e-week-view.c:2958
-#: calendar/gui/e-week-view.c:2965 calendar/gui/e-week-view.c:2974
+#: calendar/gui/e-day-view.c:2632 calendar/gui/e-day-view.c:2639
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2935
+#: calendar/gui/e-week-view.c:2942 calendar/gui/e-week-view.c:2951
 msgid "New appointment..."
 msgstr "Nueva cita..."
 
-#: calendar/gui/e-day-view.c:2598 calendar/gui/e-day-view.c:2605
-#: calendar/gui/e-week-view.c:2962 calendar/gui/e-week-view.c:2969
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-day-view.c:2643
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2946
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2599 calendar/gui/e-week-view.c:2963
+#: calendar/gui/e-day-view.c:2637 calendar/gui/e-week-view.c:2940
 #: calendar/gui/event-editor.c:1368
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2606 calendar/gui/e-week-view.c:2970
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2947
 msgid "Make this appointment movable"
 msgstr "Hacer esta cita movible"
 
-#: calendar/gui/e-day-view.c:2607 calendar/gui/e-week-view.c:2971
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2948
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: calendar/gui/e-day-view.c:2608 calendar/gui/e-week-view.c:2972
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2949
 msgid "Delete all occurrences"
 msgstr "Borrar todas las ocurrencias"
 
@@ -1853,7 +1753,8 @@ msgstr "ARREGLAME: Invit_ar..."
 msgid "Invite attendees to a meeting"
 msgstr "Invitar a una reunión"
 
-#: calendar/gui/event-editor.c:1947
+#: calendar/gui/event-editor.c:1947 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -1901,6 +1802,10 @@ msgstr "Hora de fin:"
 msgid "A_ll day event"
 msgstr "Evento para todo e_l día"
 
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "Classification"
+msgstr "Clasificación"
+
 #: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Pu_blic"
 msgstr "Pú_blico"
@@ -2039,7 +1944,7 @@ msgstr "label25"
 #: calendar/gui/event-editor-dialog.glade.h:61
 #: calendar/gui/event-editor-dialog.glade.h:62
 msgid "Recur on the"
-msgstr ""
+msgstr "Recurencia en el"
 
 #: calendar/gui/event-editor-dialog.glade.h:63
 msgid "th day of the month"
@@ -2107,11 +2012,11 @@ msgstr "Finalizar en"
 
 #: calendar/gui/event-editor-dialog.glade.h:87
 msgid "End after"
-msgstr "Finalizar despues de"
+msgstr "Finalizar después de"
 
 #: calendar/gui/event-editor-dialog.glade.h:88
 msgid "occurrence(s)"
-msgstr "ocurrecia(s)"
+msgstr "ocurrencia(s)"
 
 #: calendar/gui/event-editor-dialog.glade.h:89
 msgid "Exceptions"
@@ -2195,11 +2100,11 @@ msgstr "mar"
 
 #: calendar/gui/getdate.y:408
 msgid "wednesday"
-msgstr "miercoles"
+msgstr "miércoles"
 
 #: calendar/gui/getdate.y:409
 msgid "wednes"
-msgstr "mier"
+msgstr "Mier"
 
 #: calendar/gui/getdate.y:410
 msgid "thursday"
@@ -2207,11 +2112,11 @@ msgstr "jueves"
 
 #: calendar/gui/getdate.y:411
 msgid "thur"
-msgstr "jue"
+msgstr "Jue"
 
 #: calendar/gui/getdate.y:412
 msgid "thurs"
-msgstr "jue"
+msgstr "Jue"
 
 #: calendar/gui/getdate.y:413
 msgid "friday"
@@ -2219,7 +2124,7 @@ msgstr "viernes"
 
 #: calendar/gui/getdate.y:414
 msgid "saturday"
-msgstr "sabado"
+msgstr "sábado"
 
 #: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
 msgid "year"
@@ -2313,7 +2218,7 @@ msgstr "sexto"
 
 #: calendar/gui/getdate.y:448
 msgid "seventh"
-msgstr "septimo"
+msgstr "séptimo"
 
 #: calendar/gui/getdate.y:449
 msgid "eighth"
@@ -2363,28 +2268,28 @@ msgstr "Prioridad:"
 msgid "Item Comments:"
 msgstr "Comentarios del elemento:"
 
-#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
-#: calendar/gui/gnome-cal.c:1491
+#: calendar/gui/gnome-cal.c:694 calendar/gui/gnome-cal.c:1432
+#: calendar/gui/gnome-cal.c:1488
 msgid "Reminder of your appointment at "
 msgstr "Recordatorio de su cita el "
 
-#: calendar/gui/gnome-cal.c:1131
+#: calendar/gui/gnome-cal.c:1128
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "No puedo cargar el calendario en `%s'"
 
-#: calendar/gui/gnome-cal.c:1142
+#: calendar/gui/gnome-cal.c:1139
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "No puedo crear un calendario en `%s'"
 
-#: calendar/gui/gnome-cal.c:1153
+#: calendar/gui/gnome-cal.c:1150
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr "El metodo necesario para cargar `%s' no esta soportado"
+msgstr "El método necesario para cargar `%s' no esta soportado"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1440 calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1437 calendar/gui/gnome-cal.c:1492
 msgid "Ok"
 msgstr "OK"
 
@@ -2563,55 +2468,43 @@ msgstr "Vier"
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:951
-msgid "TODO Items"
-msgstr "Cosas Por Hacer"
+#: calendar/gui/print.c:936
+msgid "Tasks"
+msgstr "Tareas"
 
 #. Day
-#: calendar/gui/print.c:1052
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1072 calendar/gui/print.c:1086
-#: calendar/gui/print.c:1087
-msgid "%a"
-msgstr "%a"
-
-#: calendar/gui/print.c:1073 calendar/gui/print.c:1074
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1089
-msgid "%b"
-msgstr "%b"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
+msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1076
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
-msgstr "Semana actual (%s %s %d - %s %d %d)"
-
-#: calendar/gui/print.c:1093
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr "Semana actual (%s %s %d - %s %s %d %d)"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
+msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1092
 #, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr "Semana actual (%s %s %d %d - %s %s %d %d)"
+msgid "Current week (%s - %s)"
+msgstr "Semana actual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%a %Y)"
-msgstr "Més actual (%a %Y)"
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
+msgstr "Mes actual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "Año actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:785
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:794
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -2657,7 +2550,7 @@ msgid ""
 "Times outside this range will not be displayed\n"
 "by default."
 msgstr ""
-"Por favor selecccione las horas de inicio y fin\n"
+"Por favor seleccione las horas de inicio y fin\n"
 "que quiere que sean mostradas en la vista diaria\n"
 "y semanal. Las horas fuera de rango no serán\n"
 "mostradas por defecto."
@@ -2686,6 +2579,10 @@ msgstr "Mostrar la lista Por Hacer"
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
+#: calendar/gui/prop.c:611
+msgid "Priority"
+msgstr "Prioridad"
+
 #: calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Tiempo hasta el plazo"
@@ -2718,6 +2615,10 @@ msgstr "Lista Por Hacer"
 msgid "Preferences"
 msgstr "Preferencias"
 
+#: calendar/gui/prop.c:786
+msgid "Alarms"
+msgstr "Alarmas"
+
 #. build miscellaneous box
 #: calendar/gui/prop.c:789
 msgid "Alarm Properties"
@@ -2750,7 +2651,7 @@ msgstr "Cortar"
 
 #: composer/e-msg-composer-address-dialog.c:187
 msgid "Cut selected item into clipboard"
-msgstr "Corta la selección y la coloca en el portapapeles"
+msgstr "Corta la selección y la coloca en el porta papeles"
 
 #: composer/e-msg-composer-address-dialog.c:190
 msgid "Copy"
@@ -2758,7 +2659,7 @@ msgstr "Copiar"
 
 #: composer/e-msg-composer-address-dialog.c:191
 msgid "Copy selected item into clipboard"
-msgstr "Copia la selección y la coloca en el portapapeles"
+msgstr "Copia la selección y la coloca en el porta papeles"
 
 #: composer/e-msg-composer-address-dialog.c:194
 #: composer/e-msg-composer-address-dialog.c:202
@@ -2768,7 +2669,7 @@ msgstr "Pegar"
 #: composer/e-msg-composer-address-dialog.c:195
 #: composer/e-msg-composer-address-dialog.c:203
 msgid "Paste item from clipboard"
-msgstr "Pega desde el portapapeles"
+msgstr "Pega desde el porta papeles"
 
 #: composer/e-msg-composer-address-dialog.c:529
 msgid "Select recipients' addresses"
@@ -2852,24 +2753,24 @@ msgstr "%.1fM"
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:411
 msgid "Add attachment"
 msgstr "Incluir adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:459 shell/e-shortcuts-view.c:239
+#: composer/e-msg-composer-attachment-bar.c:474 shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Quitar"
 
-#: composer/e-msg-composer-attachment-bar.c:460
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
@@ -2900,7 +2801,7 @@ msgstr "Presione aquí para acceder a la agenda"
 
 #: composer/e-msg-composer-hdrs.c:297
 msgid "Enter the identity you wish to send this message from"
-msgstr "Eliga la identidad desde la que quiere enviar el mensaje"
+msgstr "Elija la identidad desde la que quiere enviar el mensaje"
 
 #: composer/e-msg-composer-hdrs.c:301
 msgid "To:"
@@ -2927,7 +2828,7 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Escriba las direcciones que recivirán una copia del mensaje sin aparecer en "
+"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
 #: composer/e-msg-composer-hdrs.c:319
@@ -2938,33 +2839,33 @@ msgstr "Asunto:"
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
-#: composer/e-msg-composer.c:468
+#: composer/e-msg-composer.c:408
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:479
+#: composer/e-msg-composer.c:419
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:439
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:461
 msgid "Saving changes to message..."
-msgstr "Guardando cambios en el mendaje..."
+msgstr "Guardando cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:463
 msgid "About to save changes to message..."
 msgstr "Se van a guardar los cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:608 shell/e-shell-view-menu.c:166
+#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:614
+#: composer/e-msg-composer.c:554
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2974,27 +2875,27 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:576
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:695
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:765
+#: composer/e-msg-composer.c:705
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:715
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:725
 msgid "That file appeared accesible but open(2) failed."
-msgstr "Ese archivo parece acesible pero open(2) ha fallado."
+msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:807
+#: composer/e-msg-composer.c:747
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3002,123 +2903,123 @@ msgstr ""
 "El archivo es muy largo (más de 100K).\n"
 "¿Esta seguro que quiere añadirlo?"
 
-#: composer/e-msg-composer.c:828
+#: composer/e-msg-composer.c:768
 msgid "An error occurred while reading the file."
-msgstr "Ha ocurrido un error mientras se leia el archivo."
+msgstr "Ha ocurrido un error mientras se leía el archivo."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:864
 msgid "_File"
 msgstr "_Archivo"
 
-#: composer/e-msg-composer.c:930
+#: composer/e-msg-composer.c:870
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:871
 msgid "Load a previously saved message"
 msgstr "Cargar el mensaje guardado previamente"
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:879
 msgid "_Save..."
 msgstr "_Guardar..."
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:880
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:888
 msgid "Save _as..."
 msgstr "Guardar _como..."
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:889
 msgid "Save message with a different name"
 msgstr "Guardar mensaje con un nombre diferente"
 
-#: composer/e-msg-composer.c:957
+#: composer/e-msg-composer.c:897
 msgid "Save in _folder..."
 msgstr "Guardar en _carpeta..."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:898
 msgid "Save the message in a specified folder"
 msgstr "Guardar el mensaje en una carpeta especificada"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:907
 msgid "_Insert text file... (FIXME)"
 msgstr "_Añadir archivo de texto... (ARREGLAME)"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:908
 msgid "Insert a file as text into the message"
 msgstr "Añadir un archivo en texto al mensaje"
 
-#: composer/e-msg-composer.c:977
+#: composer/e-msg-composer.c:917
 msgid "Send _Now"
 msgstr "Enviar _Ahora"
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:918
 msgid "Send the message now"
 msgstr "Enviar el mensaje ahora"
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:926
 msgid "Send _Later"
 msgstr "Enviar _Luego"
 
-#: composer/e-msg-composer.c:987
+#: composer/e-msg-composer.c:927
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:937
 msgid "_Close..."
 msgstr "_Cerrar..."
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:938
 msgid "Quit the message composer"
 msgstr "Cerrar el editor de mensajes"
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:951
 msgid "_Edit"
 msgstr "_Editar..."
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:968
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:969
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: composer/e-msg-composer.c:1042 shell/e-storage-set-view.c:221
+#: composer/e-msg-composer.c:982 shell/e-storage-set-view.c:222
 msgid "_View"
 msgstr "_Ver"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:988
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:989
 msgid "Show/hide attachments"
 msgstr "Mostrar/ocultar adjuntos"
 
-#: composer/e-msg-composer.c:1082
+#: composer/e-msg-composer.c:1022
 msgid "Send"
 msgstr "Enviar"
 
-#: composer/e-msg-composer.c:1083
+#: composer/e-msg-composer.c:1023
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1032
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1033
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1257
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1334
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -3238,60 +3139,73 @@ msgstr "<pinche aquí para seleccionar una carpeta>"
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:504
+#: filter/filter-rule.c:494
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:508
+#: filter/filter-rule.c:498
 msgid "untitled"
 msgstr "sin título"
 
-#: filter/filter-rule.c:519
+#: filter/filter-rule.c:509
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:536
+#: filter/filter-rule.c:526
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:530
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:547
+#: filter/filter-rule.c:537
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:561
-msgid "Add criterion"
-msgstr "Añadir criterio"
+#: filter/filter-rule.c:550
+msgid "More criterion"
+msgstr "Más criterios"
 
-#: filter/filter-rule.c:567
-msgid "Remove criterion"
-msgstr "Eliminar criterio"
+#: filter/filter-rule.c:556
+msgid "Fewer criterion"
+msgstr "Menos criterios"
 
 #: filter/score-editor.c:165
 msgid "Edit Score Rule"
-msgstr ""
+msgstr "Editar regla de puntuación"
 
 #: filter/score-rule.c:192 filter/score-rule.c:194
 msgid "Score"
-msgstr ""
+msgstr "Puntuación"
 
 #: filter/vfolder-editor.c:192
 msgid "Edit VFolder Rule"
 msgstr "Editar regla de VFolder"
 
-#: mail/component-factory.c:198
+#: mail/component-factory.c:236
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/folder-browser-factory.c:50
+#: mail/component-factory.c:243
+msgid "Cannot initialize Evolution's mail summary component."
+msgstr "No puedo inicializar el componente de correo de Evolution."
+
+#: mail/component-factory.c:248
+msgid "Cannot initialize Evolution's mail storage hash."
+msgstr "No puedo inicializar el componente para guardar correo de Evolution."
+
+#: mail/folder-browser-factory.c:53
 #, c-format
 msgid "Run filter \"%s\""
 msgstr "Ejecutar filtro \"%s\""
 
-#: mail/folder-browser.c:408
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: mail/folder-browser.c:488
+msgid "Full Search"
+msgstr "Busqueda complate"
+
+#: mail/folder-browser.c:493
 msgid "Save"
 msgstr "Guardar"
 
@@ -3323,8 +3237,8 @@ msgid ""
 msgstr ""
 "No ha configurado el cliente de correo.\n"
 "Necesita hacerlo para poder enviar,\n"
-"recivir o escribir mensajes.\n"
-"¿Querria configurarlo ahora?"
+"recibir o escribir mensajes.\n"
+"¿Querría configurarlo ahora?"
 
 #: mail/mail-callbacks.c:112
 msgid ""
@@ -3342,7 +3256,7 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:241
+#: mail/mail-callbacks.c:242
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3358,7 +3272,7 @@ msgstr "Mover Mensaje(s) a"
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:607
+#: mail/mail-callbacks.c:608
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3366,7 +3280,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:698
+#: mail/mail-callbacks.c:707
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3375,11 +3289,11 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:745 mail/message-list.c:1640
+#: mail/mail-callbacks.c:754 mail/message-list.c:1568
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:792
+#: mail/mail-callbacks.c:801
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
@@ -3389,7 +3303,7 @@ msgid ""
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
-"Escriba su nombre y la dirección de correo a usar en su mensajes. Tambien,\n"
+"Escriba su nombre y la dirección de correo a usar en su mensajes. También,\n"
 "opcionalmente, puede escribir el nombre de su organización, y el nombre de\n"
 "un archivo del que leer su firma."
 
@@ -3453,7 +3367,7 @@ msgstr ""
 "oportuna acerca del mismo.\n"
 "\n"
 "Si el servidor necesita autentificación, puede presionar el botón \"Detectar "
-"tipos soportados...\" despues de facilitar el resto de la información."
+"tipos soportados...\" después de facilitar el resto de la información."
 
 #: mail/mail-config-gui.c:1125
 msgid ""
@@ -3467,7 +3381,7 @@ msgstr ""
 "oportuna acerca del mismo.\n"
 "\n"
 "Si el servidor necesita autentificación, puede presionar el botón \"Detectar "
-"tipos soportados...\" despues de facilitar el resto de la información."
+"tipos soportados...\" después de facilitar el resto de la información."
 
 #: mail/mail-config-gui.c:1144
 msgid "Mail transport type:"
@@ -3528,9 +3442,9 @@ msgid ""
 "settings, you can start sending and receiving email\n"
 "right away. Click Next to continue."
 msgstr ""
-"Bienvenido al asistente de configuracion del Correo Evolution\n"
-"Rellenando algunos datos sobre la configuració de su\n"
-"correo, usted puede empezar a enviar y recivir correo\n"
+"Bienvenido al asistente de configuración del Correo Evolution\n"
+"Rellenando algunos datos sobre la configuración de su\n"
+"correo, usted puede empezar a enviar y recibir correo\n"
 "ahora mismo. Piche en Next para continuar."
 
 #: mail/mail-config-druid.glade.h:13
@@ -3644,7 +3558,7 @@ msgstr "Visores externos"
 #: mail/mail-display.c:322
 #, c-format
 msgid "View Inline (via %s)"
-msgstr "Ver incluido (via %s)"
+msgstr "Ver incluido (vía %s)"
 
 #: mail/mail-display.c:326
 msgid "Hide"
@@ -3676,249 +3590,264 @@ msgstr "Recogiendo correo de %s"
 msgid "Fetch email from %s"
 msgstr "Recoger correo de %s"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:173
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr "Recogiendo mensaje %d de %d"
+
+#: mail/mail-ops.c:237
+#, c-format
+msgid "Retrieving messages : %s"
+msgstr "Recogiendo mensaje : %s"
+
+#: mail/mail-ops.c:373
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hay correo nuevo en %s"
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrando correo bajo demanda"
 
-#: mail/mail-ops.c:314
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Filtrar correo bajo demanda"
 
-#: mail/mail-ops.c:481
+#: mail/mail-ops.c:637
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:486
+#: mail/mail-ops.c:642
 msgid "Sending a message without a subject"
-msgstr "Enviando un mendaje sin asunto"
+msgstr "Enviando un mensaje sin asunto"
 
-#: mail/mail-ops.c:489
+#: mail/mail-ops.c:645
 #, c-format
 msgid "Send \"%s\""
 msgstr "Enviado \"%s\""
 
 #
-#: mail/mail-ops.c:492
+#: mail/mail-ops.c:648
 msgid "Send a message without a subject"
 msgstr "Enviar un mensaje sin asunto"
 
-#: mail/mail-ops.c:636
+#: mail/mail-ops.c:792
 msgid "Sending queue"
 msgstr "Enviando cola de correo"
 
-#: mail/mail-ops.c:638
+#: mail/mail-ops.c:794
 msgid "Send queue"
 msgstr "Enviar cola"
 
-#: mail/mail-ops.c:774 mail/mail-ops.c:781
+#: mail/mail-ops.c:930 mail/mail-ops.c:937
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Añadiendo \"%s\""
 
-#: mail/mail-ops.c:778 mail/mail-ops.c:784
+#: mail/mail-ops.c:934 mail/mail-ops.c:940
 msgid "Appending a message without a subject"
 msgstr "Añadiendo un mensaje sin asunto"
 
-#: mail/mail-ops.c:856
+#: mail/mail-ops.c:1012
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Comprimiendo \"%s\""
 
-#: mail/mail-ops.c:858
+#: mail/mail-ops.c:1014
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Comprime \"%s\""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:1073
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Moviendo mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:1075
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mendajes de \"%s\" a \"%s\""
+msgstr "Copiando mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:1078
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:924
+#: mail/mail-ops.c:1080
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mendajes de \"%s\" a \"%s\""
+msgstr "Copiar mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:954
+#: mail/mail-ops.c:1111
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:957
+#: mail/mail-ops.c:1114
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1134
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensje %d de %d (uid \"%s\")"
+msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1046
+#: mail/mail-ops.c:1213
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Marcando mensajes en la carpeta \"%s\""
 
-#: mail/mail-ops.c:1049
+#: mail/mail-ops.c:1216
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Marcar mensajes en la carpeta \"%s\""
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1247
+#, c-format
+msgid "Marking message %d of %d"
+msgstr "Marcando mensajes %d of %d"
+
+#: mail/mail-ops.c:1367
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1370
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Escanear carpetas en \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1441
 msgid "(No description)"
 msgstr "(Sin descripción)"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1501
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Adjuntando mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:1325
+#: mail/mail-ops.c:1504
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Adjuntar mensajes desde \"%s\""
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Reenviando mensajes \"%s\""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1612
 msgid "Forwarding a message without a subject"
 msgstr "Reenviando mensajes sin asunto"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1615
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Reenviar mensaje \"%s\""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1620
 msgid "Forward a message without a subject"
 msgstr "Reenviar mensaje sin asunto"
 
-#: mail/mail-ops.c:1470
+#: mail/mail-ops.c:1657
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recogiendo menesaje número %d de %d (uid \"%s\")"
+msgstr "Recogiendo mensaje número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1674
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "No pude generar un mime del mensaje cuando generaba el mensaje a reenviar."
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1760
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Cargando \"%s\""
 
-#: mail/mail-ops.c:1571
+#: mail/mail-ops.c:1762
 #, c-format
 msgid "Load \"%s\""
 msgstr "Cargar \"%s\""
 
-#: mail/mail-ops.c:1673
+#: mail/mail-ops.c:1864
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Creando \"%s\""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1866
 #, c-format
 msgid "Create \"%s\""
 msgstr "Crear \"%s\""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1912
 msgid "Exception while reporting result to shell component listener."
-msgstr "Excepción mientras devolvia los resultados al componente de shell."
+msgstr "Excepción mientras devolvía los resultados al componente de shell."
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1958
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1769
+#: mail/mail-ops.c:1960
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sincronizar \"%s\""
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Mostrando mensaje UID \"%s\""
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:2026
 msgid "Clearing message display"
 msgstr "Limpiando vista del mensaje"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:2029
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Mostrar mensaje UID \"%s\""
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:2032
 msgid "Clear message display"
 msgstr "Limpiar vista del mensaje"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:2141
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Abriendo mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:1953
+#: mail/mail-ops.c:2144
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Abrir mensajes desde \"%s\""
 
-#: mail/mail-ops.c:2057
+#: mail/mail-ops.c:2248
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Cargando carpeta %s"
 
-#: mail/mail-ops.c:2059
+#: mail/mail-ops.c:2250
 #, c-format
 msgid "Load %s Folder"
 msgstr "Cargar carpeta %s"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2315
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Mostrando mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2318
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Mostrar mensajes desde \"%s\""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2344
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Recogiendo mensaje %d de %d (uid \"%s\") "
 
-#: mail/mail-threads.c:274
+#: mail/mail-threads.c:299
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -3927,7 +3856,7 @@ msgstr ""
 "Error mientras me preparaba para %s:\n"
 "%s"
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:648
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -3936,66 +3865,67 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-threads.c:701
 msgid "Incomplete message written on pipe!"
-msgstr ""
+msgstr "¡Mesaje escrito incompleto en la tubería!"
 
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:705
 msgid "Error reading commands from dispatching thread."
-msgstr ""
+msgstr "Error leyendo comandos del hilo de reparto"
 
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:770
 msgid "Corrupted message from dispatching thread?"
-msgstr ""
+msgstr "¿Mensajes corrompidos en el hilo de reparto?"
 
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:889
 msgid "Could not create dialog box."
 msgstr "No pude crear la ventana de diálogo"
 
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:899
 msgid "User cancelled query."
 msgstr "El usuario cancelo la consulta."
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:207
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
+msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:291
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
+"No pude leer el UID del archivo \"%s\". Puede que reciva mensajes duplicados."
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:384
 #, c-format
 msgid "[%s] %s"
 msgstr "[%s] %s"
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:386
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:395
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:432
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:434
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:556
+#: mail/mail-tools.c:546
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr "No conozco el protocolo para abrir URI `%s'"
 
-#: mail/mail-tools.c:585
+#: mail/mail-tools.c:575
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4004,7 +3934,7 @@ msgstr ""
 "No puedo acceder a `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:291
 msgid "New VFolder"
 msgstr "Nuevo VFolder"
 
@@ -4018,7 +3948,7 @@ msgstr "Responder"
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:154 mail/message-list.c:1643
+#: mail/mail-view.c:154 mail/message-list.c:1571
 msgid "Reply to All"
 msgstr "Re: Todos"
 
@@ -4046,94 +3976,70 @@ msgstr "Imprimir el mensaje seleccionado"
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:967
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:974
-msgid "Subject"
-msgstr "Asunto"
-
-#: mail/message-list.c:981
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/message-list.c:988
-msgid "Received"
-msgstr "Recivido"
-
-#: mail/message-list.c:995
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1002
-msgid "Size"
-msgstr "Tamaño"
-
-#: mail/message-list.c:1638
+#: mail/message-list.c:1566
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
-#: mail/message-list.c:1639
+#: mail/message-list.c:1567
 msgid "Edit Message"
 msgstr "Editar mensaje"
 
-#: mail/message-list.c:1642
+#: mail/message-list.c:1570
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/message-list.c:1644
+#: mail/message-list.c:1572
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
-#: mail/message-list.c:1646
+#: mail/message-list.c:1574
 msgid "Delete Message"
 msgstr "Borrar Mensaje"
 
-#: mail/message-list.c:1647
+#: mail/message-list.c:1575
 msgid "Move Message"
 msgstr "Mover Mensaje"
 
-#: mail/message-list.c:1648
+#: mail/message-list.c:1576
 msgid "Copy Message"
 msgstr "Copiar mensaje"
 
-#: mail/message-list.c:1650
+#: mail/message-list.c:1578
 msgid "VFolder on Subject"
 msgstr "VFolder según el asunto"
 
-#: mail/message-list.c:1651
+#: mail/message-list.c:1579
 msgid "VFolder on Sender"
 msgstr "VFolder según el remitente"
 
-#: mail/message-list.c:1652
+#: mail/message-list.c:1580
 msgid "VFolder on Recipients"
 msgstr "VFolder según los destinatarios"
 
-#: mail/message-list.c:1654
+#: mail/message-list.c:1582
 msgid "Filter on Subject"
 msgstr "Filtrar según el asunto"
 
-#: mail/message-list.c:1655
+#: mail/message-list.c:1583
 msgid "Filter on Sender"
 msgstr "Filtrar según el remitente"
 
-#: mail/message-list.c:1656
+#: mail/message-list.c:1584
 msgid "Filter on Recipients"
 msgstr "Filtrar según los destinatarios"
 
-#: mail/message-list.c:1657 mail/message-list.c:1680
+#: mail/message-list.c:1585 mail/message-list.c:1608
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/message-list.c:1682
+#: mail/message-list.c:1610
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
 #: shell/e-setup.c:47
 msgid "Evolution installation"
-msgstr "Intalación de Evolution"
+msgstr "Instalación de Evolution"
 
 #: shell/e-setup.c:51
 msgid "This seems to be the first time you run Evolution."
@@ -4142,7 +4048,7 @@ msgstr "Parece que esta es la primera vez que ejecuta Evolution"
 #: shell/e-setup.c:52
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
-"Por favor, pinche en \"OK\" para instalar los archivos de usuario de "
+"Por favor, pulse en <<Aceptar>> para instalar los archivos de usuario de "
 "Evolution en"
 
 #: shell/e-setup.c:69
@@ -4177,7 +4083,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 "El archivo `%s' no es un directorio.\n"
-"Por favor, renombrelo para permitir la instalación\n"
+"Por favor, renombre lo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
 #: shell/e-setup.c:121
@@ -4188,7 +4094,7 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 "El directorio `%s' existe pero no es el directorio\n"
-"de Evolution. Por favor, renombrelo para permitir la\n"
+"de Evolution. Por favor, renombre lo para permitir la\n"
 "instalación de los archivos de usuario de Evolution."
 
 #: shell/e-shell-folder-creation-dialog.c:82
@@ -4206,7 +4112,7 @@ msgstr "El nombre de carpeta especificado no es valido."
 
 #: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
-msgstr "Evolution - Crear nueavas carpetas"
+msgstr "Evolution - Crear nuevas carpetas"
 
 #: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
@@ -4250,23 +4156,32 @@ msgstr ""
 "groupware para manejar el correo, el calendario y la\n"
 "lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:325
+#: shell/e-shell-view-menu.c:331
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view.c:130
+#: shell/e-shell-view.c:134
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrandose)"
 
-#: shell/e-shell-view.c:409
+#: shell/e-shell-view.c:413
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:985
+#: shell/e-shell-view.c:996
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
+#: shell/e-shell-view.c:1136
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
+"Esto probablemente significa que el componente %s se ha roto."
+
 #: shell/e-shell.c:331
 #, c-format
 msgid "Cannot set up local storage -- %s"
@@ -4287,7 +4202,7 @@ msgid ""
 "`%s' from the shortcut bar?"
 msgstr ""
 "¿Realmente quiere quitar el grupo\n"
-"`%s' del menu de atajos?"
+"`%s' del menú de atajos?"
 
 #: shell/e-shortcuts-view.c:239
 msgid "Don't remove"
@@ -4393,7 +4308,7 @@ msgstr "El tipo especificado no esta soportado poe este manejador"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: shell/e-storage-set-view.c:221
+#: shell/e-storage-set-view.c:222
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
@@ -4485,7 +4400,7 @@ msgstr "Mostrar _solo las horas de trabajo"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:455
 msgid "Show _Zoomed Out"
-msgstr ""
+msgstr "Mostrar quitando _Zoom"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 msgid "_Update Free/Busy"
@@ -4497,7 +4412,7 @@ msgstr "_<<"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
-msgstr ""
+msgstr "_Auto seleccionar"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
@@ -4544,7 +4459,7 @@ msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -4552,23 +4467,25 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:320
+#: widgets/misc/e-dateedit.c:325
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-dateedit.c:326
+#: widgets/misc/e-dateedit.c:331
 msgid "Today"
 msgstr "Hoy"
 
 #. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:636 widgets/misc/e-dateedit.c:726
-#: widgets/misc/e-dateedit.c:983
+#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
+#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
+#: widgets/misc/e-dateedit.c:1127
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:639 widgets/misc/e-dateedit.c:729
-#: widgets/misc/e-dateedit.c:986
+#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
+#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
+#: widgets/misc/e-dateedit.c:1130
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -4576,3 +4493,114 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Pulse aquí para añadir un contacto *"
+
+#~ msgid "Gpilotd calendar conduit"
+#~ msgstr "Enlace con el calendario del pilot"
+
+#~ msgid "Configuration utility for the calendar conduit.\n"
+#~ msgstr "Utilidad de configuración para el enlace del calendario.\n"
+
+#~ msgid "Could not start gnomecal server"
+#~ msgstr "No pude iniciar el servidor gnomecal"
+
+#~ msgid "Could not read pilot's DateBook application block"
+#~ msgstr "No pude leer los datos de la aplicación DateBook de la pilot"
+
+#~ msgid "Day"
+#~ msgstr "Día"
+
+#~ msgid "Show 1 day"
+#~ msgstr "Mostrar 1 día"
+
+#~ msgid "5 Days"
+#~ msgstr "5 días"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostrar semana laboral"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "Show 1 week"
+#~ msgstr "Mostrar 1 semana"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "Show 1 month"
+#~ msgstr "Mostrar 1 mes"
+
+#~ msgid "Year"
+#~ msgstr "Año"
+
+#~ msgid "Show 1 year"
+#~ msgstr "Mostrar 1 año"
+
+#~ msgid "Categories"
+#~ msgstr "Categorías"
+
+#~ msgid "Completion date"
+#~ msgstr "Fecha a acabar"
+
+#~ msgid "End date"
+#~ msgstr "Fecha de fin"
+
+#~ msgid "Start date"
+#~ msgstr "Fecha de comienzo"
+
+#~ msgid "Due date"
+#~ msgstr "Plazo"
+
+#~ msgid "Geographical position"
+#~ msgstr "Posición geográfica"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaje completado"
+
+#~ msgid "Summary"
+#~ msgstr "Resumen"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Add criterion"
+#~ msgstr "Añadir criterio"
+
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "Subject"
+#~ msgstr "Asunto"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Received"
+#~ msgstr "Recibido"
+
+#~ msgid "To"
+#~ msgstr "A"
+
+#~ msgid "Size"
+#~ msgstr "Tamaño"
+
+#~ msgid "TODO Items"
+#~ msgstr "Cosas Por Hacer"
+
+#~ msgid "%a"
+#~ msgstr "%a"
+
+#~ msgid "%b"
+#~ msgstr "%b"
+
+#~ msgid "Current week (%s %s %d - %s %s %d %d)"
+#~ msgstr "Semana actual (%s %s %d - %s %s %d %d)"
+
+#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
+#~ msgstr "Semana actual (%s %s %d %d - %s %s %d %d)"