Updated Spanish translation by Fco. Javier Fernandez

2003-01-06 Pablo Gonzalo del Campo <pablodc@bigfoot.com> * es.po: Updated Spanish translation by Fco. Javier Fernandez <serrador@arrakis.es>. svn path=/trunk/; revision=19243
author: Pablo Gonzalo del Campo <pablodc@bigfoot.com> 2003-01-07 00:18:01 +0800
committer: Pablo del Campo <pablodc@src.gnome.org> 2003-01-07 00:18:01 +0800
commit: 7ab3a4fb2a3414f32b1087260246c062eba5fcaf (patch)
tree: e7e0ef964483e7fd82b46e8d39a7488969184344
parent: b4c4834eaa79edc11995f6b209e723d5ec6ecd56 (diff)
download: gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.tar.gz
gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.tar.zst
gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.zip
2 files changed, 6889 insertions, 7642 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 8e629a4383..25b958990c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-06  Pablo Gonzalo del Campo <pablodc@bigfoot.com>
+
+	* es.po: Updated Spanish translation by Fco. Javier Fernandez <serrador@arrakis.es>.
+
 2003-01-06  Andras Timar <timar@gnome.hu>
 
         * hu.po: Updated Hungarian translation.
diff --git a/po/es.po b/po/es.po
index 9a4bd16a26..1d59e0fd7e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,63 +1,207 @@
 # Evolution's Spanish translation.
-# Copyright (C) 2000-2002 Free Software Foundation, Inc.
-# Fco. Javier Fernández Serrador <serrador@arrakis.es>, 2002-2003.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000-2002.
-# Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
-# Ismael Olea <Ismael@olea.org>, 2001
-# Eneko Lacunza <enlar@iname.com>, 2001-2002
-# Héctor García Álvarez <hector@scouts-es.org>, 2002.
-# 
+# Copyright Â© 2000-2002 Free Software Foundation, Inc.
+# Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisiÃ³n).
+# Fco. Javier FernÃ¡ndez Serrador <serrador@arrakis.es>, 2002-2003.
+# HÃ©ctor GarcÃa Ãlvarez <hector@scouts-es.org>, 2000-2002.
+# Carlos PerellÃ³ MarÃn <carlos@gnome-db.org>, 2000-2001.
+# Eneko Lacunza <enlar@iname.com>, 2001-2002.
+# HÃ©ctor GarcÃa Ãlvarez <hector@scouts-es.org>, 2002.
+# Ismael Olea <Ismael@olea.org>, 2001.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 1.2\n"
-"POT-Creation-Date: 2002-11-06 16:04-0500\n"
-"PO-Revision-Date: 2002-12-07 15:32+0100\n"
-"Last-Translator: Fco. Javier Fernandez <serrador@arrakis.es>\n"
+"Project-Id-Version: evolution 2.0\n"
+"POT-Creation-Date: 2003-01-02 04:42+0100\n"
+"PO-Revision-Date: 2003-01-04 05:51+0100\n"
+"Last-Translator: Fco. Javier FernÃ¡ndez <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Factoría para importar archivos LDIF a Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa archivos LDIF a Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Factoría para importar archivos VCard a Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa archivos VCard a Evolution."
-
+#: addressbook/backend/ebook/e-card.c:1297
 #: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Archivar como"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1196
-# libnautilus-private/nautilus-search-bar-criterion.c:42
-# src/file-manager/fm-list-view.c:1581
-# src/file-manager/fm-search-list-view.c:140
-# src/nautilus-bookmarks-window.c:172
+#: addressbook/backend/ebook/e-card.c:1304
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:321
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#: addressbook/backend/ebook/e-card.c:1311
 #: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
 
+#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "DirecciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:1324
+msgid "Address Label"
+msgstr "Etiqueta de direcciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:1331
+msgid "Phone"
+msgstr "TelÃ©fono"
+
+#: addressbook/backend/ebook/e-card.c:1338
 #: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
-msgstr "Correo electrónico"
+msgstr "Correo electrÃ³nico"
+
+#: addressbook/backend/ebook/e-card.c:1345
+msgid "Birth date"
+msgstr "CumpleaÃ±os"
+
+#: addressbook/backend/ebook/e-card.c:1351
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "OrganizaciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:1365
+msgid "Organizational Unit"
+msgstr "Unidad de organizaciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "TitulaciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:1386
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Jefe"
+
+#: addressbook/backend/ebook/e-card.c:1400
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1835
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Secretario"
+
+#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Apodo"
+
+#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "CÃ³nyuge"
+
+#: addressbook/backend/ebook/e-card.c:1421
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Anniversary"
+msgstr "Aniversario"
+
+#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:930
+msgid "Mailer"
+msgstr "Transporte"
+
+#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "URI de calendario"
+
+#: addressbook/backend/ebook/e-card.c:1441
+msgid "Free/Busy URL"
+msgstr "URL de disponibilidad"
+
+#: addressbook/backend/ebook/e-card.c:1448
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card.c:1455
+msgid "Related Contacts"
+msgstr "Contactos relacionados"
+
+#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:104
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorÃas"
+
+#: addressbook/backend/ebook/e-card.c:1469
+msgid "Category List"
+msgstr "Lista de categorÃas"
+
+#: addressbook/backend/ebook/e-card.c:1476
+msgid "Wants HTML"
+msgstr "Desea HTML"
+
+#: addressbook/backend/ebook/e-card.c:1483
+msgid "Wants HTML set"
+msgstr "Desea pÃ¡gina de cÃ³digos HTML"
+
+#: addressbook/backend/ebook/e-card.c:1490
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1497
+msgid "List Show Addresses"
+msgstr "Mostrar direcciones de la lista"
+
+#: addressbook/backend/ebook/e-card.c:1504
+msgid "Arbitrary"
+msgstr "Arbitrario"
+
+#: addressbook/backend/ebook/e-card.c:1511
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1518
+msgid "Last Use"
+msgstr "Ãšltimo uso"
+
+#: addressbook/backend/ebook/e-card.c:1529
+msgid "Use Score"
+msgstr "Usar puntuaciÃ³n"
+
+#: addressbook/backend/ebook/e-card.c:2870
+msgid "Multiple VCards"
+msgstr "VCards mÃºltiples"
+
+#: addressbook/backend/ebook/e-card.c:2878
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1850
 msgid "Primary"
 msgstr "Principal"
 
@@ -65,18 +209,11 @@ msgstr "Principal"
 msgid "Prim"
 msgstr "Ppal"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Asistente"
-
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:1907
 msgid "Business"
 msgstr "Trabajo"
 
@@ -86,14 +223,14 @@ msgid "Bus"
 msgstr "Bus"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1839
 msgid "Callback"
 msgstr "Rellamada"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1841
 msgid "Company"
-msgstr "Compañía"
+msgstr "CompaÃ±Ãa"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
@@ -102,50 +239,45 @@ msgstr "Comp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1842
+#: addressbook/gui/contact-editor/e-contact-editor.c:1908
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1846
 msgid "Mobile"
-msgstr "Móvil"
+msgstr "MÃ³vil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1840
 msgid "Car"
 msgstr "Coche"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1838
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
-msgstr "Fax de Trab"
+msgstr "Fax de trab"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1844
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1837
 msgid "Business 2"
 msgstr "Trabajo 2"
 
@@ -154,45 +286,43 @@ msgid "Bus 2"
 msgstr "Trab 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1843
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1845
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDSI"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1560
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1847
+#: addressbook/gui/contact-editor/e-contact-editor.c:1909
 msgid "Other"
 msgstr "Otro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1848
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Otro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1849
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1851
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1852
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -200,21 +330,21 @@ msgstr "Telex"
 #: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
-msgstr "TTY"
+msgstr "Teletipo"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1880
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
-msgstr "Correo electrónico 2"
+msgstr "Correo electrÃ³nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1881
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
-msgstr "Correo electrónico 3"
+msgstr "Correo electrÃ³nico 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
@@ -235,65 +365,29 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Off"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:198
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Título"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
-msgstr "Profesión"
+msgstr "ProfesiÃ³n"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Gestor"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
-msgstr "Gest"
+msgstr "Jefe"
 
 #: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Asist"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Apodo"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
-msgstr "Apo"
-
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Cónyuge"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "URI de agenda"
+msgstr "Apodo"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
@@ -309,97 +403,98 @@ msgid "FBUrl"
 msgstr "DISUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
-msgstr "Aniversario"
-
-#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "Aniv"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
-msgstr "Cumpleaños"
-
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorías"
+msgstr "CumpleaÃ±os"
 
 #: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Apellido"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:334
+msgid "ECard"
+msgstr "ECard"
+
+#: addressbook/backend/ebook/e-card-simple.c:829
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-card-simple.c:890
+#: addressbook/backend/ebook/e-destination.c:704
 msgid "Unnamed List"
-msgstr "Lista de anónimos"
+msgstr "Lista de anÃ³nimos"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "VCards múltiples"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "FÃ¡brica para importar archivos LDIF a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "Importa archivos LDIF a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "FÃ¡brica para importar archivos VCard a Evolution."
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importa archivos VCard a Evolution."
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:17
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
+#: addressbook/backend/ebook/test-client.c:31
+#: addressbook/backend/ebook/test-client-list.c:15
 #: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1807
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:361
+#: addressbook/backend/pas/pas-backend-ldap.c:3008
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:363
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:717
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconectando al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1260
 msgid "Adding card to LDAP server..."
-msgstr "Añadiendo tarjeta al servidor LDAP..."
+msgstr "AÃ±adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1366
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1602
+#: addressbook/backend/pas/pas-backend-ldap.c:1605
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2919
 msgid "Receiving LDAP search results..."
-msgstr "Recibiendo los resultados de la búsqueda LDAP..."
+msgstr "Recibiendo los resultados de la bÃºsqueda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3028
 msgid "Error performing search"
-msgstr "Error efectuando búsqueda"
+msgstr "Error efectuando bÃºsqueda"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
-msgstr "Dirección de sincronización predeterminada:"
+msgstr "DirecciÃ³n de sincronizaciÃ³n predeterminada:"
 
 #: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
@@ -407,7 +502,7 @@ msgstr "No se pudo cargar el cursor\n"
 
 #: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
-msgstr "EBook no esta cargado\n"
+msgstr "EBook no cargado\n"
 
 #: addressbook/conduit/address-conduit.c:1354
 #: calendar/conduits/calendar/calendar-conduit.c:1278
@@ -424,175 +519,9 @@ msgstr "No se puede inicializar wombat"
 #: addressbook/conduit/address-conduit.c:1385
 #: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
-msgstr "No pude leer información de la aplicación de direcciones del pilot"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control Bonobo para una ventada de dirección."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control Bonobo para mostrar una dirección."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un control Bonobo de ejemplo que muestra una agenda."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-"Control de confiiguración para los Almacenes de la Libreta de Direcciones de  "
-"Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que muestra minitarjetas de direcciones en Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Directory Servers"
-msgstr "Servidores de Directorio"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de Minitarjetas de Direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Componente de Evolution para manejar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factoría para el control de Minitarjetas de Direcciones"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Factoría para el visualizador de direcciones de la Agenda"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Factoría para la ventana de direcciones de la Agenda"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
-"Utilidad para los controles de configuración para la Libreta de Direcciones "
-"de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Factoría para el control de ejemplo de la Agenda"
-
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
-msgid "Contacts"
-msgstr "Contactos"
+msgstr "No se ha podido leer el bloque de la aplicaciÃ³n de la Agenda del Pilot"
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "Folder containing contact information"
-msgstr "La carpeta contiene información de contacto"
-
-#: addressbook/gui/component/addressbook-component.c:75
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:75
-msgid "LDAP server containing contact information"
-msgstr "El servidor LDAP contiene información de contacto"
-
-#: addressbook/gui/component/addressbook-component.c:77
-msgid "Public Contacts"
-msgstr "Contactos Públicos"
-
-#: addressbook/gui/component/addressbook-component.c:77
-msgid "Public folder containing contact information"
-msgstr "Carpeta Pública Conteniendo Información de Contactos"
-
-#: addressbook/gui/component/addressbook-component.c:567
-msgid "New Contact"
-msgstr "Nuevo contacto"
-
-#: addressbook/gui/component/addressbook-component.c:567
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: addressbook/gui/component/addressbook-component.c:568
-msgid "Create a new contact"
-msgstr "Crear un contacto nuevo"
-
-#: addressbook/gui/component/addressbook-component.c:571
-msgid "New Contact List"
-msgstr "Nueva lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:571
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:572
-msgid "Create a new contact list"
-msgstr "Crear lista de contactos"
-
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr "Falló al conectarse al servidor LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:216
-msgid "Failed to authenticate with LDAP server"
-msgstr "Fallo al autenticarse con el servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:239
-msgid "Could not perform query on Root DSE"
-msgstr "No se pudo efectuar la consulta en la raíz DSE"
-
-#: addressbook/gui/component/addressbook-config.c:648
-msgid "The server responded with no supported search bases"
-msgstr "El servidor respondió con bases de búsqueda no soportadas"
-
-#: addressbook/gui/component/addressbook-config.c:1154
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Este servidor no soporta infomación según el esquema LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1176
-msgid "Error retrieving schema information"
-msgstr "Error al obtener información del esquema"
-
-#: addressbook/gui/component/addressbook-config.c:1184
-msgid "Server did not respond with valid schema information"
-msgstr "El servidor no respondió con una información del esquema válida"
-
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP no fue activado en la compilación de Evolution"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:2
-msgid "Server Name"
-msgstr "Nombre del servidor"
-
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "No se puede inicializar gnome-vfs"
-
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Otros contactos"
-
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la agenda de direcciones"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -600,132 +529,227 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:503
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 "No podemos abrir este agenda de direcciones.  Esto significa\n"
-"que ha introducido una URI errónea, o que el servidor LDAP está\n"
-"caído"
+"que ha introducido una URI errÃ³nea, o que el servidor LDAP estÃ¡\n"
+"caÃdo"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:508
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
 "you must compile the program from the CVS sources after\n"
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
-"Esta versión de Evolution no implementa LDAP compilado.\n"
+"Esta versiÃ³n de Evolution no implementa LDAP compilado.\n"
 "Si quiere usar LDAP en Evolution debe compilar el programa\n"
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:518
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 "No podemos abrir esta agenda de direcciones.  Esto significa\n"
-"que ha introducido una URI errónea, o que el servidor LDAP está\n"
-"caído"
+"que ha introducido una URI errÃ³nea, o que el servidor LDAP estÃ¡\n"
+"caÃdo"
+
+#: addressbook/gui/component/addressbook.c:538
+msgid "Unable to open addressbook"
+msgstr "No es posible abrir la agenda de direcciones"
 
 #. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:596
 msgid "Accessing LDAP Server anonymously"
-msgstr "Accediendo al servidor LDAP anónimamente"
+msgstr "Accediendo al servidor LDAP anÃ³nimamente"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:639
 msgid "Failed to authenticate.\n"
-msgstr ""
-"No pude autenticarme\n"
-"\n"
+msgstr "Fallo al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:647
+#: addressbook/gui/component/addressbook.c:650
 #, c-format
 msgid "%sEnter password for %s (user %s)"
-msgstr "%s Introduzca la contraseña para %s (usuario %s)"
+msgstr "%s Introduzca la contraseÃ±a para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:796
 msgid "Name begins with"
 msgstr "Nombre empieza con"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:797
 msgid "Email begins with"
 msgstr "Email comienza con"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:798
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
-msgstr "Categoría es"
+msgstr "CategorÃa es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:799
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:800
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:970
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 msgstr ""
-"Se encontraron más tarjetas que las que el servidor está \n"
-"configurado para devolver o Evolution está configurado\n"
-"para mostrar. Por favor, haga su búsqueda más específica o \n"
-"aumente el límite de resultados en las preferencias del servidor\n"
+"Se encontraron mÃ¡s tarjetas que las que el servidor estÃ¡ \n"
+"configurado para devolver o Evolution estÃ¡ configurado\n"
+"para mostrar. Por favor, haga su bÃºsqueda mÃ¡s especÃfica o \n"
+"aumente el lÃmite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:976
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
-"El tiempo especificado para efectuar esta consulta excedió el límite del "
-"servidor o el límite \n"
-"que ha configurado en la libreta de direcciones. Por favor, haga su búsqueda "
-"más específica\n"
-"o aumente el límite de tiempo en lasopciones del servidor de directorios para "
-"esta libreta de \n"
+"El tiempo especificado para efectuar esta consulta excediÃ³ el lÃmite del "
+"servidor o el lÃmite \n"
+"que ha configurado en la libreta de direcciones. Por favor, haga su bÃºsqueda "
+"mÃ¡s especÃfica\n"
+"o aumente el lÃmite de tiempo en lasopciones del servidor de directorios "
+"para esta libreta de \n"
 "direcciones."
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:982
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"El soporte de esta libreta de direcciones no pudo analizar esta consulta"
+msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta"
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:985
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"El soporte para esta libreta de direcciones rehusó a efectuar esta consulta"
+msgstr "El soporte para esta libreta de direcciones rehusÃ³ a efectuar esta consulta"
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:989
 msgid "This query did not complete successfully."
-msgstr "Esta consulta no se completó con éxito"
+msgstr "Esta consulta no se completÃ³ con Ã©xito"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1064
+#: calendar/gui/cal-search-bar.c:352
 msgid "Any Category"
-msgstr "Cualquier categoría"
+msgstr "Cualquier categorÃa"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1144
 msgid "The URI that the Folder Browser will display"
-msgstr "La URI que mostrará el visor de carpetas"
+msgstr "La URI que mostrarÃ¡ el visor de carpetas"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:609
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1085
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "La carpeta contiene informaciÃ³n de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "El servidor LDAP contiene informaciÃ³n de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Contactos PÃºblicos"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Carpeta PÃºblica Conteniendo InformaciÃ³n de Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact"
+msgstr "Contacto nuevo"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact"
+msgstr "Crea un contacto nuevo"
+
+#: addressbook/gui/component/addressbook-component.c:572
+msgid "New Contact List"
+msgstr "Lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-component.c:572
+msgid "Contact _List"
+msgstr "_Lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:573
+msgid "Create a new contact list"
+msgstr "Crea una lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-config.c:205
+msgid "Failed to connect to LDAP server"
+msgstr "FallÃ³ al conectarse al servidor LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:230
+msgid "Failed to authenticate with LDAP server"
+msgstr "Fallo al autenticarse con el servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:258
+msgid "Could not perform query on Root DSE"
+msgstr "No se pudo efectuar la consulta en la raÃz DSE"
+
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "The server responded with no supported search bases"
+msgstr "El servidor respondiÃ³ con bases de bÃºsqueda no soportadas"
+
+#: addressbook/gui/component/addressbook-config.c:1178
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Este servidor no soporta el esquema de informaciÃ³n LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1200
+msgid "Error retrieving schema information"
+msgstr "Error al obtener informaciÃ³n del esquema"
+
+#: addressbook/gui/component/addressbook-config.c:1208
+msgid "Server did not respond with valid schema information"
+msgstr "El servidor no respondiÃ³ con una informaciÃ³n del esquema vÃ¡lida"
+
+#: addressbook/gui/component/addressbook-config.c:1656
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP no fue activado en la compilaciÃ³n de Evolution"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Nombre del servidor"
+
+#: addressbook/gui/component/addressbook-storage.c:169
+msgid "Other Contacts"
+msgstr "Otros contactos"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/sample/nautilus-sample-content-view.c:85
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -737,128 +761,174 @@ msgstr "(ninguno)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/contact-editor/e-contact-editor.c:1879
 msgid "Primary Email"
-msgstr "Correo electrónico principal"
+msgstr "Correo electrÃ³nico principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:610
 msgid "Select an Action"
-msgstr "Elija un archivo"
+msgstr "Seleccione una acciÃ³n"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:617
 #, c-format
 msgid "Create a new contact \"%s\""
-msgstr "Crear nuevo contacto «%s»"
+msgstr "Crear un contacto nuevo Â«%sÂ»"
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:632
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr "Añadir dirección al contacto existente «%s»"
+msgstr "AÃ±adir direcciÃ³n al contacto existente Â«%sÂ»"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:913
 msgid "Querying Addressbook..."
-msgstr "Consultando la Agenda de Direcciones..."
+msgstr "Consultando la agenda..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-widget.c:391
+#: addressbook/gui/component/select-names/e-select-names-popup.c:301
 msgid "Edit Contact Info"
-msgstr "Editar información de contacto"
+msgstr "Editar informaciÃ³n del contacto"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1025
+#: addressbook/gui/component/e-address-widget.c:427
+#: addressbook/gui/component/select-names/e-select-names-popup.c:480
 msgid "Add to Contacts"
-msgstr "Añadir a Contactos"
+msgstr "AÃ±adir a contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1068
 msgid "Merge E-Mail Address"
-msgstr "Fusionar Direcciones de Correo"
+msgstr "Combinar direcciones de correo"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:368
 msgid "Disable Queries"
-msgstr "Deshabilitar Consultas"
+msgstr "Deshabilitar consultas"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:368
 msgid "Enable Queries (Dangerous!)"
-msgstr "Habilitar Consultas (¡Peligroso!)"
+msgstr "Habilitar consultas (Â¡Peligroso!)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Un control Bonobo para una ventana de direcciÃ³n."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un control Bonobo para mostrar una direcciÃ³n."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Un control Bonobo de ejemplo que muestra una agenda."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr "Control de configuraciÃ³n para los Almacenes de la Agenda de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurar aquÃ el acceso a los servidores de directorios LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control que muestra minitarjetas de direcciones en Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Directory Servers"
+msgstr "Servidores de directorio"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visor de minitarjetas de la agenda de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution component for handling contacts."
+msgstr "Componente de Evolution para manejar contactos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Factory for the controls exported by the Evolution Addressbook"
+msgstr ""
+"FÃ¡brica para los controles de configuraciÃ³n para la Libreta de Direcciones "
+"de Evolution."
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
-msgstr "Mo_strar bases soportadas "
+msgstr "Mo_strar Bases Soportadas "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "666"
 msgstr "666"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "<- _Remove"
 msgstr "<- _Eliminar"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "<< Fewer Options"
 msgstr "<< Menos Opciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Add (or Edit) Attribute Mappings"
-msgstr "Añadir (o Editar) Atributos de Planificación"
+msgstr "AÃ±adir (o Editar) Atributos de PlanificaciÃ³n"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Addressbook Sources"
-msgstr "Fuentes de la agenda de direcciones"
+msgstr "Fuentes de la agenda"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Siempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Anonymously"
-msgstr "Anónimamente"
+msgstr "AnÃ³nimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Associated LDAP Attribute"
-msgstr "Atributo LDAP Asociado"
+msgstr "Atributo LDAP asociado"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Attribute"
 msgstr "Atributo"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -867,80 +937,74 @@ msgid ""
 "here."
 msgstr ""
 "Felicidades, ha terminado de configurar este servidor LDAP. Ahora\n"
-"está preparado para acceder a este directorio\n"
+"estÃ¡ preparado para acceder a este directorio\n"
 "\n"
-"Por favor, pulse el botón \"Terminar\" para guardar la configuración que ha "
-"entrado aquí"
+"Por favor, pulse el botÃ³n Â«TerminarÂ» para guardar la configuraciÃ³n que ha "
+"entrado aquÃ"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Connecting"
 msgstr "Conectando"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Corresponding Evolution Attribute"
 msgstr "Atributo Correspondiente en Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "DN Customization"
-msgstr "Personalización de DN"
+msgstr "PersonalizaciÃ³n de ND"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "De_lete"
 msgstr "Bo_rrar"
 
-# src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Distinguished _name:"
-msgstr "Distinguido:"
+msgstr "Nombre Distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Email Address:"
-msgstr "Dir_ección de correo:"
+msgstr "Dir_ecciÃ³n de correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Evolution Attribute"
 msgstr "Atributo de Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution usará este nombre de dominio para autenticarle con el servidor"
+msgstr "Evolution usarÃ¡ este Nombre Distintivo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution usará esta dirección de correo para autenticarle con el servidor"
+#: addressbook/gui/component/ldap-config.glade.h:33
+msgid "Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution usarÃ¡ esta direcciÃ³n de correo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Finished"
 msgstr "Terminar"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:35
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "LDAP Attribute"
 msgstr "Atributo LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "LDAP Configuration Assistant"
-msgstr "Asistente de Configuración LDAP"
+msgstr "Asistente de configuraciÃ³n LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Mappings"
 msgstr "Planificaciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:59
 #: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -949,65 +1013,55 @@ msgid ""
 "your connection. Ask your system administrator if your LDAP server uses these "
 "protocols."
 msgstr ""
-"Ahora, debe especificar cómo quiere conectar al servidor LDAP. Algunos "
+"Ahora, debe especificar cÃ³mo quiere conectar al servidor LDAP. Algunos "
 "servidores usan los protocolos SSL (Secure Sockets Layer)\n"
 "y TLS (Transport Layer Security)\n"
-"para proteger criptográficamente la conexión. Pregunte a su administrador de "
-"systemas si sus servidores LDAP usan estos protocolos."
+"para proteger criptogrÃ¡ficamente la conexiÃ³n. Pregunte a su administrador "
+"de sistemas si sus servidores LDAP usan estos protocolos."
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Objectclasses"
 msgstr "Objectclasses"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Objectclasses Used in Evolution:"
-msgstr "Objectclasses usadas en Evolution"
+msgstr "Objectclasses Usadas en Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Objectclasses Used on Server:"
-msgstr "Objectclasses usadas en el Servidor"
+msgstr "Objectclasses Usadas en el Servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
 "Please select an Evolution attribute and an\n"
 "LDAP attribute to associate with it."
 msgstr ""
 "Por favor, seleccione un atributo de Evolution y un \n"
-"atributo del LDAP para asociarlos entre sí."
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Por favor, seleccione un atributo de Evolution y un\n"
-"atributo de LDAP con el que asociarlo"
+"atributo del LDAP para asociarlos entre sÃ."
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 msgid "R_estore Defaults"
-msgstr "Predeterminados"
+msgstr "_Predeterminados"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Re_store Defaults"
-msgstr "Predeterminados"
+msgstr "_Predeterminados"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
 msgid "S_earch scope: "
-msgstr "Ámbito de bú_squeda: "
+msgstr "Alcance de la bÃº_squeda: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1663
+#: calendar/gui/e-week-view.c:1186
 msgid "Searching"
 msgstr "Buscando"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
 #: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Select"
 msgstr "Seleccionar"
@@ -1022,7 +1076,7 @@ msgid ""
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
-"El selecionar esta opción significa que Evolution sólo conectará a sus "
+"El seleccionar esta opciÃ³n significa que Evolution sÃ³lo conectarÃ¡ a sus "
 "servidores LDAP si\n"
 "sus servidores LDAP soportan SSL o TLS."
 
@@ -1036,11 +1090,11 @@ msgid ""
 "is already\n"
 "secure."
 msgstr ""
-"Selecionar esta opción significa que Evolution sólo intentará usar SSL/TLS si "
-"está en un\n"
-"entorno inseguro. Por ejemplo, si usted y su servidor LDAP están tras un "
+"Seleccionar esta opciÃ³n significa que Evolution sÃ³lo intentarÃ¡ usar SSL/TLS "
+"si estÃ¡ en un\n"
+"entorno inseguro. Por ejemplo, si usted y su servidor LDAP estÃ¡n tras un "
 "cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS porque "
-"su conexión ya es segura."
+"su conexiÃ³n ya es segura."
 
 #: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
@@ -1050,10 +1104,10 @@ msgid ""
 "to security\n"
 "exploits. "
 msgstr ""
-"El seleccionar esta opción significa que su servidor no soporta ni SSL ni "
+"El seleccionar esta opciÃ³n significa que su servidor no soporta ni SSL ni "
 "TLS. Esto\n"
-"significa que su conexión será insegura, y que usted será vulnerable a fallos "
-"de seguridad."
+"significa que su conexiÃ³n serÃ¡ insegura, y que usted serÃ¡ vulnerable a "
+"fallos de seguridad."
 
 #: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
@@ -1061,53 +1115,43 @@ msgid ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Seleccionando esta opción se le permitirá cambiar la configuración "
+"Seleccionando esta opciÃ³n se le permitirÃ¡ cambiar la configuraciÃ³n "
 "predeterminada de Evolution para consultas LDAP\n"
 "y para crear y editar contactos."
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-"Seleccionando esta opción se le permitirá cambiar la configuración "
-"predeterminada de Evolution para consultas LDAP, y para crear y editar "
-"contactos."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
-msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
-"Especificar un nombre para mostrar es el último paso requerido para "
+"Especificar un nombre para mostrar es el Ãºltimo paso requerido para "
 "configurar un servidor LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Step 1: Server Information"
-msgstr "Paso 1 Información del Servidor"
+msgstr "Paso 1 InformaciÃ³n del Servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Step 2: Connecting to Server"
-msgstr "Paso 2. Conectando al servidor..."
+msgstr "Paso 2. Conectando al Servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 3: Searching the Directory"
-msgstr "Paso 3. Localizando el Directorio"
+msgstr "Paso 3. Buscando el Directorio"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 4: Display Name"
 msgstr "Paso 4. Mostrando el Nombre"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Supported Search Bases"
-msgstr "Bases de Búsqueda Soportadas"
+msgstr "Bases de BÃºsqueda Soportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and your "
 "log in\n"
@@ -1115,51 +1159,51 @@ msgid ""
 "information."
 msgstr ""
 "El primer paso en configurar un servidor LDAP es proporcionar su nombre, y su "
-"información\n"
-"de inicio de sesión. Por favor pregunte a su administrador de sistemas si no "
-"está seguro de esta información."
+"informaciÃ³n\n"
+"de inicio de sesiÃ³n. Por favor pregunte a su administrador de sistemas si no "
+"estÃ¡ seguro de esta informaciÃ³n."
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The options on this page control how many entries should be included in your\n"
 "searches, and how long a search should take. Ask your system administrator if "
 "you\n"
 "need to change these options."
 msgstr ""
-"Las opciones de esta página controlan cómo muchas entradas deberían ser\n"
-"incluidas en sus búsquedas, y cuánto tiempo debería tomar una búsqueda. "
+"Las opciones de esta pÃ¡gina controlan cÃ³mo muchas entradas deberÃan ser\n"
+"incluidas en sus bÃºsquedas, y cuÃ¡nto tiempo deberÃa tomar una bÃºsqueda. "
 "Pregunte a su administrador de sistemas si\n"
 "necesita cambias estas opciones."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 msgstr ""
-"La base de Búsqueda es el nombre distintivo (ND) de la entrada donde las "
-"búsquedas empezarán.\n"
-"Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
+"La base de BÃºsqueda es el nombre distintivo (ND) de la entrada donde las "
+"bÃºsquedas empezarÃ¡n.\n"
+"Si deja esto en blanco, la bÃºsqueda empezarÃ¡ en la raÃz del Ã¡rbol de "
 "directorios."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below your "
 "search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
-"El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda se "
-"extienda a lo \n"
-"largo de un árbol de directorios. Un ámbito de búsqueda de \"sub\" incluirá "
-"todas las entradas \n"
-"por debajo se la base de búsqueda. Un ámbito de \"uno\" sólo incluirá las "
-"entradas bajo su base."
-
-#: addressbook/gui/component/ldap-config.glade.h:85
+"El Ã¡mbito de bÃºsqueda define hasta quÃ© profundidad desea que la bÃºsqueda "
+"se extienda a lo \n"
+"largo de un Ã¡rbol de directorios. Un Ã¡mbito de bÃºsqueda de Â«subÂ» "
+"incluirÃ¡ todas las entradas \n"
+"por debajo se la base de bÃºsqueda. Un Ã¡mbito de Â«unoÂ» sÃ³lo incluirÃ¡ las "
+"entradas bajo su base.\n"
+
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1168,67 +1212,67 @@ msgid ""
 "about the server. Please contact your system administrator if you \n"
 "need help finding this information."
 msgstr ""
-"Este asistente le ayudarña a acceder a servicios de directorio en línea "
+"Este asistente le ayudarÃ¡ a acceder a servicios de directorio en lÃnea "
 "usando\n"
 "servidores LDAP (Lightweight Directory Access Protocol).\n"
 "\n"
-"Añadir un servidor LDAP nuevo requiere algo de información especializada "
+"AÃ±adir un servidor LDAP nuevo requiere algo de informaciÃ³n especializada "
 "sobre\n"
 "el servidor. Por favor, contacte con su administrador de sistemas si necesita "
 "ayuda\n"
-"encontrando esta información."
+"encontrando esta informaciÃ³n."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:90
 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.micompañia.com\"."
+"Â«ldap.micompaÃ±ia.comÂ»."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "\ntoo large will slow down your addressbook."
 msgstr ""
-"Este es el máximo número de entradas a descargar.  Si pone este número "
-"demasiado alto relentizará su agenda."
+"Este es el mÃ¡ximo nÃºmero de entradas a descargar.  Si pone este nÃºmero "
+"demasiado alto ralentizarÃ¡ su agenda."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that setting "
 "this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr ""
-"Este es el método que usará evolution para autenticarse.  Note que "
-"configurarlo como \"Dirección de Correo\" requiere acceso anónimo a su "
+"Este es el mÃ©todo que usarÃ¡ evolution para autenticarse.  Note que "
+"configurarlo como Â«DirecciÃ³n de CorreoÂ» requiere acceso anÃ³nimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Este nombre será usado para identificar este servidor, Es sólo para poder "
+"Este nombre serÃ¡ usado para identificar este servidor, Es sÃ³lo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "\nlist of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
-"Este es el puerto del servidor LDAP al que Evolution intentará conectarse. "
-"Se\nUna ha proporcionado una lista de puertos estándar. Pregunte a su "
+"Este es el puerto del servidor LDAP al que Evolution intentarÃ¡ conectarse. "
+"Se\n"
+"Una ha proporcionado una lista de puertos estÃ¡ndar. Pregunte a su "
 "administrador del\n"
-"sistema qué puerto debería especificar."
+"sistema quÃ© puerto deberÃa especificar."
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "This option controls how long a search will be run."
-msgstr ""
-"Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+msgstr "Esta opciÃ³n controla durante cuÃ¡nto tiempo va a efectuarse una bÃºsqueda."
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1236,78 +1280,74 @@ msgid ""
 "contacts\n"
 "that you add to the directory on the LDAP server. "
 msgstr ""
-"Para añadir un atributo al ND, selecciónelo de la lista y pulse el botón "
-"\"Añadir Atributo\". Cualquier valor que añada al ND se convertirá en valores "
-"requeridos para cualquier contacto nuevo que añada al directorio en el "
-"servidor LDAP."
+"Para aÃ±adir un atributo al ND, selecciÃ³nelo de la lista y pulse el botÃ³n "
+"Â«AÃ±adir AtributoÂ». Cualquier valor que aÃ±ada al ND se convertirÃ¡ en "
+"valores requeridos para cualquier contacto nuevo que aÃ±ada al directorio en "
+"el servidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "U_se SSL/TLS:"
 msgstr "Usar SSL/TLS:"
 
-# src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre Distintivo (ND)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using email address"
-msgstr "Usando dirección de correo"
+msgstr "Usando direcciÃ³n de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:106
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:131
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:107
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:134 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
-msgstr "_Añadir"
+msgstr "_AÃ±adir"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Add ->"
-msgstr "_Añadir ->"
+msgstr "_AÃ±adir ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add Mapping"
-msgstr "Añadir planificación"
+msgstr "AÃ±adir _PlanificaciÃ³n"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add to DN"
-msgstr "Añadir a ND"
+msgstr "AÃ±a_dir a ND"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Always"
 msgstr "_Siempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Delete Mapping"
-msgstr "_Borrar planificación"
+msgstr "_Borrar planificaciÃ³n"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Display name:"
 msgstr "_Mostrar nombre:"
 
-# src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Distinguished Name (DN):"
-msgstr "Nombre Distintivo (ND):"
+msgstr "Nombre _Distintivo (ND):"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Don't use SSL/TLS"
 msgstr "_No usar SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Download limit:"
-msgstr "Límite de _descarga:"
+msgstr "LÃmite de _Descarga:"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-undo-signal-handlers.c:174
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:117 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1316,159 +1356,173 @@ msgstr "Límite de _descarga:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Edit Mapping"
-msgstr "_Editar planificación"
+msgstr "_Editar PlanificaciÃ³n"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Evolution attribute:"
 msgstr "Atributo de _Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_If necessary "
-msgstr "Si es necesario"
+msgstr "Si es _necesario"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_LDAP attribute:"
-msgstr "atributo LDAP"
+msgstr "atributo _LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attributes:"
 msgstr "atributos _LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_Log in method:"
-msgstr "Método de Inicio de sesión:"
+msgstr "MÃ©todo de _Inicio de sesiÃ³n:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_More Options >>"
-msgstr "_Más Opciones >>"
+msgstr "_MÃ¡s Opciones >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_Port number:"
-msgstr "Número de _Puerto:"
+msgstr "NÃºmero de _Puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Restore Defaults"
-msgstr "Volver a ajustes p_redeterminados"
+msgstr "P_redeterminados"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Search base:"
-msgstr "Base de _búsqueda:"
+msgstr "Base de _bÃºsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Server name:"
-msgstr "Nombre del _servidor:"
+msgstr "Nombre del _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Timeout (minutes):"
-msgstr "Tiempo de expiración (minutos)"
+msgstr "Tiempo de expiraciÃ³n (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "account-druid"
-msgstr "ayudante-de-cuentas"
+msgstr "account-druid"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-editor"
-msgstr "editor-de-cuentas"
+msgstr "account-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "connecting-tab"
-msgstr "Conexión"
+msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "dn-customization-tab"
-msgstr ""
+msgstr "dn-customization-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "edit_server_window_simple"
-msgstr ""
+msgstr "edit_server_window_simple"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "general-tab"
-msgstr "General"
+msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "mappings-tab"
-msgstr "Planificaciones"
+msgstr "mapings-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "objectclasses-tab"
-msgstr ""
+msgstr "objectclassses-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "searching-tab"
-msgstr "Búsqueda"
+msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaz de Evolution de selección de nombre de la agenda."
+#: addressbook/gui/component/select-names/e-select-names.c:494
+msgid "Select Contacts from Addressbook"
+msgstr "Seleccionas contactos de la Agenda"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factoría para la interfaz de selección de nombre de la Agenda"
+#: addressbook/gui/component/select-names/e-select-names.c:554
+msgid "Find contact in"
+msgstr "Encontrar contacto en"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names.c:687
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
+#: composer/e-msg-composer-attachment-bar.c:501
+#: my-evolution/e-summary-shown.c:536 shell/e-shortcuts-view.c:179
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
 msgid "Remove All"
 msgstr "Quitar Todas"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
 msgid "Send HTML Mail?"
-msgstr "¿Enviar correo en HTML?"
+msgstr "Â¿Enviar correo en HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+#: addressbook/gui/component/select-names/e-select-names-popup.c:400
 msgid "Edit Contact List"
 msgstr "Editar lista de contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:418
 msgid "Unnamed Contact List"
-msgstr "Lista de contactos anónimos"
+msgstr "Lista de contactos anÃ³nima"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
+#: addressbook/gui/component/select-names/e-select-names-popup.c:435
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d no mostrado)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:501
 msgid "Unnamed Contact"
-msgstr "Contactos anónimos"
+msgstr "Contactos AnÃ³nimos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-msgid "Select Contacts from Addressbook"
-msgstr "Seleccionas contactos de la agenda"
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Fuente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
-msgid "Find contact in"
-msgstr "Encotrar contacto en"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaz de Evolution de selecciÃ³n de nombre de la agenda."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "FÃ¡brica para la interfaz de selecciÃ³n de nombre de la Agenda"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Selected Contacts:"
-msgstr "Contactos Selecionados:"
+msgid "Find"
+msgstr "Buscar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Show Contacts"
-msgstr "Mostar contactos"
+msgid "Select Names"
+msgstr "_Seleccionar Nombres"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Selected Contacts:"
+msgstr "Contactos Seleccionados:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show Contacts"
+msgstr "Mostrar Contactos"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
@@ -1476,11 +1530,11 @@ msgstr ""
 "Teclee un nombre en la entrada o\n"
 "seleccione uno de la lista inferior:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
-msgstr "_Categoría:"
+msgstr "_CategorÃa:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Carpeta:"
 
@@ -1490,7 +1544,7 @@ msgstr "Nombre del _secretario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "Add_ress..."
-msgstr "_Dirección..."
+msgstr "_DirecciÃ³n..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Anni_versary:"
@@ -1498,7 +1552,7 @@ msgstr "Ani_versario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Birthda_y:"
-msgstr "Fecha de _nacimiento:"
+msgstr "CumpleaÃ±os:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "C_ontacts..."
@@ -1508,24 +1562,24 @@ msgstr "_Contactos..."
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+msgstr "Ca_tegorÃas..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
-msgstr "Colaboración"
+msgstr "ColaboraciÃ³n"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1424
 msgid "Contact Editor"
-msgstr "Editor de contactos"
+msgstr "Editor de Contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:191
 msgid "Details"
 msgstr "Detalles"
 
@@ -1535,11 +1589,11 @@ msgstr "URL de _disponibilidad:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
-msgstr "Archivar c_omo:"
+msgstr "Archivar C_omo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Full _Name..."
-msgstr "_Nombre completo..."
+msgstr "_Nombre Completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
@@ -1547,13 +1601,13 @@ msgid ""
 "Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"Si esta persona publica información de disponibilidad u otra información de "
+"Si esta persona publica informaciÃ³n de disponibilidad u otra informaciÃ³n de "
 "agenda en Internet, escribe\n"
-"aquí la dirección de esa información."
+"aquÃ la direcciÃ³n de esa informaciÃ³n."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
-msgstr "Nuevo tipo de teléfono"
+msgstr "Nuevo tipo de telÃ©fono"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
@@ -1561,23 +1615,23 @@ msgstr "No_tas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
-msgstr "Organi_zación:"
+msgstr "Organi_zaciÃ³n:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "P_rofession:"
-msgstr "_Profesión:"
+msgstr "_ProfesiÃ³n:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
-msgstr "Tipos de teléfono"
+msgstr "Tipos de telÃ©fono"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "S_pouse:"
-msgstr "_Cónyuge:"
+msgstr "_CÃ³nyuge:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "This is the _mailing address"
-msgstr "És_ta es la dirección de correo"
+msgstr "ÃƒÂ‰s_ta es la direcciÃ³n de correo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
@@ -1585,13 +1639,13 @@ msgstr "Prefiere recibir el correo como _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: calendar/gui/dialogs/meeting-page.c:652 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3501
+#: filter/filter.glade.h:15 mail/folder-browser.c:1770
+#: mail/mail-config.glade.h:147 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1601,11 +1655,11 @@ msgstr "_Puesto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
-msgstr "Nombre del _encargado:"
+msgstr "Nombre del _Jefe:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
-msgstr "Nick:"
+msgstr "_Apodo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
@@ -1613,1245 +1667,1296 @@ msgstr "_Oficina:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
-msgstr "URL del agenda _público:"
+msgstr "URL de Calendario _pÃºblico:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Web page address:"
-msgstr "Dirección de la página _web:"
+msgstr "DirecciÃ³n de la pÃ¡gina _web:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
+#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard-label.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:472
+#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+msgid "Editable"
+msgstr "Editable"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
-msgstr "Afganistán"
+msgstr "AfganistÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Argelia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
-msgstr "Antártico"
+msgstr "AntÃ¡rtida"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua y Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
-msgstr "Azerbayán"
+msgstr "AzerbayÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
-msgstr "Bélgica"
+msgstr "BÃ©lgica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia y Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Isla Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
-msgstr "Territorios británicos en el océano Índico"
+msgstr "Territorios britÃ¡nicos en el ocÃ©ano Indico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Camboya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
-msgstr "Camerún"
+msgstr "CamerÃºn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
-msgstr "Canadá"
+msgstr "CanadÃ¡"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
-msgstr "Islas Caimán"
+msgstr "Islas CaimÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
-msgstr "República Central Africana"
+msgstr "RepÃºblica Central Africana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
-msgstr "Isla Navidad"
+msgstr "Isla Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Isla Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
-msgstr "Comoros"
+msgstr "Comores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Islas Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croacia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
-msgstr "República Checa"
+msgstr "RepÃºblica Checa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
-msgstr "República Dominicana"
+msgstr "RepÃºblica Dominicana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
-msgstr "Etiopía"
+msgstr "EtiopÃa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Islas Malvinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Islas Feroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guinea Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Territorios Sur Franceses"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
-msgstr "Gabón"
+msgstr "GabÃ³n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
-msgstr "Gana"
+msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Granada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
-msgstr "Haití"
+msgstr "HaitÃ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Islas Heard y McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
-msgstr "Hungría"
+msgstr "HungrÃa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
-msgstr "Japón"
+msgstr "JapÃ³n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
-msgstr "Kazajistán"
+msgstr "KazajistÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
-msgstr "República de Corea"
+msgstr "RepÃºblica de Corea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
-msgstr "Líbano"
+msgstr "LÃbano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
-msgstr "México"
+msgstr "MÃ©xico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
-msgstr "República Moldava"
+msgstr "RepÃºblica Moldava"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
-msgstr "Mónaco"
+msgstr "MÃ³naco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marruecos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Nueva Zelanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
-msgstr "Níger"
+msgstr "NÃger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Islas Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Islas al Noreste de Mariana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Noruega"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
-msgstr "Omán"
+msgstr "OmÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
-msgstr "Pakistán"
+msgstr "PakistÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Territorios palestinos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
-msgstr "Panamá"
+msgstr "PanamÃ¡"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Nueva Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
-msgstr "Perú"
+msgstr "PerÃº"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Quatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
-msgstr "Reunión"
+msgstr "ReuniÃ³n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
-msgstr "Rumanía"
+msgstr "RumanÃa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
-msgstr "Federación Rusa"
+msgstr "FederaciÃ³n Rusa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Sant Kitts y Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Sant Vincente y The Grena-dines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
-msgstr "Santo Tomé y Príncipe"
+msgstr "Santo TomÃ© y PrÃncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
-msgstr "Arabia Saudí"
+msgstr "Arabia SaudÃ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
-msgstr "Islas Salomón"
+msgstr "Islas SalomÃ³n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
-msgstr "Sudáfrica"
+msgstr "SudÃ¡frica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgia del Sur y las Islas Sandwich Meridionales"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
-msgstr "España"
+msgstr "EspaÃ±a"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre y Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
-msgstr "Sudán"
+msgstr "SudÃ¡n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
-msgstr "Surinám"
+msgstr "SurinÃ¡m"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Islas Svalbard y Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Suecia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
-msgstr "Tanzania; República Unida de"
+msgstr "Tanzania; RepÃºblica Unida de"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tailanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad y Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
-msgstr "Túnez"
+msgstr "TÃºnez"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
-msgstr "Turquía"
+msgstr "TurquÃa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Islas Turks y Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ucrania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
-msgstr "Emiratos Árabes Unidos"
+msgstr "Emiratos Arabes Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
-msgstr "Islas Vírgenes, Británicas"
+msgstr "Islas VÃrgenes, BritÃ¡nicas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
-msgstr "Islas Vírgenes, U.S."
+msgstr "Islas VÃrgenes, U.S."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Islas Wallis y Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Seguro que quiere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "¿Borrar contacto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:141
+#: addressbook/gui/widgets/e-addressbook-model.c:297
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-minicard-view.c:458
+#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+msgid "Book"
+msgstr "Libro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:164
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:148
+#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+msgid "Card"
+msgstr "Tarjeta"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:171
+msgid "Is New Card"
+msgstr "Es Tarjeta Nueva"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+msgid "Writable Fields"
+msgstr "Campos Editables"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:192
+msgid "Changed"
+msgstr "Modificados"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:868
 msgid "Category editor not available."
-msgstr "No hay un editor de categorías disponible."
+msgstr "No hay un editor de categorÃas disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:877
 msgid "This contact belongs to these categories:"
-msgstr "Este contacto pertenece a estas categorías:"
+msgstr "Este contacto pertenece a estas categorÃas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1091
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1137
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar estos\n"
+" contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1140
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Â¿Seguro que quiere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1144
+#: addressbook/gui/widgets/e-addressbook-view.c:846 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:222 shell/e-shell-folder-commands.c:407
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Suprimir"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1853
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2461
 #, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr "No pude encontrar el widget para el campo: `%s'"
+msgstr "No se ha podido encontrar el widget para el campo: Â«%sÂ»"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "Contact Quick-Add"
-msgstr "Añadir Contacto Rápido"
+msgstr "AÃ±adir Contacto RÃ¡pido"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:303
 msgid "Edit Full"
 msgstr "Editar Todo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Nombre Completo"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "E-mail"
-msgstr "Correo electrónico"
+msgstr "Correo electrÃ³nico"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Error guardando %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:211
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 "%s ya existe\n"
-"¿Quiere sobreescribirlo?"
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr "Confirmar Sobreescritura"
+"Â¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr "No importa traducir esta cadena. No se usa."
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:214
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
-msgstr "Dirección _2:"
+msgstr "DirecciÃ³n _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
-msgstr "Comprobar Dirección"
+msgstr "Comprobar DirecciÃ³n"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
-msgstr "P_aís:"
+msgstr "P_aÃs:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
-msgstr "_Dirección:"
+msgstr "_DirecciÃ³n:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
-msgstr "_Apartado de correos"
+msgstr "_Apdo. de correos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
-msgstr "Código _Postal"
+msgstr "CÃ³digo _Postal"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
-msgstr "Comprobar nombre completo"
+msgstr "Comprobar Nombre Completo"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
-msgstr "Júnior"
+msgstr "Hijo"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
-msgstr "Señorita"
+msgstr "SeÃ±orita"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Sra."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Sta."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
-msgstr "Señor"
+msgstr "SeÃ±or"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Nombre:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Apellido:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
-msgstr "_2º Nombre:"
+msgstr "_2Âº Nombre:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
-msgstr "_Título:"
+msgstr "_TÃtulo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "List _name:"
 msgstr "_Nombre de la lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Miembros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Type an email address or drag a contact into the list below:"
-msgstr ""
-"Escriba una dirección de correo o arrastre un contacto a la lista inferior"
+msgstr "Escriba una direcciÃ³n de correo o arrastre un contacto a la lista inferior"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al mandar correo a esta lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
-msgstr "editor-de-listas-de-contactos"
+msgstr "contact-list-editor"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:155
+msgid "Is New List"
+msgstr "Es una lista nueva"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:241
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:455
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2861,7 +2966,7 @@ msgstr "Contactos"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
-msgstr "Añadir de todos modos"
+msgstr "AÃ±adir de todos modos"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
@@ -2881,8 +2986,8 @@ 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 de este contacto ya existe\n"
-"en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"El nombre o la direcciÃ³n de correo de este contacto ya existe\n"
+"en esta carpeta.  Â¿Quiere aÃ±adirlo de todos modos?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Change Anyway"
@@ -2890,7 +2995,7 @@ msgstr "Cambiar de todos modos"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
-msgstr "Contactos modificados:"
+msgstr "Contact modificado:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
@@ -2901,56 +3006,59 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"La dirección o el nombre modificados de este contacto\n"
-"ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"La direcciÃ³n o el nombre modificados de este contacto\n"
+"ya existen en esta carpeta.  Â¿Quiere aÃ±adirlo de todos modos?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:150
 msgid "Advanced Search"
-msgstr "Búsqueda avanzada"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/websearch/ntl-web-search.c:164
-# libnautilus-private/nautilus-global-preferences.c:276
-# src/nautilus-window-toolbars.c:144
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Buscar"
+msgstr "BÃºsqueda avanzada"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:155
 msgid "No cards"
 msgstr "Sin tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:158
 msgid "1 card"
 msgstr "1 tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d cards"
 msgstr "%d tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
+#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: addressbook/gui/widgets/e-minicard-view.c:465
+#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+msgid "Query"
+msgstr "Consulta"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:441
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:369
+msgid "Model"
+msgstr "Modelo"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-minicard.c:511
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: shell/evolution-shell-component.c:1153
 msgid "Success"
-msgstr "Éxito"
+msgstr "Ã‰xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2094
+#: shell/e-storage.c:606 shell/evolution-shell-component.c:1192
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2958,8 +3066,8 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
+#: shell/evolution-shell-component.c:1183
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2976,10 +3084,10 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2298
+#: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:436
 #: camel/providers/pop3/camel-pop3-store.c:513
@@ -2988,15 +3096,15 @@ msgstr "Cancelado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Authentication Failed"
-msgstr "Fallo en la autenticación"
+msgstr "Fallo en la autenticaciÃ³n"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Required"
-msgstr "Autenticación requerida"
+msgstr "AutenticaciÃ³n Requerida"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "TLS not Available"
-msgstr "TLS no disponible"
+msgstr "TLS no Disponible"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Addressbook does not exist"
@@ -3006,188 +3114,173 @@ msgstr "La libreta de direcciones no existe"
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
-#: calendar/gui/dialogs/save-comp.c:50
+#: addressbook/gui/widgets/e-addressbook-util.c:74
+#: calendar/gui/dialogs/save-comp.c:49
 msgid "Do you want to save changes?"
-msgstr "¿Desea guardar los cambios?"
+msgstr "Â¿Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error adding list"
-msgstr "Error añadiendo lista"
+msgstr "Error aÃ±adiendo lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:271
 msgid "Error adding card"
-msgstr "Error añadiendo tarjeta"
+msgstr "Error aÃ±adiendo tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:104
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:114
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:1609
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "¿Mostrar Tarjetas?"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "Mostrar Tarjetas"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:196
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
-"Abrir %d tarjetas abrirá %d ventanas nuevas también.\n"
-"¿Quiere realmente mostrar todas estas tarjetas?"
+"Abrir %d tarjetas abrirÃ¡ %d ventanas nuevas tambiÃ©n.\n"
+"Â¿Quiere realmente mostrar todas estas tarjetas?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:327
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:332
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:185
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:379
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:830
+#: addressbook/gui/widgets/e-addressbook-view.c:1737
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:817
 msgid "New Contact..."
-msgstr "Contacto Nuevo"
+msgstr "Contacto Nuevo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "New Contact List..."
-msgstr "Nueva lista de contactos..."
+msgstr "Lista de contactos nueva..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:821
 msgid "Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:824
 msgid "Search for Contacts..."
 msgstr "Bu_scar contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:825
 msgid "Addressbook Sources..."
 msgstr "Fuentes de la Agenda..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 msgid "Pilot Settings..."
-msgstr "_Configuración del Pilot..."
+msgstr "_ConfiguraciÃ³n del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:831
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
-#
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:832
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Copy to folder..."
 msgstr "Copiar a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Move to folder..."
 msgstr "_Mover a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "Suprimir"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3466
 msgid "Current View"
-msgstr "_Vista actual"
+msgstr "_Vista Actual"
 
 #. Minicard view stuff
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,Ã±,o,p,q,r,s,t,u,v,w,x,y,z"
 
 #. Translators: put here a list of characters that correspond to buttons
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,Ã±,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1296
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3196,81 +3289,120 @@ msgid ""
 msgstr ""
 "El soporte de la libreta de direcciones para\n"
 "%s\n"
-"ha fallado. Tendrá que reiniciar Evolution para usarlo de nuevo"
+"ha fallado. TendrÃ¡ que reiniciar Evolution para usarlo de nuevo"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "* Click here to add a contact *"
-msgstr "* Pulse aquí para añadir un contacto *"
+msgstr "* Pulse aquÃ para aÃ±adir un contacto *"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Assistant Phone"
-msgstr "Teléfono del asistente"
+msgstr "TelÃ©fono del secretario"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Address"
-msgstr "Dirección del trabajo"
+msgstr "DirecciÃ³n del trabajo"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Business Phone"
-msgstr "Teléfono del trabajo"
+msgstr "TelÃ©fono del trabajo"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Business Phone 2"
-msgstr "Teléfono del trabajo 2"
+msgstr "TelÃ©fono del trabajo 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Callback Phone"
-msgstr "Teléfono para rellamadas"
+msgstr "TelÃ©fono para rellamadas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Car Phone"
-msgstr "Teléfono del coche"
+msgstr "TelÃ©fono del coche"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
-msgstr "Teléfono de la compañía"
+msgstr "TelÃ©fono de la compaÃ±Ãa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Address"
-msgstr "Dirección de su casa"
+msgstr "Domicilio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone"
-msgstr "Teléfono de casa"
+msgstr "TelÃ©fono de casa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Home Phone 2"
-msgstr "Teléfono de casa 2"
+msgstr "TelÃ©fono de casa 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Mobile Phone"
-msgstr "Teléfono móvil"
+msgstr "TelÃ©fono mÃ³vil"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Address"
-msgstr "Otra dirección"
+msgstr "Otra direcciÃ³n"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Other Phone"
-msgstr "Otro teléfono"
+msgstr "Otro telÃ©fono"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "Primary Phone"
-msgstr "Teléfono principal"
+msgstr "TelÃ©fono principal"
+
+#: addressbook/gui/widgets/e-minicard.c:138
+#: addressbook/gui/widgets/e-minicard-label.c:102
+msgid "Width"
+msgstr "Ancho"
+
+#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard-label.c:109
+msgid "Height"
+msgstr "Alto"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:116
+msgid "Has Focus"
+msgstr "Tiene el foco"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Selected"
+msgstr "Seleccionado"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard.c:168
+msgid "Has Cursor"
+msgstr "Tiene el cursor"
+
+#: addressbook/gui/widgets/e-minicard-control.c:203
 #, c-format
 msgid "and %d other cards."
 msgstr "y otras %d tarjetas."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:205
 msgid "and one other card."
-msgstr "y una tarjeta más."
+msgstr "y una tarjeta mÃ¡s."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:319
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
+#: addressbook/gui/widgets/e-minicard-label.c:123
+msgid "Field"
+msgstr "Campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:130
+msgid "Field Name"
+msgstr "Nombre del campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:137
+msgid "Text Model"
+msgstr "Modelo del texto"
+
+#: addressbook/gui/widgets/e-minicard-label.c:144
+msgid "Max field name length"
+msgstr "Longitud mÃ¡x. del campo"
+
 #: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
@@ -3283,7 +3415,7 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista.\n"
 "\n"
-"Pulse dos veces aquí para crear un contacto nuevo."
+"Pulse dos veces aquÃ para crear un contacto nuevo."
 
 #: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
@@ -3295,24 +3427,32 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:451
+msgid "Adapter"
+msgstr "Adaptador"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+msgid "Column Width"
+msgstr "Ancho de columna"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:23
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1118
 msgid "Print cards"
 msgstr "Imprimir tarjetas"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1180
+#: addressbook/printing/e-contact-print.c:1202
 msgid "Print card"
 msgstr "Imprimir tarjeta"
 
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3323,7 +3463,7 @@ msgstr "8 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
-msgstr "Formularios vacíos al final:"
+msgstr "Formularios vacÃos al final:"
 
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
@@ -3331,7 +3471,7 @@ msgstr "Cuerpo"
 
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
-msgstr "Pie:"
+msgstr "Inferior:"
 
 #: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
@@ -3339,13 +3479,11 @@ msgstr "Dimensiones:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "Tipo de _letra..."
+msgstr "_TipografÃa..."
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:216
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
-msgstr "Tipos de letra"
+msgstr "TipografÃas"
 
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
@@ -3365,11 +3503,11 @@ msgstr "Cabecera/Pie"
 
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
-msgstr "Títulos"
+msgstr "TÃtulos"
 
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
-msgstr "Títulos para cada carta"
+msgstr "TÃtulos para cada carta"
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
@@ -3377,14 +3515,14 @@ msgstr "Alto:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
-msgstr "Uno inmediatamente detrás del otro"
+msgstr "Uno inmediatamente detrÃ¡s del otro"
 
 #: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Incluye:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
+#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -3394,33 +3532,33 @@ msgstr "Izquierda:"
 
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
-msgstr "Las pestañas con las letras a la derecha"
+msgstr "Las pestaÃ±as del Ãndice a la derecha"
 
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
-msgstr "Márgenes"
+msgstr "MÃ¡rgenes"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr "Número de columnas:"
+msgstr "NÃºmero de columnas:"
 
 #: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opciones"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
+#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
-msgstr "Orientación"
+msgstr "OrientaciÃ³n"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
-msgstr "Página"
+msgstr "PÃ¡gina"
 
 #: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
-msgstr "Configuración de la página:"
+msgstr "ConfiguraciÃ³n de la pÃ¡gina:"
 
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
@@ -3432,7 +3570,7 @@ msgstr "Fuente del papel:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
+#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3446,7 +3584,7 @@ msgstr "Imprimir usando escala de grises"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
-msgstr "Reverso en páginas impares"
+msgstr "Reverso en pÃ¡ginas impares"
 
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
@@ -3458,17 +3596,15 @@ msgstr "Secciones:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
-msgstr "Oscureciendo"
+msgstr "Escala de grises"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1100
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
-msgstr "Tamaño:"
+msgstr "TamaÃ±o:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
-msgstr "Comenzar en una nueva página"
+msgstr "Comenzar en una nueva pÃ¡gina"
 
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
@@ -3478,8 +3614,6 @@ msgstr "Nombre del estilo:"
 msgid "Top:"
 msgstr "Encabezado:"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1094
 #: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Tipo:"
@@ -3490,41 +3624,41 @@ msgstr "Ancho:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "_Tipo de letra..."
+msgstr "_TipografÃa..."
 
-#: calendar/cal-util/cal-component.c:1218
+#: calendar/cal-util/cal-component.c:1216
 msgid "Untitled appointment"
-msgstr "Cita sin título"
+msgstr "Cita sin tÃtulo"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:749
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
+#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:748
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:747
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:519
 #: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Sin definir"
 
 #: calendar/conduits/calendar/calendar-conduit.c:205
 msgid "Split Multi-Day Events:"
-msgstr "Dividir Eventos de Días Múltiples:"
+msgstr "Dividir eventos de dÃas mÃºltiples:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1225
 #: calendar/conduits/todo/todo-conduit.c:835
@@ -3534,7 +3668,7 @@ msgstr "Error mientras me comunicaba con el servidor de agenda"
 #: calendar/conduits/calendar/calendar-conduit.c:1372
 #: calendar/conduits/calendar/calendar-conduit.c:1375
 msgid "Could not read pilot's Calendar application block"
-msgstr "No pude leer información de la aplicación de agenda del pilot"
+msgstr "No se ha podido leer informaciÃ³n de la aplicaciÃ³n de calendario del Pilot"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
@@ -3543,82 +3677,25 @@ msgstr "Prioridad predeterminada:"
 #: calendar/conduits/todo/todo-conduit.c:951
 #: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
-msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Un control bonobo que muestra una lista de tareas."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un control bonobo de ejemplo que muestra un agenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Agenda y Tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Control de configuración del Calendario de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Agenda y Lista de Tareas aqui"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visor del agenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Componente de Evolution para manejar el agenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr "Factoría para el control de tareas de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Factoría para el control de vista de agenda iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Factoría para el control del Calendario de ejemplo"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Factoría para centralizar el componente del editor de diálogos del agenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Factoría para crear el componente del editor"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Servicio de notificación de alarmas"
+msgstr "No se pudo leer los datos de la aplicaciÃ³n ToDo del Pilot"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Factoría para la alarma del servicio de notificación"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Comenzando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Finalizando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
-msgstr "tiempo no válido"
+msgstr "tiempo no vÃ¡lido"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Alarma de Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas en %s"
@@ -3630,39 +3707,39 @@ msgstr "_Cerrar"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
-msgstr "_Recordar"
+msgstr "_Zumbido"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
-msgstr "Tiempo de recordatorio (minutos)"
+msgstr "Tiempo de alarma zumbadora (minutos)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:679
 msgid "No description available."
-msgstr "No hay descripción disponible."
+msgstr "No hay descripciÃ³n disponible."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:765
+#: calendar/gui/tasks-control.c:455 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Advertencia"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:745
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"Evolution todavía no implementa recordatorios del agenda\n"
-"con notificación de correo, pero este recordatorio fue\n"
+"Evolution todavÃa no implementa recordatorios del agenda\n"
+"con notificaciÃ³n de correo, pero este recordatorio fue\n"
 "configurado para enviar un mensaje de correo.  En su lugar\n"
-"Evolution mostrará un diálogo de recordatorio normal."
-
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advertencia"
+"Evolution mostrarÃ¡ un diÃ¡logo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:771
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3672,323 +3749,331 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Va a saltar un recordatorio de agenda de Evolution. Este recordatorio está "
+"Va a saltar un recordatorio de agenda de Evolution. Este recordatorio estÃ¡ "
 "configurado para ejecutar el siguiente programa:\n"
 "\n"
 "        %s\n"
 "\n"
-"¿Está seguro que quiere ejecutar este programa?"
+"Â¿EstÃ¡ seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:785
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "No se puede inicializar GNOME"
-
-#: calendar/gui/alarm-notify/notify-main.c:184
-msgid "Could not create the alarm notify service factory"
-msgstr "No pude crear la factoría del servicio de la alarma de notificación"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "El resumen contiene"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:1
+msgid "Alarm notification service"
+msgstr "Servicio de notificaciÃ³n de alarmas"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "La descripción contiene"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "FÃ¡brica para la alarma del servicio de notificaciÃ³n"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "El comentario contiene"
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:155
+msgid "Could not initialize gnome-vfs"
+msgstr "No se puede inicializar gnome-vfs"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
-msgid "Unmatched"
-msgstr "No coincidente"
+#: calendar/gui/alarm-notify/notify-main.c:181
+msgid "Could not create the alarm notify service factory"
+msgstr "No se ha podido crear la fÃ¡brica del servicio de la alarma de notificaciÃ³n"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-week-view-main-item.c:311
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:319 calendar/gui/print.c:1490
 msgid "%d %B"
 msgstr "%d de %B"
 
 #: calendar/gui/calendar-commands.c:799
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "No pude mostrar el agenda.  Por favor compruebe su ORBit y su OAF."
+msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr "No se ha podido mostrar el agenda.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:409 calendar/gui/calendar-model.c:967
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:412 calendar/gui/e-calendar-table.c:371
 msgid "Public"
-msgstr "Público"
+msgstr "PÃºblico"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:524
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:524
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:526
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:526
 msgid "W"
-msgstr "W"
+msgstr "O"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:591 calendar/gui/calendar-model.c:1135
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1177
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2289
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2292
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2295
 msgid "Completed"
-msgstr "Completado"
+msgstr "Terminado"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1037
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"La posición geográfica debe ser escrita en la forma: \n"
+"La posiciÃ³n geogrÃ¡fica debe ser escrita en la forma: \n"
 "\n"
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:287
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1970
+#: mail/folder-browser.c:1732 mail/mail-account-gui.c:1225
+#: mail/mail-account-gui.c:1639 mail/mail-accounts.c:384
+#: mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1471 widgets/misc/e-dateedit.c:1586
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
-msgstr "Recurriendo"
+msgstr "RepeticiÃ³n"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:277
+#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
-msgstr "Si"
+msgstr "SÃ"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "No"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
-msgstr "Vista Diaria"
+msgstr "Vista diaria"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
-msgstr "Vista de la Semana Laboral"
+msgstr "Vista de la semana laboral"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
-msgstr "Vista Semanal"
+msgstr "Vista semanal"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
-msgstr "Vista Mensual"
+msgstr "Vista mensual"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "La descripciÃ³n contiene"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "El comentario contiene"
+
+#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "No coincidente"
+
+#: calendar/gui/component-factory.c:72 calendar/gui/gnome-cal.c:1342
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1083
 msgid "Calendar"
-msgstr "Agenda"
+msgstr "Calendario"
 
-#: calendar/gui/component-factory.c:72
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/component-factory.c:77
 msgid "Public Calendar"
-msgstr "Calendario Público:"
+msgstr "Calendario pÃºblico"
 
-#: calendar/gui/component-factory.c:77
+#: calendar/gui/component-factory.c:78
 msgid "Public folder containing appointments and events"
-msgstr "Carpeta pública conteniendo citas y eventos"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
+msgstr "Carpeta pÃºblica conteniendo citas y eventos"
+
+#: calendar/gui/component-factory.c:82 calendar/gui/e-tasks.c:734
+#: calendar/gui/print.c:1776 calendar/gui/tasks-control.c:509
+#: calendar/importers/icalendar-importer.c:702
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
+#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
+#: shell/e-shortcuts.c:1084
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/component-factory.c:82
+#: calendar/gui/component-factory.c:83
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:86
+#: calendar/gui/component-factory.c:87
 msgid "Public Tasks"
-msgstr "Tareas Públicas"
+msgstr "Tareas pÃºblicas"
 
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/component-factory.c:88
 msgid "Public folder containing to-do items"
-msgstr "Carpeta pública conteniendo elementos por hacer"
+msgstr "Carpeta pÃºblica conteniendo elementos por hacer"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:749
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:749
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:750
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/component-factory.c:754
 msgid "New meeting"
-msgstr "Reunión nueva"
+msgstr "ReuniÃ³n nueva"
 
-#: calendar/gui/component-factory.c:755
+#: calendar/gui/component-factory.c:754
 msgid "_Meeting"
-msgstr "_Reunión"
+msgstr "_ReuniÃ³n"
 
-#: calendar/gui/component-factory.c:756
+#: calendar/gui/component-factory.c:755
 msgid "Create a new meeting request"
-msgstr "Crear una nueva petición de reunión"
+msgstr "Crear una nueva peticiÃ³n de reuniÃ³n"
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/component-factory.c:759
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/component-factory.c:759
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:761
+#: calendar/gui/component-factory.c:760
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/component-factory.c:764
 msgid "New All Day Appointment"
-msgstr "Cita para todo el día"
+msgstr "Cita para todo el dÃa"
 
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/component-factory.c:764
 msgid "All _Day Appointment"
-msgstr "Cita de todo el _día"
+msgstr "Cita de todo el _dÃa"
 
-#: calendar/gui/component-factory.c:766
+#: calendar/gui/component-factory.c:765
 msgid "Create a new all-day appointment"
-msgstr "Crear una nueva cita para todo el día"
+msgstr "Crear una nueva cita para todo el dÃa"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
-msgstr "No puedo abrir la carpeta en '%s'"
+msgstr "No se pudo abrir la carpeta en Â«%sÂ»"
 
 #: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
-msgstr "La URI que mostrará el agenda"
+msgstr "La URI que mostrarÃ¡ la agenda"
 
 #: calendar/gui/control-factory.c:174
 msgid "The type of view to show"
 msgstr "El tipo de vista a mostrar"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:358
 msgid "Audio Alarm Options"
 msgstr "Opciones de las Alarmas Auditivas"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:367
 msgid "Message Alarm Options"
 msgstr "Opciones de los Mensajes de Alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:376
 msgid "Mail Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:385
 msgid "Program Alarm Options"
 msgstr "Opciones de las Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:394
 msgid "Unknown Alarm Options"
 msgstr "Opciones de Alarmas Desconocidas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:1
 msgid "Alarm Repeat"
-msgstr "Repetición de Alarmas"
+msgstr "RepeticiÃ³n de Alarmas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid ""
 "Evolution does not yet support email notification for reminders.  You will "
 "not be able to edit the options for this reminder."
 msgstr ""
-"Evolution todavía no implementa notificación por correo para los "
-"recordatorios.  No podrá editar las opciones de este recordatorio."
+"Evolution todavÃa no implementa notificaciÃ³n por correo para los "
+"recordatorios.  No podrÃ¡ editar las opciones de este recordatorio."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
@@ -3996,7 +4081,7 @@ msgstr "Mensajes a Mostrar"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
-msgstr "Tocar un sonido:"
+msgstr "Reproducir un sonido:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
@@ -4010,129 +4095,129 @@ msgstr "Ejecutar programa:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
 #: filter/filter.glade.h:20
 msgid "days"
-msgstr "días"
+msgstr "dÃas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
 #: filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
 #: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:319
+#: calendar/gui/dialogs/alarm-page.c:298
 #, c-format
 msgid "%d days"
-msgstr "%d días"
+msgstr "%d dÃas"
 
-#: calendar/gui/dialogs/alarm-page.c:322
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 day"
-msgstr "1 día"
+msgstr "1 dÃa"
 
-#: calendar/gui/dialogs/alarm-page.c:327
+#: calendar/gui/dialogs/alarm-page.c:306
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:330
+#: calendar/gui/dialogs/alarm-page.c:309
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:314
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:338
+#: calendar/gui/dialogs/alarm-page.c:317
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:322
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:346
+#: calendar/gui/dialogs/alarm-page.c:325
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:351
+#: calendar/gui/dialogs/alarm-page.c:330
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:333
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:362
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
-msgstr "Tocar un sonido"
+msgstr "Reproducir un sonido"
 
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:366
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:370
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/dialogs/alarm-page.c:395
+#: calendar/gui/dialogs/alarm-page.c:374
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:380
 msgid "Unknown action to be performed"
-msgstr "Acción a realizar desconocida"
+msgstr "AcciÃ³n a realizar desconocida"
 
-#: calendar/gui/dialogs/alarm-page.c:413
+#: calendar/gui/dialogs/alarm-page.c:392
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes de comenzar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:416
+#: calendar/gui/dialogs/alarm-page.c:395
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tras el comienzo de la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:400
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s al comienzo de la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:430
+#: calendar/gui/dialogs/alarm-page.c:409
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de terminar a cita"
 
-#: calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/alarm-page.c:412
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tras finalizar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:438
+#: calendar/gui/dialogs/alarm-page.c:417
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s al finalizar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:462
+#: calendar/gui/dialogs/alarm-page.c:441
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: calendar/gui/dialogs/alarm-page.c:468
+#: calendar/gui/dialogs/alarm-page.c:447
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
@@ -4153,7 +4238,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:804 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4163,7 +4248,7 @@ msgstr "_Opciones..."
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
-msgstr "después de"
+msgstr "despuÃ©s de"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
@@ -4172,7 +4257,7 @@ msgstr "antes"
 #: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
-msgstr "día(s)"
+msgstr "dÃa(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
@@ -4182,7 +4267,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:179
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4210,13 +4295,13 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
-msgstr "Albertas"
+msgstr "Alertas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
-msgstr "Configuración de Agenda y de Tareas"
+msgstr "ConfiguraciÃ³n de Calendario y de Tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
@@ -4228,14 +4313,14 @@ msgstr "Color para las tareas para hoy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Day _ends:"
-msgstr "El día _acaba:"
+msgstr "El dÃa _acaba:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
-msgstr "Días"
+msgstr "DÃas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1116
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4248,7 +4333,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1112
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4257,9 +4342,9 @@ msgid "S_un"
 msgstr "Do_m"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1117
 msgid "Saturday"
-msgstr "Sábado"
+msgstr "SÃ¡bado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Sh_ow a reminder"
@@ -4267,10 +4352,10 @@ msgstr "Mostrar un recordatorio"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
-msgstr "Mostrar los _números de las semanas en el navegador de fechas"
+msgstr "Mostrar los _nÃºmeros de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1118
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4284,10 +4369,10 @@ msgstr "Ju_e"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
-msgstr "Lista de Tareas"
+msgstr "Lista de tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1115
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4304,7 +4389,7 @@ msgid "Time format:"
 msgstr "Formato del tiempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1113
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4313,18 +4398,18 @@ msgid "W_eek starts:"
 msgstr "La s_emana empieza:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1114
 msgid "Wednesday"
-msgstr "Miércoles"
+msgstr "MiÃ©rcoles"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
-msgstr "Semana Laboral"
+msgstr "Semana laboral"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Work days:"
-msgstr "Días Laborables:"
+msgstr "DÃas laborables:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
@@ -4336,7 +4421,7 @@ msgstr "_24 horas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
-msgstr "Pedir confirm_ación al borrar elementos"
+msgstr "Pedir confirm_aciÃ³n al borrar elementos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
@@ -4344,7 +4429,7 @@ msgstr "_Comprimir fines de semana en la vista mensual"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Day begins:"
-msgstr "El _día comienza:"
+msgstr "El _dÃa comienza:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
@@ -4355,7 +4440,7 @@ msgid "_Fri"
 msgstr "_Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_General"
 
@@ -4377,8 +4462,7 @@ msgstr "_Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
-msgstr ""
-"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
@@ -4396,210 +4480,211 @@ msgstr "M_ier"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:55
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"El evento que está borrando es una reunión, ¿quiere que envíe un aviso de "
-"cancelación?"
+"El evento que estÃ¡ borrando es una reuniÃ³n, Â¿quiere que envÃe un aviso de "
+"cancelaciÃ³n?"
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "¿Esta seguro que quiere cancelar y borrar este encuentro?"
+msgstr "Â¿Esta seguro que quiere cancelar y borrar esta reuniÃ³n?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:64
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"La tarea que está siendo borrada está asignada, ¿quiere mandar un mensaje "
-"advirtiéndolo?"
+"La tarea que estÃ¡ siendo borrada estÃ¡ asignada, Â¿quiere mandar un mensaje "
+"advirtiÃ©ndolo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr "¿Esta seguro que quiere cancelar y borrar esta tarea?"
+msgstr "Â¿Esta seguro que quiere cancelar y borrar esta tarea?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:73
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
-msgstr ""
-"L aentrada del diario que está borrando está publicada, ¿Quiere que envía un "
-"aviso de cancelación?"
+msgstr "La entrada del diario que estÃ¡ borrando estÃ¡ publicada, Â¿Quiere que envÃe un aviso de cancelaciÃ³n?"
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "¿Esta seguro que quiere cancelar y borrar esta entrada del diario?"
+msgstr "Â¿Esta seguro que quiere cancelar y borrar esta entrada del diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento ha sido borrado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarea ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada del diario ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Ha hecho cambios. ¿Olvidar los cambios y cerrar el editor?"
+msgstr "%s  Ha hecho cambios. Â¿Olvido los cambios y cierro el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
+msgstr "%s  No ha hecho cambios, Â¿cerrar el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarea a cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada del diario ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Ha realizado cambios. ¿Olvidar estos cambios y actualizar el editor?"
+msgstr "%s  Ha realizado cambios. Â¿Olvido estos cambios y actualizo el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
+msgstr "%s  No ha realizado cambios, Â¿actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
-msgid " (Completed "
-msgstr "(Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
-msgid "Completed "
-msgstr "Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
-msgid " (Due "
-msgstr " (Falta "
-
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
-msgid "Due "
-msgstr "Falta "
-
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update invalid object"
-msgstr "¡No pude actualizar el objeto inválido!"
+msgstr "No se ha podido actualizar el objeto invÃ¡lido"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:325
 msgid "Object not found, not updated"
 msgstr "Objeto no encontrado, no actualizado"
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "You don't have permissions to update this object"
 msgstr "No tiene permisos para actualizar este objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Could not update object"
-msgstr "¡No pude actualizar el objeto!"
+msgstr "No se ha podido actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:777
 msgid "Edit Appointment"
-msgstr "Editar Cita"
+msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:788
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:802
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1200
+#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3934
+#: calendar/gui/e-week-view.c:3699 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1301
+#: calendar/gui/dialogs/comp-editor.c:1325
+#: calendar/gui/dialogs/comp-editor.c:1349
+msgid "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
-"Los cambios efectuados a este item se descartarán si llaga una actualización "
-"por correo"
+"Los cambios efectuados a este Ãtem se descartarÃ¡n si llega una "
+"actualizaciÃ³n por correo"
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1376
 msgid "Unable to obtain current version!"
-msgstr "¡Imposible obtener versión actual!"
+msgstr "Â¡Imposible obtener versiÃ³n actual!"
+
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Error de validaciÃ³n: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2207
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2211
+msgid " (Completed "
+msgstr "(Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2213
+msgid "Completed "
+msgstr "Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2218
+msgid " (Due "
+msgstr " (Falta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2220
+msgid "Due "
+msgstr "Falta "
 
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "¿Esta seguro que quiere borrar la cita `%s'?"
+msgstr "Â¿Esta seguro que quiere borrar la cita Â«%sÂ»?"
 
 #: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "¿Esta seguro que quiere borrar esta cita sin título?"
+msgstr "Â¿Esta seguro que quiere borrar esta cita sin tÃtulo?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "¿Esta seguro que quiere borrar la tarea `%s'?"
+msgstr "Â¿Esta seguro que quiere borrar la tarea Â«%sÂ»?"
 
 #: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
-msgstr "¿Esta seguro que quiere borrar esta tarea sin título?"
+msgstr "Â¿Esta seguro que quiere borrar esta tarea sin tÃtulo?"
 
 #: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "¿Esta seguro que quiere borrar la entrada del diario `%s'?"
+msgstr "Â¿Esta seguro que quiere borrar la entrada del diario Â«%sÂ»?"
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
+msgstr "Â¿Esta seguro que quiere borrar esta entrada del diario sin tÃtulo?"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
-msgstr "¿Esta seguro que quiere borrar %d citas?"
+msgstr "Â¿Esta seguro que quiere borrar %d citas?"
 
 #: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
-msgstr "¿Esta seguro que quiere borrar %d tareas?"
+msgstr "Â¿Esta seguro que quiere borrar %d tareas?"
 
 #: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr "¿Esta seguro que quiere borrar %d entradas del diario?"
+msgstr "Â¿Esta seguro que quiere borrar %d entradas del diario?"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
-msgstr "Agenda de direcciones..."
+msgstr "Agenda..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4609,33 +4694,49 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2246
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:202
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Recurrence"
-msgstr "Repetición"
+msgstr "RepeticiÃ³n"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:212
+#: calendar/gui/dialogs/event-editor.c:279
+#: calendar/gui/dialogs/event-editor.c:413
 msgid "Scheduling"
-msgstr "Planificación"
+msgstr "PlanificaciÃ³n"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:217
+#: calendar/gui/dialogs/event-editor.c:282
+#: calendar/gui/dialogs/event-editor.c:416 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
-msgstr "Reunión"
+msgstr "ReuniÃ³n"
+
+#: calendar/gui/dialogs/event-page.c:636 calendar/gui/dialogs/task-page.c:546
+msgid "Start date is wrong"
+msgstr "La fecha de inicio estÃ¡ equivocada"
+
+#: calendar/gui/dialogs/event-page.c:646
+msgid "End date is wrong"
+msgstr "La fecha de finalizaciÃ³n  estÃ¡ equivocada"
+
+#: calendar/gui/dialogs/event-page.c:669
+msgid "Start time is wrong"
+msgstr "La hora de inicio estÃ¡ equivocada"
+
+#: calendar/gui/dialogs/event-page.c:676
+msgid "End time is wrong"
+msgstr "La  hora de finalizaciÃ³n  estÃ¡ equivocada"
 
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
-msgstr "Evento para todo e_l día"
+msgstr "Evento para todo e_l dÃa"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
@@ -4645,7 +4746,7 @@ msgstr "Oc_upado"
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
-msgstr "Clasificación"
+msgstr "ClasificaciÃ³n"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:3
@@ -4663,7 +4764,7 @@ msgstr "Lib_re"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 msgid "L_ocation:"
-msgstr "L_ocalización:"
+msgstr "L_ocalizaciÃ³n:"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
@@ -4673,12 +4774,12 @@ msgstr "Pri_vado"
 #: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
-msgstr "Pú_blico"
+msgstr "PÃº_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
-msgstr "Mostrar tiempo como"
+msgstr "Mostrar hora como"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:9
@@ -4698,19 +4799,19 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:392
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:572
 msgid "That person is already attending the meeting!"
-msgstr "¡Esa persona ya está participando en la reunión!"
+msgstr "Â¡Esa persona ya estÃ¡ participando en la reuniÃ³n!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -4722,12 +4823,12 @@ msgstr "Participantes"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
-msgstr "Pulse aquí para añadir un contacto"
+msgstr "Pulse aquÃ para aÃ±adir un contacto"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
-msgstr "Nombre común"
+msgstr "Nombre comÃºn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
@@ -4750,36 +4851,18 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:928
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1199
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-search-bar-criterion.c:44
-# src/file-manager/fm-list-view.c:1593
-# src/file-manager/fm-search-list-view.c:152
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Tipo"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4790,27 +4873,26 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
-msgstr "º"
-
 #: calendar/gui/dialogs/recurrence-page.c:127
 #: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
-msgstr "º"
+#: calendar/gui/dialogs/recurrence-page.c:157
+msgid "st"
+msgstr "Âº"
 
 #: calendar/gui/dialogs/recurrence-page.c:128
 #: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr "º"
+msgid "nd"
+msgstr "Âº"
 
 #: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:149
+msgid "rd"
+msgstr "Âº"
+
 #: calendar/gui/dialogs/recurrence-page.c:130
 #: calendar/gui/dialogs/recurrence-page.c:131
 #: calendar/gui/dialogs/recurrence-page.c:132
@@ -4827,69 +4909,68 @@ msgstr "º"
 #: calendar/gui/dialogs/recurrence-page.c:143
 #: calendar/gui/dialogs/recurrence-page.c:144
 #: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:150
 #: calendar/gui/dialogs/recurrence-page.c:151
 #: calendar/gui/dialogs/recurrence-page.c:152
 #: calendar/gui/dialogs/recurrence-page.c:153
 #: calendar/gui/dialogs/recurrence-page.c:154
 #: calendar/gui/dialogs/recurrence-page.c:155
+#: calendar/gui/dialogs/recurrence-page.c:156
 msgid "th"
-msgstr "º"
+msgstr "Âº"
 
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:610
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
+msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
+#: calendar/gui/dialogs/recurrence-page.c:879
 msgid "Recurrent date is wrong"
-msgstr "La fecha recurrente está equivocada"
+msgstr "La fecha de repeticiÃ³n estÃ¡ equivocada"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:988
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1053
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1054 filter/filter-datespec.c:65
 msgid "second"
 msgstr "segundo"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1560
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1055
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1056
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1057
 msgid "last"
-msgstr "último"
+msgstr "Ãºltimo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1083
 msgid "Other Date"
-msgstr "Otra Fecha"
+msgstr "Otra fecha"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1111 filter/filter-datespec.c:68
 msgid "day"
-msgstr "día"
+msgstr "dÃa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1436
 msgid "occurrences"
 msgstr "ocurrencias"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
-msgstr "Aña_dir"
+msgstr "AÃ±a_dir"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -4901,7 +4982,7 @@ msgstr "Excepciones"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
-msgstr "Previsualización"
+msgstr "PrevisualizaciÃ³n"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
@@ -4909,7 +4990,7 @@ msgstr "Regla de recurrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
-msgstr "Re_currencia personalizada"
+msgstr "Repeti_ciÃ³n personalizada"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
@@ -4917,11 +4998,11 @@ msgstr "_Modificar"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
-msgstr "Si_n recurrencia"
+msgstr "Si_n repeticiÃ³n"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
-msgstr "Recurrencia _simple"
+msgstr "RepeticiÃ³n _simple"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
@@ -4945,47 +5026,50 @@ msgstr "semana(s)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
-msgstr "año(s)"
+msgstr "aÃ±o(s)"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has been created. Send it?"
-msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
+msgstr "La informaciÃ³n de la reuniÃ³n ha sido creada. Â¿Desea enviarla?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has changed. Send an updated version?"
-msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizada?"
+msgstr "La informaciÃ³n de la reuniÃ³n ha cambiado. Â¿Enviar versiÃ³n actualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr "La informaciÃ³n de asignaciÃ³n de tareas ha sido creada. Â¿Desea enviarla?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:69
 msgid "The task information has changed. Send an updated version?"
-msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
+msgstr "La informaciÃ³n de la tarea ha cambiado. Â¿Enviar versiÃ³n actualizada?"
+
+#: calendar/gui/dialogs/task-details-page.c:398
+msgid "Completed date is wrong"
+msgstr "La fecha de terminaciÃ³n es errÃ³nea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% Completo"
+msgstr "% Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
-msgstr "Fecha Completada:"
+msgstr "Fecha de TerminaciÃ³n:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
+#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
+#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
 msgid "Needs Action"
-msgstr "Necesita acción"
+msgstr "Necesita acciÃ³n"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: my-evolution/e-summary-preferences.c:627
 msgid "URL:"
 msgstr "URL:"
 
@@ -4997,169 +5081,158 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1031
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:186
 msgid "Basic"
-msgstr "Básico"
+msgstr "BÃ¡sico"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:196
+#: calendar/gui/dialogs/task-editor.c:241
+#: calendar/gui/dialogs/task-editor.c:366
 msgid "Assignment"
-msgstr "Asignación"
+msgstr "AsignaciÃ³n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:519
+msgid "Due date is wrong"
+msgstr "La fecha de Pendientes es errÃ³nea"
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:858
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
-msgstr "Descripción:"
+msgstr "DescripciÃ³n:"
 
 #: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
-msgstr "Fecha de Ini_cio:"
+msgstr "Fecha de ini_cio:"
 
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
-msgstr "Fecha _de Fin:"
+msgstr "Fecha _de finalizaciÃ³n:"
 
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
+#: calendar/gui/e-calendar-table.c:415
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
+#: calendar/gui/e-calendar-table.c:416
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
+#: calendar/gui/e-calendar-table.c:417
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
+#: calendar/gui/e-calendar-table.c:418
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
+#: calendar/gui/e-calendar-table.c:419
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
+#: calendar/gui/e-calendar-table.c:420
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
+#: calendar/gui/e-calendar-table.c:421
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
+#: calendar/gui/e-calendar-table.c:422
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
+#: calendar/gui/e-calendar-table.c:423
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
-#, c-format
+#: calendar/gui/e-calendar-table.c:424
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
-#, c-format
+#: calendar/gui/e-calendar-table.c:425
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2818
+#: calendar/gui/e-week-view.c:1863
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2114
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3701
+#: calendar/gui/e-week-view.c:3483 mail/folder-browser.c:1743
+#: shell/e-shortcuts-view.c:409 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:950
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3703
+#: calendar/gui/e-week-view.c:3458 calendar/gui/e-week-view.c:3485
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3708
+#: calendar/gui/e-week-view.c:3490 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3709
+#: calendar/gui/e-week-view.c:3491 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3674
+#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-week-view.c:3492 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:961
 msgid "_Assign Task"
 msgstr "Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Mark as Complete"
-msgstr "_Marcar como completo"
+msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark Selected Tasks as Complete"
-msgstr "_Marcar tareas como terminadas"
+msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:969
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7533
+#: calendar/gui/e-week-view.c:4177
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1322
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
-msgstr "Pulse para añadir una tarea"
+msgstr "Pulse para aÃ±adir una tarea"
 
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
+#: camel/camel-filter-driver.c:1095
 msgid "Complete"
 msgstr "Completo"
 
@@ -5177,7 +5250,7 @@ msgstr "Fecha fin"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
-msgstr "Posición geográfica"
+msgstr "PosiciÃ³n geogrÃ¡fica"
 
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
@@ -5188,8 +5261,8 @@ msgid "Start Date"
 msgstr "Fecha de Inicio"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:54 shell/e-shell.c:763
+#: shell/e-shortcuts.c:1080
 msgid "Summary"
 msgstr "Resumen"
 
@@ -5197,19 +5270,15 @@ msgstr "Resumen"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -5224,476 +5293,472 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiones por minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
+#: calendar/gui/print.c:790
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:616 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:792
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-day-view-top-item.c:261
+#: calendar/gui/e-week-view-main-item.c:302 calendar/gui/print.c:1506
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view.c:1394 calendar/gui/e-day-view-top-item.c:269
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%d %b"
 msgstr "%d de %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
-msgid "pm"
-msgstr "pm"
-
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3658
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3660 calendar/gui/e-week-view.c:3452
 msgid "New All Day _Event"
-msgstr "Nuevo _evento para todo el día"
+msgstr "Nuevo _evento para todo el dÃa"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3662 calendar/gui/e-week-view.c:3453
 msgid "New Meeting"
-msgstr "Nueva reunión"
+msgstr "Nueva reuniÃ³n"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3454
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3669 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3681 calendar/gui/e-week-view.c:3468
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3469
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3473
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
-msgstr "_Publicar la información de disponibilidad"
+msgstr "_Publicar la informaciÃ³n de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3477
 #: ui/evolution.xml.h:62
 msgid "_Settings..."
-msgstr "_Configuración..."
+msgstr "_ConfiguraciÃ³n..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3484
+#: mail/folder-browser.c:1745 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3496
 msgid "_Schedule Meeting..."
-msgstr "Concertar una _reunión"
+msgstr "Concertar una _reuniÃ³n"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3497
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3502
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3503
 msgid "Delete this _Occurrence"
-msgstr "Borrar esta _Ocurrencia"
+msgstr "Borrar esta _ocurrencia"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3504
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-day-view-time-item.c:498
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiones por minuto"
+
+#: calendar/gui/e-itip-control.c:585
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza con:</b>"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:595
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina: </b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:608
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado</b> "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:618
 msgid "<b>Due:</b> "
 msgstr "<b>Referente:</b>"
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:655 calendar/gui/e-itip-control.c:705
 msgid "iCalendar Information"
-msgstr "Información del agenda"
+msgstr "InformaciÃ³n del agenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:670
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:736 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:763 calendar/gui/e-itip-control.c:780
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:787
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
-"<br> Por favor revise la siguiente información, y seleccione una acción del "
-"menú de abajo."
+"<br> Por favor revise la siguiente informaciÃ³n, y seleccione una acciÃ³n del "
+"menÃº de abajo."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:802
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:812
 msgid "Location:"
 msgstr "L_ugar"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:826
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-meeting-model.c:297
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:486
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:835 calendar/gui/itip-utils.c:489
 msgid "Tentatively Accepted"
-msgstr "Tentativamente aceptado"
+msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-meeting-model.c:299
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
 msgid "Declined"
 msgstr "Rechazado"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-itip-control.c:843 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
+#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:339
+#: mail/mail-display.c:907 widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:446
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:896 calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:950 calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.c:989
 msgid "Choose an action:"
-msgstr "Elija una acción:"
+msgstr "Elija una acciÃ³n:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:897
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:991
+#: shell/e-shell.c:2084 widgets/misc/e-cell-date-edit.c:262
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:925
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:926
 msgid "Tentatively accept"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:927
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:951
 msgid "Send Free/Busy Information"
-msgstr "Enviar información de disponibilidad"
+msgstr "Enviar informaciÃ³n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:964
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:977
 msgid "Send Latest Information"
-msgstr "Enviar última información"
+msgstr "Enviar Ãºltima informaciÃ³n"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1262
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:506
+#: shell/evolution-shell-component.c:1155 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1071
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ha publicado información de reuniones."
+msgstr "<b>%s</b> ha publicado informaciÃ³n de reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1072
 msgid "Meeting Information"
-msgstr "Información  de reuniones"
+msgstr "InformaciÃ³n de reuniÃ³"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1077
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
+msgstr "<b>%s</b> solicita la presencia de %s en una reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1079
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> solicita su presencia en una reunión."
+msgstr "<b>%s</b> solicita su presencia en una reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1080
 msgid "Meeting Proposal"
-msgstr "Propuesta de reunión"
+msgstr "Propuesta de reuniÃ³n"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1084
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> desea apuntarse a una reunión existente."
+msgstr "<b>%s</b> desea apuntarse a una reuniÃ³n existente."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1085
 msgid "Meeting Update"
-msgstr "Actualización de la reunión"
+msgstr "ActualizaciÃ³n de reuniÃ³n"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1089
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> desea recibir la última actualización de la reunión."
+msgstr "<b>%s</b> desea recibir la Ãºltima informaciÃ³n de la reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1090
 msgid "Meeting Update Request"
-msgstr "Petición de actualización de la reunión"
+msgstr "PeticiÃ³n de actualizaciÃ³n de la reuniÃ³n"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1097
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> ha contestado a la petición de reunión."
+msgstr "<b>%s</b> ha contestado a la peticiÃ³n de reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1098
 msgid "Meeting Reply"
-msgstr "Respuesta de reunión"
+msgstr "Respuesta de reuniÃ³n"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1105
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> ha cancelado una reunión."
+msgstr "<b>%s</b> ha cancelado una reuniÃ³n."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1106
 msgid "Meeting Cancellation"
-msgstr "Cancelación de reunión"
+msgstr "CancelaciÃ³n de reuniÃ³n"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1215
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1114
 msgid "Bad Meeting Message"
-msgstr "Mensaje de reunión erróneo"
+msgstr "Mensaje de reuniÃ³n errÃ³neo"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1138
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ha publicado la información de la tarea."
+msgstr "<b>%s</b> ha publicado la informaciÃ³n de la tarea."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1139
 msgid "Task Information"
-msgstr "Información de la tarea"
+msgstr "InformaciÃ³n de la tarea"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1144
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> te pide que realices una tarea."
+msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1151
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> desea añadir a una tarea existente."
+msgstr "<b>%s</b> desea aÃ±adirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1152
 msgid "Task Update"
-msgstr "Actualización de tarea"
+msgstr "ActualizaciÃ³n de tarea"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1156
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> quiere recibir la última información de la tarea."
+msgstr "<b>%s</b> quiere recibir la Ãºltima informaciÃ³n de la tarea."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1157
 msgid "Task Update Request"
-msgstr "Petición de actualización de tarea"
+msgstr "PeticiÃ³n de actualizaciÃ³n de tarea"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1164
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> ha contestado a una asignación de tarea."
+msgstr "<b>%s</b> ha contestado a una asignaciÃ³n de tarea."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1165
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1172
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1173
 msgid "Task Cancellation"
-msgstr "Cancelación de tarea"
+msgstr "CancelaciÃ³n de tarea"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1181
 msgid "Bad Task Message"
-msgstr "Mensaje de tarea erróneo"
+msgstr "Mensaje de tarea errÃ³neo"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1200
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ha publicado la información de disponibilidad."
+msgstr "<b>%s</b> ha publicado la informaciÃ³n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1201
 msgid "Free/Busy Information"
-msgstr "Información de disponibilidad"
+msgstr "InformaciÃ³n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1205
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> pide su información de disponibilidad."
+msgstr "<b>%s</b> pide su informaciÃ³n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1206
 msgid "Free/Busy Request"
-msgstr "Petición de disponibilidad"
+msgstr "PeticiÃ³n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1210
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ha contestado a una petición de disponibilidad."
+msgstr "<b>%s</b> ha contestado a una peticiÃ³n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1211
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1216
 msgid "Bad Free/Busy Message"
-msgstr "Mensaje de disponibilidad erróneo"
+msgstr "Mensaje de disponibilidad errÃ³neo"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1290
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1352
 msgid "The message contains only unsupported requests."
-msgstr "Este mensaje solo contiene peticiones no soportadas."
+msgstr "Este mensaje sÃ³lo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1380 calendar/gui/e-itip-control.c:1386
 msgid "The attachment does not contain a valid calendar message"
-msgstr "El adjunto no contiene un agenda de mensaje válido"
+msgstr "El adjunto no contiene un agenda de mensaje vÃ¡lido"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1411
 msgid "The attachment has no viewable calendar items"
-msgstr "El adjunto no tiene elementos de agenda visibles"
+msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1724
 msgid "Object is invalid and cannot be updated\n"
-msgstr "El objeto es inválido y no puede ser actualizado\n"
+msgstr "El objeto es invÃ¡lido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1727
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1638 calendar/gui/e-itip-control.c:1730
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1641
 msgid "You do not have the right permissions to update the calendar\n"
-msgstr "No tiene permiso para actualizar el agenda\n"
+msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1644
 msgid "Update complete\n"
-msgstr "Actualización completada\n"
+msgstr "ActualizaciÃ³n terminada\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1647
 msgid "Calendar file could not be updated!\n"
-msgstr "¡El fichero de la Agenda no pudo ser actualizado!\n"
+msgstr "Â¡El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1676 calendar/gui/e-itip-control.c:1742
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1697
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta respuesta no es de un asistente. ¿Lo añado como asistente?"
+msgstr "Esta respuesta no es de un asistente. Â¿Lo aÃ±ado como asistente?"
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1709
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
-"¡El estado de asistencia no pudo ser actualizado a causa de un estado "
-"inválido!\n"
+"Â¡El estado de asistencia no pudo ser actualizado a causa de un estado "
+"invÃ¡lido!\n"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1733
 msgid "You don't have the right permissions to update the calendar\n"
-msgstr "No tiene permiso para actualizar el agenda\n"
+msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:1736
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated!\n"
-msgstr "¡El estado de asistencia no pudo ser actualizado!\n"
+msgstr "Â¡El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:1774
 msgid "Removal Complete"
-msgstr "Borrado completo"
+msgstr "Borrado terminado"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:1804 calendar/gui/e-itip-control.c:1854
 msgid "Item sent!\n"
-msgstr "¡Elemento enviado!\n"
+msgstr "Â¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1858
 msgid "The item could not be sent!\n"
-msgstr "¡El elemento no puedo ser enviado!\n"
+msgstr "Â¡El elemento no ha podido ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:1931
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta de Calendario"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1938
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta de Tareas"
 
@@ -5704,11 +5769,11 @@ msgstr "%P %%"
 
 #: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
-msgstr "--to--"
+msgstr "--a--"
 
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
-msgstr "Mensaje de Agenda"
+msgstr "Mensaje del calendario"
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
@@ -5716,7 +5781,7 @@ msgstr "Fecha:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
-msgstr "Cargando agenda"
+msgstr "Cargando calendario"
 
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
@@ -5724,7 +5789,7 @@ msgstr "Cargando agenda..."
 
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
-msgstr "Mensaje del Servidor:"
+msgstr "Mensaje del servidor:"
 
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
@@ -5734,180 +5799,180 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:84
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
+#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
-msgstr "Habitación"
+msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
-msgstr "Silla"
+msgstr "Presidente"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
+#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
 msgid "In Process"
 msgstr "En proceso"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:407
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
-msgstr "Sin información"
+msgstr "Sin informaciÃ³n"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:446
 msgid "_Options"
 msgstr "_Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:465
 msgid "Show _Only Working Hours"
-msgstr "Mostrar _solo las horas de trabajo"
+msgstr "Mostrar _sÃ³lo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _Zoomed Out"
 msgstr "Mostrar quitando _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:496
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:514
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:531
 msgid "_Autopick"
-msgstr "_Auto seleccionar"
+msgstr "_Autoseleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:545
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:564
 msgid "_All People and Resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:577
 msgid "All _People and One Resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:590
 msgid "_Required People"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:603
 msgid "Required People and _One Resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Meeting _start time:"
-msgstr "Hora de _inicio de la reunión:"
+msgstr "Hora de _inicio de la reuniÃ³n:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:645
 msgid "Meeting _end time:"
-msgstr "Hora de _fin de la reunión:"
+msgstr "Hora de _fin de la reuniÃ³n:"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2070
+#: calendar/gui/e-meeting-time-sel-item.c:453
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2100
+#: calendar/gui/e-meeting-time-sel-item.c:457 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:461 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1595
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
-#: calendar/gui/gnome-cal.c:2024
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2012
+#: calendar/gui/gnome-cal.c:2023
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "Abriendo tarea en %s"
+msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:384 calendar/gui/tasks-control.c:197
 #, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr "No puedo cargar las tareas en `%s'"
+msgstr "No se ha podido cargar las tareas en Â«%sÂ»"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:399
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr "El método necesario para cargar `%s' no está implementado"
+msgstr "El mÃ©todo necesario para cargar Â«%sÂ» no estÃ¡ implementado"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:413 calendar/gui/gnome-cal.c:1532
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
-msgstr "No tiene permiso para abrir la carpeta en `%s'"
+msgstr "No tiene permiso para abrir la carpeta en Â«%sÂ»"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:481 calendar/gui/gnome-cal.c:1736
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5916,39 +5981,38 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:553
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:576
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:671
 msgid "Expunging"
 msgstr "Comprimiendo"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3451
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1504
 #, c-format
 msgid "Could not open the folder in `%s'"
-msgstr "No puedo abrir la carpeta en `%s'"
+msgstr "No se ha podido abrir la carpeta en Â«%sÂ»"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1518
 #, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr "El método necesario para abrir `%s' no está implementado"
+msgstr "El mÃ©todo necesario para abrir Â«%sÂ» no estÃ¡ implementado"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1564
 #, c-format
 msgid "Adding alarms for %s"
-msgstr "Añadir alarmas para %s"
+msgstr "AÃ±adir alarmas para %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1756
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5957,9 +6021,9 @@ msgid ""
 msgstr ""
 "El soporte de calendario para\n"
 "%s\n"
-"ha caído. Tendrá que reiniciar Evolution para usarlo de nuevo."
+"ha caÃdo. TendrÃ¡ que reiniciar Evolution para usarlo de nuevo."
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5968,16 +6032,64 @@ msgid ""
 msgstr ""
 "El soporte de tareas para \n"
 "%s\n"
-"ha caído. Tendrá que reiniciar Evolution para usarlo otra vez."
+"ha caÃdo. TendrÃ¡ que reiniciar Evolution para usarlo otra vez."
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1994
 #, c-format
 msgid "Opening calendar at %s"
-msgstr "Abriendo agenda en %s"
+msgstr "Abriendo calendario en %s"
 
-#: calendar/gui/gnome-cal.c:2035
+#: calendar/gui/gnome-cal.c:2034
 msgid "Opening default tasks folder"
-msgstr "Abriendo capeta de tareas predeterminada"
+msgstr "Abriendo carpeta de tareas predeterminada"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "A Bonobo control which displays a task list."
+msgstr "Un control bonobo que muestra una lista de tareas."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Un control bonobo de ejemplo que muestra un agenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendario y Tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Control de configuraciÃ³n del Calendario de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquÃ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visor de calendario iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution component for handling the calendar."
+msgstr "Componente de Evolution para manejar el calendario"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Factory for the Evolution Tasks control"
+msgstr "FÃ¡brica para el control de tareas de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Factory for the calendar iTip view control"
+msgstr "FÃ¡brica para el control de vista de agenda iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Factory for the sample Calendar control"
+msgstr "FÃ¡brica para el control del Calendario de ejemplo"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "FÃ¡brica para centralizar el componente del editor de diÃ¡logos del agenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+msgid "Factory to create a component editor factory"
+msgstr "FÃ¡brica para crear el componente del editor"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -6035,343 +6147,340 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:379
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
 msgid "Event information"
-msgstr "Información del evento"
+msgstr "InformaciÃ³n del evento"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
 msgid "Task information"
-msgstr "Información de la tarea"
+msgstr "InformaciÃ³n de la tarea"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Journal information"
-msgstr "Información de la entrada de diario"
+msgstr "InformaciÃ³n de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
 msgid "Free/Busy information"
-msgstr "Información de disponibilidad"
+msgstr "InformaciÃ³n de disponibilidad"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:466
 msgid "Calendar information"
-msgstr "Información de Agenda"
+msgstr "InformaciÃ³n de calendario"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:502
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:510
 msgid "Refresh"
 msgstr "Regenerar"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:514
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:582
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "Información de disponibilidad (de %s a %s)"
+msgstr "InformaciÃ³n de disponibilidad (de %s a %s)"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:594
 msgid "iCalendar information"
-msgstr "Información de iCalendar"
+msgstr "InformaciÃ³n de iCalendar"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:752
 msgid "You must be an attendee of the event."
-msgstr "Debes participar en el evento."
+msgstr "Debe ser un asistente del evento."
+
+#: calendar/gui/main.c:60
+msgid "Could not initialize GNOME"
+msgstr "No se puede inicializar GNOME"
 
-#: calendar/gui/main.c:70
+#: calendar/gui/main.c:66
 msgid "Could not activate Bonobo"
 msgstr "No se puede activar Bonobo"
 
-#: calendar/gui/main.c:99
+#: calendar/gui/main.c:95
 msgid "Could not create the component editor factory"
-msgstr "No pude crear la factoría del componente editor"
+msgstr "No se ha podido crear la fÃ¡brica del componente editor"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:455
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:455
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:455
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:455
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:455
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:456
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:456
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:456
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:456
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:456
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:457
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:457
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:457
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:457
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:457
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:458
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:458
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:458
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:458
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:458
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:459
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:459
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:459
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:459
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:459
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:460
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:460
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:460
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:460
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:460
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:462
+#: calendar/gui/print.c:461
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:528
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:528
 msgid "Mo"
-msgstr "Lun"
+msgstr "Lu"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:528
 msgid "Tu"
-msgstr "Mar"
+msgstr "Ma"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:528
 msgid "We"
-msgstr "Miér"
+msgstr "Mi"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:529
 msgid "Th"
-msgstr "Jue"
+msgstr "Ju"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:529
 msgid "Fr"
-msgstr "Vier"
+msgstr "Vi"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:529
 msgid "Sa"
-msgstr "Sab"
+msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1862
 msgid "Selected day (%a %b %d %Y)"
-msgstr "Día seleccionado (%a %d de %b de %Y)"
+msgstr "DÃa seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1887 calendar/gui/print.c:1891
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1888
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1892 calendar/gui/print.c:1894
+#: calendar/gui/print.c:1895
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1899
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1907
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected year (%Y)"
-msgstr "Año seleccionado (%Y)"
+msgstr "AÃ±o seleccionado (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2248
 msgid "Task"
 msgstr "Tarea"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2305
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2323
 #, c-format
 msgid "Priority: %s"
 msgstr "_Prioridad: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2337
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje Completado: %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2349
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2363
 #, c-format
 msgid "Categories: %s"
-msgstr "Categorías: %s"
+msgstr "CategorÃas: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2374
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Imprimir agenda"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2519 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2989
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Vista previa"
 
 #: calendar/gui/print.c:2550
 msgid "Print Item"
-msgstr "Imprimir Elemento"
+msgstr "Imprimir elemento"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2633
 msgid "Print Setup"
-msgstr "Configurar impresión"
-
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"No pude crear una vista de tareas.  Por favor compruebe su ORBit y su OAF."
+msgstr "Configurar impresiÃ³n"
 
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
-msgstr "La URI que mostrará la carpeta de tareas"
+msgstr "La URI que mostrarÃ¡ la carpeta de tareas"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:463
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Esta operación borrará permanentemente todos las tareas marcados como "
-"terminadas. Si continúa, no podrá recuperar esas tareas.\n"
+"Esta operaciÃ³n borrarÃ¡ permanentemente todos las tareas marcados como "
+"terminadas. Si continÃºa, no podrÃ¡ recuperar esas tareas.\n"
 "\n"
-"¿Borrar realmente esas tareas?"
+"Â¿Borrar realmente esas tareas?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:470
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:622
 msgid "Print Tasks"
 msgstr "Imprimir Tareas"
 
-#: calendar/gui/tasks-migrate.c:105
+#: calendar/gui/tasks-control-factory.c:74
+msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr "No se ha podido crear una vista de tareas.  Por favor compruebe su ORBit y su OAF."
+
+#: calendar/gui/tasks-migrate.c:104
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 "Evolution ha tomado las tareas que estaban en su carpeta de agenda y las ha "
-"migrado automáticamente a la nueva carpeta de tareas."
+"migrado automÃ¡ticamente a la nueva carpeta de tareas."
 
-#: calendar/gui/tasks-migrate.c:108
+#: calendar/gui/tasks-migrate.c:107
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -6379,71 +6488,71 @@ msgid ""
 "again in the future."
 msgstr ""
 "Evolution ha intentado tomar las tareas que estaban en su carpeta de agenda y "
-"migrarlas automáticamente a la nueva carpeta de tareas.\n"
-"Algunas tareas no han podido ser migradas, así que este proceso puede que sea "
-"reintentado otra vez en el futuro."
+"migrarlas automÃ¡ticamente a la nueva carpeta de tareas.\n"
+"Algunas tareas no han podido ser migradas, asÃ que este proceso puede que "
+"sea reintentado otra vez en el futuro."
 
-#: calendar/gui/tasks-migrate.c:120
+#: calendar/gui/tasks-migrate.c:119
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"No pude abrir `%s'; no se migrarán elementos de la carpeta de agenda a la "
+"No se ha podido abrir Â«%sÂ»; no se migrarÃ¡n elementos de la carpeta de agenda a la "
 "carpeta de tareas."
 
-#: calendar/gui/tasks-migrate.c:133
+#: calendar/gui/tasks-migrate.c:132
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the calendar "
 "folder will be migrated to the tasks folder."
 msgstr ""
-"El método requerido para cargar `%s' no está implementado. No se migrarán "
-"elementos de la carpeta de agenda a la carpeta de tareas."
+"El mÃ©todo requerido para cargar Â«%sÂ» no estÃ¡ implementado. No se "
+"migrarÃ¡n elementos de la carpeta de agenda a la carpeta de tareas."
 
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:377
 msgid "SMTWTFS"
-msgstr "DLMMJVS"
+msgstr "DLMXJVS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
 msgid "Factory to import iCalendar files into Evolution"
-msgstr "Factoría para importar archivos iCalendar en Evolution."
+msgstr "FÃ¡brica para importar archivos iCalendar en Evolution."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
 msgid "Imports iCalendar files into Evolution"
-msgstr "Importa ficheros iCalendar en Evolution."
+msgstr "Importa archivos iCalendar en Evolution."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
 msgid "Imports vCalendar files into Evolution"
-msgstr "Importa ficheros vCalendar en Evolution."
+msgstr "Importa archivos vCalendar en Evolution."
 
-#: calendar/importers/icalendar-importer.c:168
+#: calendar/importers/icalendar-importer.c:166
 #, c-format
 msgid "Can't get storage list from registry: %s"
-msgstr "No puedo obtener lista de almacenamiento del registro: %s"
+msgstr "No se puede obtener lista de almacenamiento del registro: %s"
 
-#: calendar/importers/icalendar-importer.c:180
+#: calendar/importers/icalendar-importer.c:178
 #, c-format
 msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "No se puede llamar a getFolderAtPath en el almacén: %s"
+msgstr "No se puede llamar a getFolderAtPath en el almacÃ©n: %s"
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:481
 msgid "Reminder!!"
-msgstr "¡¡Recuerde!!"
+msgstr "Â¡Â¡Recuerde!!"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:695
 msgid "Calendar Events"
-msgstr "Eventos de agenda"
+msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:720
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution ha encontrado ficheros de GNOME Calendar.\n"
-"¿Quiere importarlos a Evolution?"
+"Evolution ha encontrado archivos de GNOME Calendar.\n"
+"Â¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:727
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -6461,8 +6570,7 @@ msgstr "make-time espera que el argumento 1 sea una cadena"
 
 #: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-"el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
+msgstr "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
 #: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
@@ -6525,7 +6633,8 @@ msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
 msgstr ""
-"contains? espera que el argumento 1 sea «any», «summary» ó «description»"
+"contains? espera que el argumento 1 sea Â«anyÂ», Â«summaryÂ» Ã³ "
+"Â«descriptionÂ»"
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
@@ -6541,7 +6650,7 @@ msgstr ""
 
 #: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
-msgstr "¿esta completo? espera 0 argumentos"
+msgstr "Â¿esta completo? espera 0 argumentos"
 
 #: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
@@ -6553,12 +6662,11 @@ msgstr "completed-before espera que el argumento 1 sea time_t"
 
 #: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-"La evaluación de la expresión de búsqueda no ha devuelto un valor booleano"
+msgstr "La evaluaciÃ³n de la expresiÃ³n de bÃºsqueda no ha devuelto un valor booleano"
 
 #: calendar/pcs/query.c:1483
 msgid "Parse error"
-msgstr "error de análisis"
+msgstr "error de anÃ¡lisis"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -6567,723 +6675,723 @@ msgstr "error de análisis"
 #.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
-msgstr "África/Abidjan"
+msgstr "Ãfrica/Abidjan"
 
 #: calendar/zones.h:8
 msgid "Africa/Accra"
-msgstr "África/Accra"
+msgstr "Ãfrica/Accra"
 
 #: calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
-msgstr "África/Addis_Ababa"
+msgstr "Ãfrica/Addis_Ababa"
 
 #: calendar/zones.h:10
 msgid "Africa/Algiers"
-msgstr "África/Algiers"
+msgstr "Ãfrica/Algiers"
 
 #: calendar/zones.h:11
 msgid "Africa/Asmera"
-msgstr "África/Asmera"
+msgstr "Ãfrica/Asmera"
 
 #: calendar/zones.h:12
 msgid "Africa/Bamako"
-msgstr "África/Bamako"
+msgstr "Ãfrica/Bamako"
 
 #: calendar/zones.h:13
 msgid "Africa/Bangui"
-msgstr "África/Bangui"
+msgstr "Ãfrica/Bangui"
 
 #: calendar/zones.h:14
 msgid "Africa/Banjul"
-msgstr "África/Banjul"
+msgstr "Ãfrica/Banjul"
 
 #: calendar/zones.h:15
 msgid "Africa/Bissau"
-msgstr "África/Bissau"
+msgstr "Ãfrica/Bissau"
 
 #: calendar/zones.h:16
 msgid "Africa/Blantyre"
-msgstr "África/Blantyre"
+msgstr "Ãfrica/Blantyre"
 
 #: calendar/zones.h:17
 msgid "Africa/Brazzaville"
-msgstr "África/Brazzaville"
+msgstr "Ãfrica/Brazzaville"
 
 #: calendar/zones.h:18
 msgid "Africa/Bujumbura"
-msgstr "África/Bujumbura"
+msgstr "Ãfrica/Bujumbura"
 
 #: calendar/zones.h:19
 msgid "Africa/Cairo"
-msgstr "África/Cairo"
+msgstr "Ãfrica/Cairo"
 
 #: calendar/zones.h:20
 msgid "Africa/Casablanca"
-msgstr "África/Casablanca"
+msgstr "Ãfrica/Casablanca"
 
 #: calendar/zones.h:21
 msgid "Africa/Ceuta"
-msgstr "África/Ceuta"
+msgstr "Ãfrica/Ceuta"
 
 #: calendar/zones.h:22
 msgid "Africa/Conakry"
-msgstr "África/Conakry"
+msgstr "Ãfrica/Conakry"
 
 #: calendar/zones.h:23
 msgid "Africa/Dakar"
-msgstr "África/Dakar"
+msgstr "Ãfrica/Dakar"
 
 #: calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
-msgstr "África/Dar_es_Salaam"
+msgstr "Ãfrica/Dar_es_Salaam"
 
 #: calendar/zones.h:25
 msgid "Africa/Djibouti"
-msgstr "África/Djibouti"
+msgstr "Ãfrica/Djibouti"
 
 #: calendar/zones.h:26
 msgid "Africa/Douala"
-msgstr "África/Douala"
+msgstr "Ãfrica/Douala"
 
 #: calendar/zones.h:27
 msgid "Africa/El_Aaiun"
-msgstr "África/El_Aaiun"
+msgstr "Ãfrica/El_Aaiun"
 
 #: calendar/zones.h:28
 msgid "Africa/Freetown"
-msgstr "África/Freetown"
+msgstr "Ãfrica/Freetown"
 
 #: calendar/zones.h:29
 msgid "Africa/Gaborone"
-msgstr "África/Gaborone"
+msgstr "Ãfrica/Gaborone"
 
 #: calendar/zones.h:30
 msgid "Africa/Harare"
-msgstr "África/Harare"
+msgstr "Ãfrica/Harare"
 
 #: calendar/zones.h:31
 msgid "Africa/Johannesburg"
-msgstr "África/Johannesburgo"
+msgstr "Ãfrica/Johannesburgo"
 
 #: calendar/zones.h:32
 msgid "Africa/Kampala"
-msgstr "África/Kampala"
+msgstr "Ãfrica/Kampala"
 
 #: calendar/zones.h:33
 msgid "Africa/Khartoum"
-msgstr "África/Khartoum"
+msgstr "Ãfrica/Khartoum"
 
 #: calendar/zones.h:34
 msgid "Africa/Kigali"
-msgstr "África/Kigali"
+msgstr "Ãfrica/Kigali"
 
 #: calendar/zones.h:35
 msgid "Africa/Kinshasa"
-msgstr "África/Kinshasa"
+msgstr "Ãfrica/Kinshasa"
 
 #: calendar/zones.h:36
 msgid "Africa/Lagos"
-msgstr "África/Lagos"
+msgstr "Ãfrica/Lagos"
 
 #: calendar/zones.h:37
 msgid "Africa/Libreville"
-msgstr "África/Libreville"
+msgstr "Ãfrica/Libreville"
 
 #: calendar/zones.h:38
 msgid "Africa/Lome"
-msgstr "África/Lome"
+msgstr "Ãfrica/Lome"
 
 #: calendar/zones.h:39
 msgid "Africa/Luanda"
-msgstr "África/Luanda"
+msgstr "Ãfrica/Luanda"
 
 #: calendar/zones.h:40
 msgid "Africa/Lubumbashi"
-msgstr "África/Lumbasa"
+msgstr "Ãfrica/Lumbasa"
 
 #: calendar/zones.h:41
 msgid "Africa/Lusaka"
-msgstr "África/Lusaka"
+msgstr "Ãfrica/Lusaka"
 
 #: calendar/zones.h:42
 msgid "Africa/Malabo"
-msgstr "África/Malabo"
+msgstr "Ãfrica/Malabo"
 
 #: calendar/zones.h:43
 msgid "Africa/Maputo"
-msgstr "África/Maputo"
+msgstr "Ãfrica/Maputo"
 
 #: calendar/zones.h:44
 msgid "Africa/Maseru"
-msgstr "África/Maseru"
+msgstr "Ãfrica/Maseru"
 
 #: calendar/zones.h:45
 msgid "Africa/Mbabane"
-msgstr "África/Mbabane"
+msgstr "Ãfrica/Mbabane"
 
 #: calendar/zones.h:46
 msgid "Africa/Mogadishu"
-msgstr "África/Mogadishu"
+msgstr "Ãfrica/Mogadishu"
 
 #: calendar/zones.h:47
 msgid "Africa/Monrovia"
-msgstr "África/Monrovia"
+msgstr "Ãfrica/Monrovia"
 
 #: calendar/zones.h:48
 msgid "Africa/Nairobi"
-msgstr "África/Nairobi"
+msgstr "Ãfrica/Nairobi"
 
 #: calendar/zones.h:49
 msgid "Africa/Ndjamena"
-msgstr "África/Ndjamena"
+msgstr "Ãfrica/Ndjamena"
 
 #: calendar/zones.h:50
 msgid "Africa/Niamey"
-msgstr "África/Niamey"
+msgstr "Ãfrica/Niamey"
 
 #: calendar/zones.h:51
 msgid "Africa/Nouakchott"
-msgstr "África/Nouakchott"
+msgstr "Ãfrica/Nouakchott"
 
 #: calendar/zones.h:52
 msgid "Africa/Ouagadougou"
-msgstr "África/Ouagadougou"
+msgstr "Ãfrica/Ouagadougou"
 
 #: calendar/zones.h:53
 msgid "Africa/Porto-Novo"
-msgstr "África/Porto-Novo"
+msgstr "Ãfrica/Porto-Novo"
 
 #: calendar/zones.h:54
 msgid "Africa/Sao_Tome"
-msgstr "África/Sao_Tome"
+msgstr "Ãfrica/Sao_Tome"
 
 #: calendar/zones.h:55
 msgid "Africa/Timbuktu"
-msgstr "África/Timbuktu"
+msgstr "Ãfrica/Timbuktu"
 
 #: calendar/zones.h:56
 msgid "Africa/Tripoli"
-msgstr "África/Trípoli"
+msgstr "Ãfrica/TrÃpoli"
 
 #: calendar/zones.h:57
 msgid "Africa/Tunis"
-msgstr "África/Tunis"
+msgstr "Ãfrica/Tunis"
 
 #: calendar/zones.h:58
 msgid "Africa/Windhoek"
-msgstr "África/Windhoek"
+msgstr "Ãfrica/Windhoek"
 
 #: calendar/zones.h:59
 msgid "America/Adak"
-msgstr "América/Adak"
+msgstr "AmÃ©rica/Adak"
 
 #: calendar/zones.h:60
 msgid "America/Anchorage"
-msgstr "América/Anchorage"
+msgstr "AmÃ©rica/Anchorage"
 
 #: calendar/zones.h:61
 msgid "America/Anguilla"
-msgstr "América/Anguilla"
+msgstr "AmÃ©rica/Anguilla"
 
 #: calendar/zones.h:62
 msgid "America/Antigua"
-msgstr "América/Antigua"
+msgstr "AmÃ©rica/Antigua"
 
 #: calendar/zones.h:63
 msgid "America/Araguaina"
-msgstr "América/Araguaina"
+msgstr "AmÃ©rica/Araguaina"
 
 #: calendar/zones.h:64
 msgid "America/Aruba"
-msgstr "América/Aruba"
+msgstr "AmÃ©rica/Aruba"
 
 #: calendar/zones.h:65
 msgid "America/Asuncion"
-msgstr "América/Asuncion"
+msgstr "AmÃ©rica/Asuncion"
 
 #: calendar/zones.h:66
 msgid "America/Barbados"
-msgstr "América/Barbados"
+msgstr "AmÃ©rica/Barbados"
 
 #: calendar/zones.h:67
 msgid "America/Belem"
-msgstr "América/Belem"
+msgstr "AmÃ©rica/Belem"
 
 #: calendar/zones.h:68
 msgid "America/Belize"
-msgstr "América/Bélice"
+msgstr "AmÃ©rica/BÃ©lice"
 
 #: calendar/zones.h:69
 msgid "America/Boa_Vista"
-msgstr "América/Boa_Vista"
+msgstr "AmÃ©rica/Boa_Vista"
 
 #: calendar/zones.h:70
 msgid "America/Bogota"
-msgstr "América/Bogotá"
+msgstr "AmÃ©rica/BogotÃ¡"
 
 #: calendar/zones.h:71
 msgid "America/Boise"
-msgstr "América/Boise"
+msgstr "AmÃ©rica/Boise"
 
 #: calendar/zones.h:72
 msgid "America/Buenos_Aires"
-msgstr "América/Buenos_Aires"
+msgstr "AmÃ©rica/Buenos_Aires"
 
 #: calendar/zones.h:73
 msgid "America/Cambridge_Bay"
-msgstr "América/Cambridge_Bay"
+msgstr "AmÃ©rica/Cambridge_Bay"
 
 #: calendar/zones.h:74
 msgid "America/Cancun"
-msgstr "América/Cancún"
+msgstr "AmÃ©rica/CancÃºn"
 
 #: calendar/zones.h:75
 msgid "America/Caracas"
-msgstr "América/Caracas"
+msgstr "AmÃ©rica/Caracas"
 
 #: calendar/zones.h:76
 msgid "America/Catamarca"
-msgstr "América/Catamarca"
+msgstr "AmÃ©rica/Catamarca"
 
 #: calendar/zones.h:77
 msgid "America/Cayenne"
-msgstr "América/Cayenne"
+msgstr "AmÃ©rica/Cayenne"
 
 #: calendar/zones.h:78
 msgid "America/Cayman"
-msgstr "América/Cayman"
+msgstr "AmÃ©rica/Cayman"
 
 #: calendar/zones.h:79
 msgid "America/Chicago"
-msgstr "América/Chicago"
+msgstr "AmÃ©rica/Chicago"
 
 #: calendar/zones.h:80
 msgid "America/Chihuahua"
-msgstr "América/Chihuahua"
+msgstr "AmÃ©rica/Chihuahua"
 
 #: calendar/zones.h:81
 msgid "America/Cordoba"
-msgstr "América/Córdoba"
+msgstr "AmÃ©rica/CÃ³rdoba"
 
 #: calendar/zones.h:82
 msgid "America/Costa_Rica"
-msgstr "América/Costa_Rica"
+msgstr "AmÃ©rica/Costa_Rica"
 
 #: calendar/zones.h:83
 msgid "America/Cuiaba"
-msgstr "América/Cuiaba"
+msgstr "AmÃ©rica/Cuiaba"
 
 #: calendar/zones.h:84
 msgid "America/Curacao"
-msgstr "América/Curacao"
+msgstr "AmÃ©rica/Curacao"
 
 #: calendar/zones.h:85
 msgid "America/Danmarkshavn"
-msgstr "América/Danmarkshavn"
+msgstr "AmÃ©rica/Danmarkshavn"
 
 #: calendar/zones.h:86
 msgid "America/Dawson"
-msgstr "América/Dawson"
+msgstr "AmÃ©rica/Dawson"
 
 #: calendar/zones.h:87
 msgid "America/Dawson_Creek"
-msgstr "América/Dawson_Creek"
+msgstr "AmÃ©rica/Dawson_Creek"
 
 #: calendar/zones.h:88
 msgid "America/Denver"
-msgstr "América/Denver"
+msgstr "AmÃ©rica/Denver"
 
 #: calendar/zones.h:89
 msgid "America/Detroit"
-msgstr "América/Detroit"
+msgstr "AmÃ©rica/Detroit"
 
 #: calendar/zones.h:90
 msgid "America/Dominica"
-msgstr "América/Dominica"
+msgstr "AmÃ©rica/Dominica"
 
 #: calendar/zones.h:91
 msgid "America/Edmonton"
-msgstr "América/Edmonton"
+msgstr "AmÃ©rica/Edmonton"
 
 #: calendar/zones.h:92
 msgid "America/Eirunepe"
-msgstr "América/Eirunepe"
+msgstr "AmÃ©rica/Eirunepe"
 
 #: calendar/zones.h:93
 msgid "America/El_Salvador"
-msgstr "América/El_Salvador"
+msgstr "AmÃ©rica/El_Salvador"
 
 #: calendar/zones.h:94
 msgid "America/Fortaleza"
-msgstr "América/Fortaleza"
+msgstr "AmÃ©rica/Fortaleza"
 
 #: calendar/zones.h:95
 msgid "America/Glace_Bay"
-msgstr "América/Glace_Bay"
+msgstr "AmÃ©rica/Glace_Bay"
 
 #: calendar/zones.h:96
 msgid "America/Godthab"
-msgstr "América/Godthab"
+msgstr "AmÃ©rica/Godthab"
 
 #: calendar/zones.h:97
 msgid "America/Goose_Bay"
-msgstr "América/Goose_Bay"
+msgstr "AmÃ©rica/Goose_Bay"
 
 #: calendar/zones.h:98
 msgid "America/Grand_Turk"
-msgstr "América/Grand_Turk"
+msgstr "AmÃ©rica/Grand_Turk"
 
 #: calendar/zones.h:99
 msgid "America/Grenada"
-msgstr "América/Grenada"
+msgstr "AmÃ©rica/Grenada"
 
 #: calendar/zones.h:100
 msgid "America/Guadeloupe"
-msgstr "América/Guadalupe"
+msgstr "AmÃ©rica/Guadalupe"
 
 #: calendar/zones.h:101
 msgid "America/Guatemala"
-msgstr "América/Guatemala"
+msgstr "AmÃ©rica/Guatemala"
 
 #: calendar/zones.h:102
 msgid "America/Guayaquil"
-msgstr "América/Guayaquil"
+msgstr "AmÃ©rica/Guayaquil"
 
 #: calendar/zones.h:103
 msgid "America/Guyana"
-msgstr "América/Guyana"
+msgstr "AmÃ©rica/Guyana"
 
 #: calendar/zones.h:104
 msgid "America/Halifax"
-msgstr "América/Halifax"
+msgstr "AmÃ©rica/Halifax"
 
 #: calendar/zones.h:105
 msgid "America/Havana"
-msgstr "América/Havana"
+msgstr "AmÃ©rica/Havana"
 
 #: calendar/zones.h:106
 msgid "America/Hermosillo"
-msgstr "América/Hermosillo"
+msgstr "AmÃ©rica/Hermosillo"
 
 #: calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
-msgstr "América/Indiana/Indianapolis"
+msgstr "AmÃ©rica/Indiana/Indianapolis"
 
 #: calendar/zones.h:108
 msgid "America/Indiana/Knox"
-msgstr "América/Indiana/Knox"
+msgstr "AmÃ©rica/Indiana/Knox"
 
 #: calendar/zones.h:109
 msgid "America/Indiana/Marengo"
-msgstr "América/Indiana/Marengo"
+msgstr "AmÃ©rica/Indiana/Marengo"
 
 #: calendar/zones.h:110
 msgid "America/Indiana/Vevay"
-msgstr "América/Indiana/Vevay"
+msgstr "AmÃ©rica/Indiana/Vevay"
 
 #: calendar/zones.h:111
 msgid "America/Indianapolis"
-msgstr "América/Indianapolis"
+msgstr "AmÃ©rica/Indianapolis"
 
 #: calendar/zones.h:112
 msgid "America/Inuvik"
-msgstr "América/Inuvik"
+msgstr "AmÃ©rica/Inuvik"
 
 #: calendar/zones.h:113
 msgid "America/Iqaluit"
-msgstr "América/Iqaluit"
+msgstr "AmÃ©rica/Iqaluit"
 
 #: calendar/zones.h:114
 msgid "America/Jamaica"
-msgstr "América/Jamaica"
+msgstr "AmÃ©rica/Jamaica"
 
 #: calendar/zones.h:115
 msgid "America/Jujuy"
-msgstr "América/Jujuy"
+msgstr "AmÃ©rica/Jujuy"
 
 #: calendar/zones.h:116
 msgid "America/Juneau"
-msgstr "América/Juneau"
+msgstr "AmÃ©rica/Juneau"
 
 #: calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
-msgstr "América/Kentucky/Louisville"
+msgstr "AmÃ©rica/Kentucky/Louisville"
 
 #: calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
-msgstr "América/Kentucky/Monticello"
+msgstr "AmÃ©rica/Kentucky/Monticello"
 
 #: calendar/zones.h:119
 msgid "America/La_Paz"
-msgstr "América/La_Paz"
+msgstr "AmÃ©rica/La_Paz"
 
 #: calendar/zones.h:120
 msgid "America/Lima"
-msgstr "América/Lima"
+msgstr "AmÃ©rica/Lima"
 
 #: calendar/zones.h:121
 msgid "America/Los_Angeles"
-msgstr "América/Los_Angeles"
+msgstr "AmÃ©rica/Los_Angeles"
 
 #: calendar/zones.h:122
 msgid "America/Louisville"
-msgstr "América/Louisville"
+msgstr "AmÃ©rica/Louisville"
 
 #: calendar/zones.h:123
 msgid "America/Maceio"
-msgstr "América/Maceio"
+msgstr "AmÃ©rica/Maceio"
 
 #: calendar/zones.h:124
 msgid "America/Managua"
-msgstr "América/Managua"
+msgstr "AmÃ©rica/Managua"
 
 #: calendar/zones.h:125
 msgid "America/Manaus"
-msgstr "América/Manaus"
+msgstr "AmÃ©rica/Manaus"
 
 #: calendar/zones.h:126
 msgid "America/Martinique"
-msgstr "América/Martinica"
+msgstr "AmÃ©rica/Martinica"
 
 #: calendar/zones.h:127
 msgid "America/Mazatlan"
-msgstr "América/Mazatlan"
+msgstr "AmÃ©rica/Mazatlan"
 
 #: calendar/zones.h:128
 msgid "America/Mendoza"
-msgstr "América/Mendoza"
+msgstr "AmÃ©rica/Mendoza"
 
 #: calendar/zones.h:129
 msgid "America/Menominee"
-msgstr "América/Menominee"
+msgstr "AmÃ©rica/Menominee"
 
 #: calendar/zones.h:130
 msgid "America/Merida"
-msgstr "América/Merida"
+msgstr "AmÃ©rica/Merida"
 
 #: calendar/zones.h:131
 msgid "America/Mexico_City"
-msgstr "América/Ciudad_de_Mexico"
+msgstr "AmÃ©rica/Ciudad_de_Mexico"
 
 #: calendar/zones.h:132
 msgid "America/Miquelon"
-msgstr "América/Miquelon"
+msgstr "AmÃ©rica/Miquelon"
 
 #: calendar/zones.h:133
 msgid "America/Monterrey"
-msgstr "América/Monterey"
+msgstr "AmÃ©rica/Monterey"
 
 #: calendar/zones.h:134
 msgid "America/Montevideo"
-msgstr "América/Montevideo"
+msgstr "AmÃ©rica/Montevideo"
 
 #: calendar/zones.h:135
 msgid "America/Montreal"
-msgstr "América/Montreal"
+msgstr "AmÃ©rica/Montreal"
 
 #: calendar/zones.h:136
 msgid "America/Montserrat"
-msgstr "América/Montserrat"
+msgstr "AmÃ©rica/Montserrat"
 
 #: calendar/zones.h:137
 msgid "America/Nassau"
-msgstr "América/Nassau"
+msgstr "AmÃ©rica/Nassau"
 
 #: calendar/zones.h:138
 msgid "America/New_York"
-msgstr "América/Nueva York"
+msgstr "AmÃ©rica/Nueva York"
 
 #: calendar/zones.h:139
 msgid "America/Nipigon"
-msgstr "América/Nipigon"
+msgstr "AmÃ©rica/Nipigon"
 
 #: calendar/zones.h:140
 msgid "America/Nome"
-msgstr "América/Nome"
+msgstr "AmÃ©rica/Nome"
 
 #: calendar/zones.h:141
 msgid "America/Noronha"
-msgstr "América/Noronha"
+msgstr "AmÃ©rica/Noronha"
 
 #: calendar/zones.h:142
 msgid "America/North_Dakota/Center"
-msgstr "América/North_Dakota/Center"
+msgstr "AmÃ©rica/North_Dakota/Center"
 
 #: calendar/zones.h:143
 msgid "America/Panama"
-msgstr "América/Panamá"
+msgstr "AmÃ©rica/PanamÃ¡"
 
 #: calendar/zones.h:144
 msgid "America/Pangnirtung"
-msgstr "América/Pangnirtung"
+msgstr "AmÃ©rica/Pangnirtung"
 
 #: calendar/zones.h:145
 msgid "America/Paramaribo"
-msgstr "América/Paramaribo"
+msgstr "AmÃ©rica/Paramaribo"
 
 #: calendar/zones.h:146
 msgid "America/Phoenix"
-msgstr "América/Phoenix"
+msgstr "AmÃ©rica/Phoenix"
 
 #: calendar/zones.h:147
 msgid "America/Port-au-Prince"
-msgstr "América/Port-au-Prince"
+msgstr "AmÃ©rica/Port-au-Prince"
 
 #: calendar/zones.h:148
 msgid "America/Port_of_Spain"
-msgstr "América/Port_of_Spain"
+msgstr "AmÃ©rica/Port_of_Spain"
 
 #: calendar/zones.h:149
 msgid "America/Porto_Velho"
-msgstr "América/Porto_Velho"
+msgstr "AmÃ©rica/Porto_Velho"
 
 #: calendar/zones.h:150
 msgid "America/Puerto_Rico"
-msgstr "América/Puerto Rico"
+msgstr "AmÃ©rica/Puerto Rico"
 
 #: calendar/zones.h:151
 msgid "America/Rainy_River"
-msgstr "América/Rainy_River"
+msgstr "AmÃ©rica/Rainy_River"
 
 #: calendar/zones.h:152
 msgid "America/Rankin_Inlet"
-msgstr "América/Rankin_Inlet"
+msgstr "AmÃ©rica/Rankin_Inlet"
 
 #: calendar/zones.h:153
 msgid "America/Recife"
-msgstr "América/Recife"
+msgstr "AmÃ©rica/Recife"
 
 #: calendar/zones.h:154
 msgid "America/Regina"
-msgstr "América/Regina"
+msgstr "AmÃ©rica/Regina"
 
 #: calendar/zones.h:155
 msgid "America/Rio_Branco"
-msgstr "América/Rio_Branco"
+msgstr "AmÃ©rica/Rio_Branco"
 
 #: calendar/zones.h:156
 msgid "America/Rosario"
-msgstr "América/Rosario"
+msgstr "AmÃ©rica/Rosario"
 
 #: calendar/zones.h:157
 msgid "America/Santiago"
-msgstr "América/Santiago"
+msgstr "AmÃ©rica/Santiago"
 
 #: calendar/zones.h:158
 msgid "America/Santo_Domingo"
-msgstr "América/Santo_Domingo"
+msgstr "AmÃ©rica/Santo_Domingo"
 
 #: calendar/zones.h:159
 msgid "America/Sao_Paulo"
-msgstr "América/Sao_Paulo"
+msgstr "AmÃ©rica/Sao_Paulo"
 
 #: calendar/zones.h:160
 msgid "America/Scoresbysund"
-msgstr "América/Scoresbysund"
+msgstr "AmÃ©rica/Scoresbysund"
 
 #: calendar/zones.h:161
 msgid "America/Shiprock"
-msgstr "América/Shiprock"
+msgstr "AmÃ©rica/Shiprock"
 
 #: calendar/zones.h:162
 msgid "America/St_Johns"
-msgstr "América/St_Johns"
+msgstr "AmÃ©rica/St_Johns"
 
 #: calendar/zones.h:163
 msgid "America/St_Kitts"
-msgstr "América/St_Kitts"
+msgstr "AmÃ©rica/St_Kitts"
 
 #: calendar/zones.h:164
 msgid "America/St_Lucia"
-msgstr "América/St_Lucia"
+msgstr "AmÃ©rica/St_Lucia"
 
 #: calendar/zones.h:165
 msgid "America/St_Thomas"
-msgstr "América/St_Thomas"
+msgstr "AmÃ©rica/St_Thomas"
 
 #: calendar/zones.h:166
 msgid "America/St_Vincent"
-msgstr "América/St_Vincent"
+msgstr "AmÃ©rica/St_Vincent"
 
 #: calendar/zones.h:167
 msgid "America/Swift_Current"
-msgstr "América/Swift_Current"
+msgstr "AmÃ©rica/Swift_Current"
 
 #: calendar/zones.h:168
 msgid "America/Tegucigalpa"
-msgstr "América/Tegucigalpa"
+msgstr "AmÃ©rica/Tegucigalpa"
 
 #: calendar/zones.h:169
 msgid "America/Thule"
-msgstr "América/Thule"
+msgstr "AmÃ©rica/Thule"
 
 #: calendar/zones.h:170
 msgid "America/Thunder_Bay"
-msgstr "América/Thunder Bay"
+msgstr "AmÃ©rica/Thunder Bay"
 
 #: calendar/zones.h:171
 msgid "America/Tijuana"
-msgstr "América/Tijuana"
+msgstr "AmÃ©rica/Tijuana"
 
 #: calendar/zones.h:172
 msgid "America/Tortola"
-msgstr "América/Tortola"
+msgstr "AmÃ©rica/Tortola"
 
 #: calendar/zones.h:173
 msgid "America/Vancouver"
-msgstr "América/Vancouver"
+msgstr "AmÃ©rica/Vancouver"
 
 #: calendar/zones.h:174
 msgid "America/Whitehorse"
-msgstr "América/Whitehorse"
+msgstr "AmÃ©rica/Whitehorse"
 
 #: calendar/zones.h:175
 msgid "America/Winnipeg"
-msgstr "América/Winnipeg"
+msgstr "AmÃ©rica/Winnipeg"
 
 #: calendar/zones.h:176
 msgid "America/Yakutat"
-msgstr "América/Yakutat"
+msgstr "AmÃ©rica/Yakutat"
 
 #: calendar/zones.h:177
 msgid "America/Yellowknife"
-msgstr "América/Yellowknife"
+msgstr "AmÃ©rica/Yellowknife"
 
 #: calendar/zones.h:178
 msgid "Antarctica/Casey"
-msgstr "Antártico/Casey"
+msgstr "AntÃ¡rtico/Casey"
 
 #: calendar/zones.h:179
 msgid "Antarctica/Davis"
-msgstr "Antártico/Davis"
+msgstr "AntÃ¡rtico/Davis"
 
 #: calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
-msgstr "Antártico/DumontDUrville"
+msgstr "AntÃ¡rtico/DumontDUrville"
 
 #: calendar/zones.h:181
 msgid "Antarctica/Mawson"
-msgstr "Antártico/Mawson"
+msgstr "AntÃ¡rtico/Mawson"
 
 #: calendar/zones.h:182
 msgid "Antarctica/McMurdo"
-msgstr "Antártico/McMurdo"
+msgstr "AntÃ¡rtico/McMurdo"
 
 #: calendar/zones.h:183
 msgid "Antarctica/Palmer"
-msgstr "Antártico/Palmer"
+msgstr "AntÃ¡rtico/Palmer"
 
 #: calendar/zones.h:184
 msgid "Antarctica/South_Pole"
-msgstr "Antártico/Polo Sur"
+msgstr "AntÃ¡rtico/Polo Sur"
 
 #: calendar/zones.h:185
 msgid "Antarctica/Syowa"
-msgstr "Antártico/Syowa"
+msgstr "AntÃ¡rtico/Syowa"
 
 #: calendar/zones.h:186
 msgid "Antarctica/Vostok"
-msgstr "Antártico/Vostok"
+msgstr "AntÃ¡rtico/Vostok"
 
 #: calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
@@ -7603,47 +7711,47 @@ msgstr "Asia/Yerevan"
 
 #: calendar/zones.h:266
 msgid "Atlantic/Azores"
-msgstr "Atlantico/Azores"
+msgstr "AtlÃ¡ntico/Azores"
 
 #: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
-msgstr "Atlántico/Bermudas"
+msgstr "AtlÃ¡ntico/Bermudas"
 
 #: calendar/zones.h:268
 msgid "Atlantic/Canary"
-msgstr "Atlantico/Canarias"
+msgstr "AtlÃ¡ntico/Canarias"
 
 #: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
-msgstr "Atlántico/Cabo Verde"
+msgstr "AtlÃ¡ntico/Cabo Verde"
 
 #: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
-msgstr "Atlantico/Feroe"
+msgstr "AtlÃ¡ntico/Feroe"
 
 #: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantico/Jan_Mayen"
+msgstr "AtlÃ¡ntico/Jan_Mayen"
 
 #: calendar/zones.h:272
 msgid "Atlantic/Madeira"
-msgstr "Atlantico/Madeira"
+msgstr "AtlÃ¡ntico/Madeira"
 
 #: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
-msgstr "Atlantico/Reykjavik"
+msgstr "AtlÃ¡ntico/Reykjavik"
 
 #: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
-msgstr "Atlantico/South_Georgia"
+msgstr "AtlÃ¡ntico/South_Georgia"
 
 #: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
-msgstr "Atlantico/St_Helena"
+msgstr "AtlÃ¡ntico/St_Helena"
 
 #: calendar/zones.h:276
 msgid "Atlantic/Stanley"
-msgstr "Atlantico/Stanley"
+msgstr "AtlÃ¡ntico/Stanley"
 
 #: calendar/zones.h:277
 msgid "Australia/Adelaide"
@@ -7707,7 +7815,7 @@ msgstr "Europa/Belgrado"
 
 #: calendar/zones.h:292
 msgid "Europe/Berlin"
-msgstr "Europa/Berlín"
+msgstr "Europa/BerlÃn"
 
 #: calendar/zones.h:293
 msgid "Europe/Bratislava"
@@ -7731,11 +7839,11 @@ msgstr "Europa/Chisinau"
 
 #: calendar/zones.h:298
 msgid "Europe/Copenhagen"
-msgstr "Europe/Copenhagen"
+msgstr "Europa/Copenhagen"
 
 #: calendar/zones.h:299
 msgid "Europe/Dublin"
-msgstr "Europa/Dublín"
+msgstr "Europa/DublÃn"
 
 #: calendar/zones.h:300
 msgid "Europe/Gibraltar"
@@ -7787,11 +7895,11 @@ msgstr "Europa/Minsk"
 
 #: calendar/zones.h:312
 msgid "Europe/Monaco"
-msgstr "Europa/Mónaco"
+msgstr "Europa/MÃ³naco"
 
 #: calendar/zones.h:313
 msgid "Europe/Moscow"
-msgstr "Europa/Moscú"
+msgstr "Europa/MoscÃº"
 
 #: calendar/zones.h:314
 msgid "Europe/Nicosia"
@@ -7803,7 +7911,7 @@ msgstr "Europa/Oslo"
 
 #: calendar/zones.h:316
 msgid "Europe/Paris"
-msgstr "Europa/París"
+msgstr "Europa/ParÃs"
 
 #: calendar/zones.h:317
 msgid "Europe/Prague"
@@ -7891,228 +7999,236 @@ msgstr "Europa/Zurich"
 
 #: calendar/zones.h:338
 msgid "Indian/Antananarivo"
-msgstr "Índico/Antananarivo"
+msgstr "Indico/Antananarivo"
 
 #: calendar/zones.h:339
 msgid "Indian/Chagos"
-msgstr "Índico/Chagos"
+msgstr "Indico/Chagos"
 
 #: calendar/zones.h:340
 msgid "Indian/Christmas"
-msgstr "Índico/Christmas"
+msgstr "Indico/Christmas"
 
 #: calendar/zones.h:341
 msgid "Indian/Cocos"
-msgstr "Índico/Cocos"
+msgstr "Indico/Cocos"
 
 #: calendar/zones.h:342
 msgid "Indian/Comoro"
-msgstr "Índico/Comoros"
+msgstr "Indico/Comoros"
 
 #: calendar/zones.h:343
 msgid "Indian/Kerguelen"
-msgstr "Índico/Kerguelen"
+msgstr "Indico/Kerguelen"
 
 #: calendar/zones.h:344
 msgid "Indian/Mahe"
-msgstr "Índico/Mahe"
+msgstr "Indico/Mahe"
 
 #: calendar/zones.h:345
 msgid "Indian/Maldives"
-msgstr "Índico/Maldivas"
+msgstr "Indico/Maldivas"
 
 #: calendar/zones.h:346
 msgid "Indian/Mauritius"
-msgstr "Índico/Mauricio"
+msgstr "Indico/Mauricio"
 
 #: calendar/zones.h:347
 msgid "Indian/Mayotte"
-msgstr "Índico/Mayotte"
+msgstr "Indico/Mayotte"
 
 #: calendar/zones.h:348
 msgid "Indian/Reunion"
-msgstr "Índico/Reunión"
+msgstr "Indico/ReuniÃ³n"
 
 #: calendar/zones.h:349
 msgid "Pacific/Apia"
-msgstr "Pacífico/Apia"
+msgstr "PacÃfico/Apia"
 
 #: calendar/zones.h:350
 msgid "Pacific/Auckland"
-msgstr "Pacífico/Auckland"
+msgstr "PacÃfico/Auckland"
 
 #: calendar/zones.h:351
 msgid "Pacific/Chatham"
-msgstr "Pacífico/Chatham"
+msgstr "PacÃfico/Chatham"
 
 #: calendar/zones.h:352
 msgid "Pacific/Easter"
-msgstr "Pacífico/Easter"
+msgstr "PacÃfico/Easter"
 
 #: calendar/zones.h:353
 msgid "Pacific/Efate"
-msgstr "Pacífico/Efate"
+msgstr "PacÃfico/Efate"
 
 #: calendar/zones.h:354
 msgid "Pacific/Enderbury"
-msgstr "Pacífico/Enderbury"
+msgstr "PacÃfico/Enderbury"
 
 #: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
-msgstr "Pacífico/Fakaofo"
+msgstr "PacÃfico/Fakaofo"
 
 #: calendar/zones.h:356
 msgid "Pacific/Fiji"
-msgstr "Pacífico/Fiji"
+msgstr "PacÃfico/Fiji"
 
 #: calendar/zones.h:357
 msgid "Pacific/Funafuti"
-msgstr "Pacífico/Funafuti"
+msgstr "PacÃfico/Funafuti"
 
 #: calendar/zones.h:358
 msgid "Pacific/Galapagos"
-msgstr "Pacífico/Galapagos"
+msgstr "PacÃfico/Galapagos"
 
 #: calendar/zones.h:359
 msgid "Pacific/Gambier"
-msgstr "Pacífico/Gambier"
+msgstr "PacÃfico/Gambier"
 
 #: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
-msgstr "Pacífico/Guadalcanal"
+msgstr "PacÃfico/Guadalcanal"
 
 #: calendar/zones.h:361
 msgid "Pacific/Guam"
-msgstr "Pacífico/Guam"
+msgstr "PacÃfico/Guam"
 
 #: calendar/zones.h:362
 msgid "Pacific/Honolulu"
-msgstr "Pacífico/Honolulu"
+msgstr "PacÃfico/Honolulu"
 
 #: calendar/zones.h:363
 msgid "Pacific/Johnston"
-msgstr "Pacífico/Johnston"
+msgstr "PacÃfico/Johnston"
 
 #: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
-msgstr "Pacífico/Kiritimati"
+msgstr "PacÃfico/Kiritimati"
 
 #: calendar/zones.h:365
 msgid "Pacific/Kosrae"
-msgstr "Pacífico/Kosrae"
+msgstr "PacÃfico/Kosrae"
 
 #: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
-msgstr "Pacífico/Kwajalein"
+msgstr "PacÃfico/Kwajalein"
 
 #: calendar/zones.h:367
 msgid "Pacific/Majuro"
-msgstr "Pacífico/Majuro"
+msgstr "PacÃfico/Majuro"
 
 #: calendar/zones.h:368
 msgid "Pacific/Marquesas"
-msgstr "Pacífico/Marquesas"
+msgstr "PacÃfico/Marquesas"
 
 #: calendar/zones.h:369
 msgid "Pacific/Midway"
-msgstr "Pacífico/Midway"
+msgstr "PacÃfico/Midway"
 
 #: calendar/zones.h:370
 msgid "Pacific/Nauru"
-msgstr "Pacífico/Nauru"
+msgstr "PacÃfico/Nauru"
 
 #: calendar/zones.h:371
 msgid "Pacific/Niue"
-msgstr "Pacífico/Niue"
+msgstr "PacÃfico/Niue"
 
 #: calendar/zones.h:372
 msgid "Pacific/Norfolk"
-msgstr "Pacífico/Norfolk"
+msgstr "PacÃfico/Norfolk"
 
 #: calendar/zones.h:373
 msgid "Pacific/Noumea"
-msgstr "Pacífico/Noumea"
+msgstr "PacÃfico/Noumea"
 
 #: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
-msgstr "Pacífico/Pago_Pago"
+msgstr "PacÃfico/Pago_Pago"
 
 #: calendar/zones.h:375
 msgid "Pacific/Palau"
-msgstr "Pacífico/Palau"
+msgstr "PacÃfico/Palau"
 
 #: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
-msgstr "Pacífico/Pitcairn"
+msgstr "PacÃfico/Pitcairn"
 
 #: calendar/zones.h:377
 msgid "Pacific/Ponape"
-msgstr "Pacífico/Ponape"
+msgstr "PacÃfico/Ponape"
 
 #: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
-msgstr "Pacífico/Port_Moresby"
+msgstr "PacÃfico/Port_Moresby"
 
 #: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
-msgstr "Pacífico/Rarotonga"
+msgstr "PacÃfico/Rarotonga"
 
 #: calendar/zones.h:380
 msgid "Pacific/Saipan"
-msgstr "Pacífico/Saipan"
+msgstr "PacÃfico/Saipan"
 
 #: calendar/zones.h:381
 msgid "Pacific/Tahiti"
-msgstr "Pacífico/Tahiti"
+msgstr "PacÃfico/Tahiti"
 
 #: calendar/zones.h:382
 msgid "Pacific/Tarawa"
-msgstr "Pacífico/Tarawa"
+msgstr "PacÃfico/Tarawa"
 
 #: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
-msgstr "Pacífico/Tongatapu"
+msgstr "PacÃfico/Tongatapu"
 
 #: calendar/zones.h:384
 msgid "Pacific/Truk"
-msgstr "Pacífico/Truk"
+msgstr "PacÃfico/Truk"
 
 #: calendar/zones.h:385
 msgid "Pacific/Wake"
-msgstr "Pacífico/Wake"
+msgstr "PacÃfico/Wake"
 
 #: calendar/zones.h:386
 msgid "Pacific/Wallis"
-msgstr "Pacífico/Wallis"
+msgstr "PacÃfico/Wallis"
 
 #: calendar/zones.h:387
 msgid "Pacific/Yap"
-msgstr "Pacífico/Yap"
+msgstr "PacÃfico/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
-msgstr "Las firmas no están implementadas en este cifrado"
+msgstr "Este mÃ©todo de encriptaciÃ³n no soporta firmas"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
-msgstr "La verificación no está implementada en este cifrado"
+msgstr "Este mÃ©todo de encriptaciÃ³n no soporta verificaciÃ³n"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
-msgstr "El cifrado no está implementada por este cifrado"
+msgstr "Este mÃ©todo de encriptaciÃ³n no soporta cifrado"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
-msgstr "El descifrado no está implementada por este cifrado"
+msgstr "Este mÃ©todo de encriptaciÃ³n no soporta descifrado"
+
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr "No puede importar claves con este mÃ©todo de encriptaciÃ³n"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr "No puede exportar claves con este mÃ©todo de encriptaciÃ³n"
+
+#: camel/camel-data-cache.c:137
 msgid "Unable to create cache path"
-msgstr "No se pudo crear la ruta a la caché"
+msgstr "No se pudo crear la ruta a la cachÃ©"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "No puedo quitar entrada de caché: %s: %s"
+msgstr "No se ha podido quitar entrada de cachÃ©: %s: %s"
 
 #: camel/camel-disco-diary.c:185
 #, c-format
@@ -8121,8 +8237,8 @@ msgid ""
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"No pude escribir una entrada del archivo de actividad: %s\n"
-"Las siguientes operaciones en este servidor no serán respondidas\n"
+"No se ha podido escribir una entrada del archivo de actividad: %s\n"
+"Las siguientes operaciones en este servidor no serÃ¡n registradas\n"
 "cuando se reconecte a la red."
 
 #: camel/camel-disco-diary.c:248
@@ -8132,9 +8248,9 @@ msgid ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"No puede abrir `%s':\n"
+"No puede abrir Â«%sÂ»:\n"
 "%s\n"
-"Los cambios hechos a esta carpeta no serán resincronizados."
+"Los cambios hechos a esta carpeta no serÃ¡n resincronizados."
 
 #: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
@@ -8143,88 +8259,111 @@ msgstr "Resincronizando con el servidor"
 #: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Preparando carpeta '%s' para desconexión"
+msgstr "Preparando carpeta Â«%sÂ» para desconexiÃ³n"
 
 #: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
-msgstr "Debe estar trabajando en línea para completar esta operación"
+msgstr "Debe estar trabajando conectado para completar esta operaciÃ³n"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:941
 msgid "Unable to open spool folder"
-msgstr "No pude abrir la carpeta temporal"
+msgstr "No se ha podido abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:950
 msgid "Unable to process spool folder"
-msgstr "No pude procesar la carpeta temporal"
+msgstr "No se ha podido procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:965
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:969
 msgid "Cannot open message"
-msgstr "No puedo abrir el mensaje"
+msgstr "No se puede abrir el mensaje"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1057
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1072
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "Error en el mensaje %d de %d"
+msgstr "FallÃ³ en el mensaje %d de %d"
 
 #: camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
-msgstr "Error al obtener el mensaje."
+msgstr "Fallo al obtener el mensaje."
 
 #: camel/camel-filter-search.c:387
 msgid "Invalid arguments to (system-flag)"
-msgstr "Argumentos inválidos a (Marca de sistema)"
+msgstr "Argumentos invÃ¡lidos a (system-flag)"
 
 #: camel/camel-filter-search.c:402
 msgid "Invalid arguments to (user-tag)"
-msgstr "Argumentos inválidos a (user-tag)"
+msgstr "Argumentos invÃ¡lidos a (user-tag)"
 
 #: camel/camel-filter-search.c:514
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
-msgstr "Fallo al crear redirección a '%s': %s"
+msgstr "Fallo al crear pipe a Â«%sÂ»: %s"
 
 #: camel/camel-filter-search.c:550
 #, c-format
 msgid "Failed to create create child process '%s': %s"
-msgstr "Error al crear proceso hijo %s: %s"
+msgstr "Error al crear proceso hijo Â«%sÂ»: %s"
 
 #: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
+msgstr "Error ejecutando la bÃºsqueda del filtro: %s: %s"
+
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "OperaciÃ³n no implementada: aÃ±adir mensaje: para %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "OperaciÃ³n no implementada: bÃºsqueda segÃºn la expresiÃ³n %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "OperaciÃ³n no implementada: bÃºsqueda por uids: para %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Moviendo mensajes"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Copiando mensajes"
 
 #: camel/camel-folder-search.c:343
 #, c-format
@@ -8232,7 +8371,7 @@ msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"No puedo analizar la expresión de búsqueda %s:\n"
+"No se puede analizar la expresiÃ³n de bÃºsqueda %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:353
@@ -8241,216 +8380,192 @@ msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Error ejecutando la búsqueda según la expresión %s:\n"
+"Error ejecutando la bÃºsqueda segÃºn la expresiÃ³n %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
-msgstr "(concordar todas) requiere un único resultado booleano"
+msgstr "(coincidir con todas) requiere un Ãºnico resultado booleano"
 
 #: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
-msgstr "Realizando búsqueda en cabecera desconocida: %s"
-
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operación no implementada: añadir mensaje: para %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operación no implementada: búsqueda según la expresión %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Operación no implementada: búsqueda por uids: para %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Moviendo mensajes"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Copiando mensajes"
+msgstr "Realizando bÃºsqueda en cabecera desconocida: %s"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Se encontró un mensaje de estado GNUPG inesperado:\n"
+"Se encontrÃ³ un mensaje de estado GNUPG inesperado:\n"
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr "Fallo al analizar el id del usuario gpg"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
-msgstr "Fallo al analizar la petición de contraseña gpg"
+msgstr "Fallo al analizar la peticiÃ³n de contraseÃ±a gpg"
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Necesita una contraseña para desbloquear la clave para \n"
-"el usuario \"%s\""
+"Necesita una contraseÃ±a para desbloquear la clave para \n"
+"el usuario Â«%sÂ»"
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
+#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
+#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:544
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
+msgstr "FallÃ³ al desbloquear la clave secreta: se dieron 3 contraseÃ±as falsas."
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del GNUPG: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "No se proporcionaron datos"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "No puedo cifrar este mensaje: no hay destinatarios."
+msgstr "Ha fallado la encriptaciÃ³n: no se han especificado remitentes vÃ¡lidos."
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1122
 #, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr ""
-"Fallo de GPG %s mensaje: %s\n"
+"Fallo al GPG %s mensaje: %s\n"
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1128
 #, c-format
-msgid "Failed to GPG %s message: %s\n"
-msgstr "Error al firmar con GPG %sl mensaje : %s\n"
+msgid "Failed to GPG %s: %s\n"
+msgstr "Error al  GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1197
-#, c-format, fuzzy
+#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1580
+#, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Error al ejecutar gpg: %s"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
+#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
+#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
 msgid "Failed to execute gpg."
 msgstr "Fallo al ejecutar gpg."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1330
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"No puedo verificar la firma del mensaje: no pude crear fichero temporal: %s"
+msgstr "No se puede verificar la firma del mensaje: no se ha podido crear el archivo temporal: %s"
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "No pude crear un conducto(pipe) para la ayuda: %s"
+msgid "Could not create lock file for %s: %s"
+msgstr "No se ha podido bloquear el archivo para %s: %s"
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "No puedo hacer un fork del ayudante de bloqueo: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Tiempo de espera agotado tratando de cerrar el archivo %s. IntÃ©ntelo mÃ¡s tarde."
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "No puedo bloquear '%s': error de protocolo con el ayudante de bloqueo"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "No puedo bloquear '%s'"
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock-client.c:111
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No pude bloquear el archivo para %s: %s"
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No se ha podido crear un conducto(pipe) para la ayuda: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock-client.c:124
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Dio un timeout tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgid "Cannot fork locking helper: %s"
+msgstr "No se puede hacer un fork del ayudante de bloqueo: %s"
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Fallo al hacer un lock usando fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "No se puede bloquear Â«%sÂ»: error del protocolo con lock-helper"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock-client.c:215
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Fallo al hacer un lock usando flock(2): %s"
+msgid "Could not lock '%s'"
+msgstr "No se puede bloquear Â«%sÂ»"
 
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "No pude comprobar el archivo de correo %s: %s"
+msgstr "No se ha podido comprobar el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "No pude abrir el archivo de correo %s: %s"
+msgstr "No se ha podido abrir el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "No pude abrir el archivo de correo temporal %s: %s"
+msgstr "No se ha podido abrir el archivo de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
+msgstr "FallÃ³ al guardar el correo en al archivo temporal %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "No pude crear un conducto(pipe): %s"
+msgstr "No se ha podido crear un pipe: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No se puede hacer un fork: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallado: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Error desconocido)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error leyendo el archivo de correo: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error escribiendo en el archivo temporal de correo: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
@@ -8461,47 +8576,48 @@ msgstr "Fallo al desencriptar la parte MIME: error del protocolo"
 
 #: camel/camel-multipart-encrypted.c:287
 msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "Fallo al desencirptar la parte MIME: estructura inválida"
+msgstr "Fallo al desencriptar la parte MIME: estructura invÃ¡lida"
 
 #: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
-msgstr "Fallo al desdencriptar la parte MIME: error de análisis"
+msgstr "Fallo al desencriptar la parte MIME: error de anÃ¡lisis"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:625
 msgid "This is a digitally signed message part"
-msgstr "Esta parte del mensaje esta firmada digitalmente"
+msgstr "Esta parte del mensaje estÃ¡ firmada digitalmente"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:679
 msgid "parse error"
-msgstr "error de análisis"
+msgstr "error de anÃ¡lisis"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"No pude cargar %s: La carga de módulos no está implementada es este sistema."
+"No se ha podido cargar %s: La carga de mÃ³dulos no estÃ¡ implementada es este "
+"sistema."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "No puedo cargar %s: %s"
+msgstr "No se puede cargar %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "No pude cagar %s: No hay código de inicialización en el módulo."
+msgstr "No se ha podido cagar %s: No hay cÃ³digo de inicializaciÃ³n en el mÃ³dulo."
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
-msgstr "Anónimo"
+msgstr "AnÃ³nimo"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Esta opción conectará con el servidor usando un usuario anónimo."
+msgstr "Esta opciÃ³n conectarÃ¡ con el servidor usando un usuario anÃ³nimo."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
-msgstr "Fallo en la autenticación."
+msgstr "Fallo en la autenticaciÃ³n."
 
 #: camel/camel-sasl-anonymous.c:119
 #, c-format
@@ -8509,7 +8625,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Dirección de correo errónea información de ayuda:\n"
+"DirecciÃ³n de correo errÃ³nea informaciÃ³n de ayuda:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
@@ -8518,7 +8634,7 @@ msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
-"Información opaca de seguimiento inválida:\n"
+"InformaciÃ³n opaca de seguimiento invÃ¡lida:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:143
@@ -8527,7 +8643,7 @@ msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
-"Información de seguimiento inválida:\n"
+"InformaciÃ³n de seguimiento invÃ¡lida:\n"
 "%s"
 
 #: camel/camel-sasl-cram-md5.c:35
@@ -8539,8 +8655,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Esta opción conectará con el servidor usando una clave segura CRAM-MD5, si el "
-"servidor lo implementa."
+"Esta opciÃ³n conectarÃ¡ con el servidor usando una clave segura CRAM-MD5, si "
+"el servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -8551,8 +8667,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, si "
-"el servidor lo implementa."
+"Esta opciÃ³n conectarÃ¡ con el servidor usando una clave segura DIGEST-MD5, "
+"si el servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8560,21 +8676,21 @@ msgstr "Reto del servidor demasiado largo (>2048 octetos)\n"
 
 #: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
-msgstr "Reto del servidor no válido\n"
+msgstr "Reto del servidor no vÃ¡lido\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+"El reto del servidor contiene una valor Â«Calidad de ProtecciÃ³nÂ» no "
+"vÃ¡lido\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
-msgstr "La respuesta del servidor no contenía información de autorización\n"
+msgstr "La respuesta del servidor no contenÃa informaciÃ³n de autorizaciÃ³n\n"
 
 #: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
-msgstr ""
-"La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr "La respuesta del servidor contenÃa informaciÃ³n de autorizaciÃ³n incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
@@ -8585,9 +8701,8 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
-msgid ""
-"This option will connect to the server using Kerberos 4 authentication."
-msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 4."
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "Esta opciÃ³n conectarÃ¡ con el servidor usando autenticaciÃ³n Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -8595,25 +8710,25 @@ msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
-"No pude obtener la entrada Kerberos:\n"
+"No se ha podido obtener la entrada Kerberos:\n"
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
+#: camel/providers/imap/camel-imap-store.c:1049
 msgid "Bad authentication response from server."
-msgstr "Respuesta de autenticación errónea desde el servidor."
+msgstr "Respuesta de autenticaciÃ³n errÃ³nea desde el servidor."
 
 #: camel/camel-sasl-login.c:32
 msgid "Login"
-msgstr "Inicio de sesión"
+msgstr "Inicio de sesiÃ³n"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Esta opción conectará con el servidor usando una simple contraseña."
+msgstr "Esta opciÃ³n conectarÃ¡ con el servidor usando una simple contraseÃ±a."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
-msgstr "Estado de la autenticación desconocido."
+msgstr "Estado de la autenticaciÃ³n desconocido."
 
 #: camel/camel-sasl-ntlm.c:31
 msgid "NTLM / SPA"
@@ -8624,7 +8739,7 @@ msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"Esta opción conectará a un servidor basado en Windows usando NYLM / Secure "
+"Esta opciÃ³n conectarÃ¡ a un servidor basado en Windows usando NTLM / Secure "
 "Password Autentication.."
 
 #: camel/camel-sasl-plain.c:32
@@ -8637,7 +8752,7 @@ msgstr "POP antes de SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Esta opción autorizará conexiones POP antes de intentar SMTP"
+msgstr "Esta opciÃ³n autorizarÃ¡ conexiones POP antes de intentar SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
@@ -8645,38 +8760,38 @@ msgstr "URI de la fuente POP"
 
 #: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
-msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
+msgstr "AutenticaciÃ³n POP antes de SMTP usando un transporte desconocido"
 
 #: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
-msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
+msgstr "AutenticaciÃ³n POP antes de SMTP usando una fuente no POP"
 
 #: camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Falló la compilación de la expresión regular: %s: %s"
+msgstr "FallÃ³ la compilaciÃ³n de la expresiÃ³n regular: %s: %s"
 
 #: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "La URL '%s' necesita un componente de usuario"
+msgstr "La URL Â«%sÂ» necesita un componente de nombre de usuario"
 
 #: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "La URL '%s' necesita un componente de servidor"
+msgstr "La URL Â«%sÂ» necesita un componente de host"
 
 #: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "La URL '%s' necesita un componente de ruta"
+msgstr "La URL Â«%sÂ» necesita un componente de ruta"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
@@ -8689,11 +8804,11 @@ msgstr "Error al resolver: %s: servidor no encontrado"
 #: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
-msgstr "Error al resolver: %s: razón desconocida"
+msgstr "Error al resolver: %s: razÃ³n desconocida"
 
 #: camel/camel-service.c:851
 msgid "Resolving address"
-msgstr "Resolviendo dirección: %s"
+msgstr "Resolviendo direcciÃ³n"
 
 #: camel/camel-service.c:913
 msgid "Host lookup failed: host not found"
@@ -8701,7 +8816,7 @@ msgstr "Error al resolver: servidor no encontrado"
 
 #: camel/camel-service.c:916
 msgid "Host lookup failed: unknown reason"
-msgstr "Error al resolver: razón desconocida"
+msgstr "Error al resolver: razÃ³n desconocida"
 
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
@@ -8709,12 +8824,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 
 #: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
-msgstr "Para leer correo como una búsqueda de otras carpetas"
+msgstr "Para leer correo como una bÃºsqueda de otras carpetas"
 
 #: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
-msgstr "No hay proveedor para el protocolo `%s'"
+msgstr "No hay proveedor para el protocolo Â«%sÂ»"
 
 #: camel/camel-session.c:545
 #, c-format
@@ -8722,53 +8837,53 @@ msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"No puedo crear el directorio %s:\n"
+"No se ha podido crear el directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
-msgstr "Por favor introduzca su contraseña para %s"
+msgstr "Por favor introduzca su contraseÃ±a para %s"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Por favor indique el apodo de un certificado con el que firmar."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
-msgstr "El certificado de firma para «%s» no existe."
+msgstr "El certificado de firma para Â«%sÂ» no existe."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "No existe el certificado de cifrado «%s»."
+msgstr "No existe el certificado de cifrado Â«%sÂ»."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
-msgstr "Error al buscar el certificado para «%s»."
+msgstr "Error al buscar el certificado para Â«%sÂ»."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
-msgstr "Error al buscar un algoritmo de volumen común."
+msgstr "Error al buscar un algoritmo de volumen comÃºn."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "No puedo obtener la carpeta: Operación no válida"
+msgstr "No se puede obtener la carpeta: OperaciÃ³n no vÃ¡lida"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "No puedo crear la carpeta: Operación no válida"
+msgstr "No se puede crear la carpeta: OperaciÃ³n no vÃ¡lida"
 
 #: camel/camel-tcp-stream-openssl.c:566
 msgid "Unable to get issuer's certificate"
@@ -8776,7 +8891,7 @@ msgstr "No se pudo obtener el certificado del emisor."
 
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get Certificate Revocation List"
-msgstr "No se pudoobtener la Lista de Revocación de Certificados"
+msgstr "No se pudoobtener la Lista de RevocaciÃ³n de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to decrypt certificate signature"
@@ -8784,12 +8899,11 @@ msgstr "No se puede descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr "No se pudo descifrar la firma de la Lista de RevocaciÃ³n de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decode issuer's public key"
-msgstr "No se pudo decodificar la clave pública del emisor"
+msgstr "No se pudo decodificar la clave pÃºblica del emisor"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Certificate signature failure"
@@ -8797,11 +8911,11 @@ msgstr "Fallo en la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate Revocation List signature failure"
-msgstr "fallo en la firma de la Lista de Revocación de Certificados"
+msgstr "fallo en la firma de la Lista de RevocaciÃ³n de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate not yet valid"
-msgstr "Certificado a'un no válido"
+msgstr "Certificado aÃºn no vÃ¡lido"
 
 #: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate has expired"
@@ -8809,7 +8923,7 @@ msgstr "El certificado ha caducado"
 
 #: camel/camel-tcp-stream-openssl.c:584
 msgid "CRL not yet valid"
-msgstr "CRL todavía no válido"
+msgstr "CRL todavÃa no vÃ¡lido"
 
 #: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL has expired"
@@ -8849,7 +8963,7 @@ msgstr "Certificado Revocado"
 
 #: camel/camel-tcp-stream-openssl.c:607
 msgid "Invalid Certificate Authority (CA)"
-msgstr "Autoridad Certificadora Inválida"
+msgstr "Autoridad Certificadora InvÃ¡lida"
 
 #: camel/camel-tcp-stream-openssl.c:609
 msgid "Path length exceeded"
@@ -8857,7 +8971,7 @@ msgstr "Longitud de ruta excedida"
 
 #: camel/camel-tcp-stream-openssl.c:611
 msgid "Invalid purpose"
-msgstr "Propósito inválido"
+msgstr "PropÃ³sito invÃ¡lido"
 
 #: camel/camel-tcp-stream-openssl.c:613
 msgid "Certificate untrusted"
@@ -8881,13 +8995,13 @@ msgstr "Las series AKID/Issuer no coinciden"
 
 #: camel/camel-tcp-stream-openssl.c:624
 msgid "Key usage does not support certificate signing"
-msgstr "El uso de la clave no oporta firmado de cretificados"
+msgstr "El uso de la clave no soporta firmado de certificados"
 
 #: camel/camel-tcp-stream-openssl.c:627
 msgid "Error in application verification"
-msgstr "Error en la verificación de la aplicación"
+msgstr "Error en la verificaciÃ³n de la aplicaciÃ³n"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8900,11 +9014,11 @@ msgstr ""
 "Huella:        %s\n"
 "Firma:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
 msgid "BAD"
 msgstr "BAD"
 
@@ -8919,16 +9033,16 @@ msgid ""
 "\n"
 "Do you wish to accept anyway?"
 msgstr ""
-"Certificado erróneo de %s:\n"
+"Certificado errÃ³neo de %s:\n"
 "\n"
 "%s\n"
 "\n"
 "%s\n"
 "\n"
-"¿Quiere aceptarlo de todos modos?"
+"Â¿Quiere aceptarlo de todos modos?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:816
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8937,13 +9051,13 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Petición de Certificado SSL %s:\n"
+"PeticiÃ³n de Certificado SSL %s:\n"
 "\n"
 "%s\n"
 "\n"
-"¿Quiere aceptar?"
+"Â¿Quiere aceptar?"
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:860
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8952,16 +9066,16 @@ msgstr ""
 "Problema del certificado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:912
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Dominio del certificado erróneo: %s"
-"Emisor:%s"
+"Dominio del certificado errÃ³neo: %s\n"
+"Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:930
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -8970,24 +9084,24 @@ msgstr ""
 "Certificado caducado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Lista de revocación de certificados caducada: %s\n"
+"Lista de revocaciÃ³n de certificados caducada: %s\n"
 "Emisor: %s"
 
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr "No pude analizar la URL `%s'"
+msgstr "No se ha podido analizar la URL Â«%sÂ»"
 
 #: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
-msgstr "Error guardando '%s': %s"
+msgstr "Error guardando Â«%sÂ»: %s"
 
 #: camel/camel-vee-folder.c:656
 #, c-format
@@ -8998,38 +9112,38 @@ msgstr "No existe el mensaje %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se puede copiar o mover mensajes a una Carpeta Virtual"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "No puedo borrar la carpeta: %s: Operación no válida"
+msgstr "No se puede borrar la carpeta: %s: OperaciÃ³n no vÃ¡lida"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:291
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "No puedo borrar la carpeta: %s: No existe tal"
+msgstr "No se puede borrar la carpeta: %s: No existe tal"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:304
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "No puedo renombrar la carpeta: %s: Operación no válida"
+msgstr "No se puede renombrar la carpeta: %s: OperaciÃ³n no vÃ¡lida"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
+msgstr "No se puede cambiar el nombre de la carpeta: %s: Esa carpeta no existe"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:452
+#: camel/providers/imap/camel-imap-store.c:2641
 msgid "Operation cancelled"
-msgstr "Operación cancelada"
+msgstr "OperaciÃ³n cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2644
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
-msgstr "El servidor se desconectó inesperadamente: %s"
+msgstr "El servidor se desconectÃ³ inesperadamente: %s"
 
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:326
@@ -9051,85 +9165,85 @@ msgstr "Respuesta inesperada del servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:462
 msgid "Server response ended too soon."
-msgstr "La respuesta del servidor terminó demasiado pronto."
+msgstr "La respuesta del servidor terminÃ³ demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:654
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "La respuesta del servidor IMAP no contenía información de %s"
+msgstr "La respuesta del servidor IMAP no contenÃa informaciÃ³n de %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:690
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "No puedo crear el directorio %s: %s"
+msgstr "No se puede crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "No puedo cargar el resumen de %s"
+msgstr "No se ha podido cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"No puedo obtener el mensaje; %s\n"
+"No se puede obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
-msgstr "Este mensaje no está disponible actualmente"
+msgstr "Este mensaje no estÃ¡ disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
-msgstr "Obteniendo información de los nuevos mensajes"
+msgstr "Obteniendo informaciÃ³n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
-msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
+msgstr "No se ha podido encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
-msgstr "No puedo abrir directorio de cache: %s"
+msgstr "No se ha podido abrir directorio de cache: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:252
 #: camel/providers/imap/camel-imap-message-cache.c:309
@@ -9152,7 +9266,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1154
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -9171,7 +9285,8 @@ msgstr "Espacio de nombres"
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
-"Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
+"Aplicar filtros a los mensajes nuevos en el buzÃ³n de entrada de este "
+"servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -9185,12 +9300,11 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 #: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
-msgstr "Contraseña"
+msgstr "ContraseÃ±a"
 
 #: camel/providers/imap/camel-imap-provider.c:82
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
-msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "ConectarÃ¡ con el servidor IMAP usando una contraseÃ±a de texto plano"
 
 #: camel/providers/imap/camel-imap-store.c:457
 #, c-format
@@ -9207,14 +9321,14 @@ msgstr "Servicio IMAP para %s en %s"
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
-msgstr "Conexión cancelada"
+msgstr "ConexiÃ³n cancelada"
 
 #: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
-msgstr "No pude conectar con %s (puerto %d): %s"
+msgstr "No se ha podido conectar con %s (puerto %d): %s"
 
 #: camel/providers/imap/camel-imap-store.c:646
 #: camel/providers/imap/camel-imap-store.c:677
@@ -9225,68 +9339,66 @@ msgstr "Fallo al conectar al servidor IMAP %s en modo seguro: %s"
 #: camel/providers/imap/camel-imap-store.c:647
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
-msgstr "Extensión SSL/TLS no implementada"
+msgstr "ExtensiÃ³n SSL/TLS no implementada"
 
 #: camel/providers/imap/camel-imap-store.c:678
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
-msgstr "Falló la negociación SSL"
+msgstr "FallÃ³ la negociaciÃ³n SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1072
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr ""
-"El servidor IMAP %s no implementa el método de autenticación requerido %s"
+msgstr "El servidor IMAP %s no implementa el mÃ©todo de autenticaciÃ³n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1092
+#: camel/providers/imap/camel-imap-store.c:1082
 #: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "El tipo de autenticación %s no está implementado"
+msgstr "El tipo de autenticaciÃ³n %s no estÃ¡ implementado"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1106
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sPor favor escriba la contraseña IMAP para %s@%s"
+msgstr "%s Por favor escriba la contraseÃ±a IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
+#: camel/providers/imap/camel-imap-store.c:1121
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
-msgstr "No escribió una clave."
+msgstr "No escribiÃ³ una clave."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1150
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"No pude autenticarme en el servidor IMAP.\n"
+"No puede autenticar en el servidor IMAP.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1495
+#: camel/providers/imap/camel-imap-store.c:1637
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1838
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
-"El nombre de la carpeta \"%s\" es inválido porque no puede contener el "
-"carácter de retorno de carro \"%c\"."
+"El nombre de la carpeta Â«%sÂ» es invÃ¡lido porque no puede contener el "
+"carÃ¡cter de retorno de carro Â«%cÂ»."
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1850
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1886
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
+msgstr "No estÃ¡ permitido que la carpeta raÃz contenga subcarpetas"
 
 #. $HOME relative path + protocol string
 #: camel/providers/local/camel-local-folder.c:352
@@ -9299,7 +9411,7 @@ msgstr "~%s (%s)"
 #: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
-msgstr "buzón: %s: (%s)"
+msgstr "buzÃ³n: %s: (%s)"
 
 #. a full path + protocol
 #: camel/providers/local/camel-local-folder.c:363
@@ -9309,7 +9421,7 @@ msgstr "%s (%s)"
 
 #: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
-msgstr "Utilice el fichero de sumario de las carpetas '.folder' (exmh)"
+msgstr "Utilice el archivo de sumario de las carpetas Â«.folderÂ» (exmh)"
 
 #: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
@@ -9328,13 +9440,13 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 msgstr ""
-"Para obtener (moviendo) el correo local de colas de correo mbox estándar a "
+"Para obtener (moviendo) el correo local de colas de correo mbox estÃ¡ndar a "
 "carpetas gestionadas por Evolution"
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
-msgstr "Aplicar filtros a los mensajes nuevos en el buzón de entrada"
+msgstr "Aplicar filtros a los mensajes nuevos en el buzÃ³n de entrada"
 
 #: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
@@ -9350,20 +9462,20 @@ msgstr "Almacenar cabeceras de estado en formato Elm/Pine/Mutt"
 
 #: camel/providers/local/camel-local-provider.c:101
 msgid "Standard Unix mbox spool or directory"
-msgstr "Mbox estándar de Unix"
+msgstr "Mbox estÃ¡ndar de Unix"
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Para leer y guardar el correo local en directorios estándar mbox."
+msgstr "Para leer y guardar el correo local en directorios estÃ¡ndar mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:112
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "La dirección %s no es absoluta"
+msgstr "La direcciÃ³n %s no es absoluta"
 
 #: camel/providers/local/camel-local-store.c:146
 #, c-format
@@ -9372,63 +9484,63 @@ msgstr "%s no es un directorio normal"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "No pude acceder a la carpeta: %s: %s"
+msgstr "No se puede acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenes locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
+msgstr "No se ha podido cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "No pude renombrar: \"%s\": %s"
+msgstr "No se ha podido renombrar: Â«%sÂ»: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
-msgstr "No pude borrar el resumen la carpeta `%s': %s"
+msgstr "No se ha podido borrar el resumen la carpeta Â«%sÂ»: %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr "No pude borrar el índice de la carpeta `%s': %s"
+msgstr "No se ha podido borrar el Ãndice de la carpeta Â«%sÂ»: %s"
 
 #: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
-msgstr "No puedo guardar el resumen: %s: %s"
+msgstr "No se ha podido guardar el resumen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
-msgstr "No pude añadir mensajes al resumen: razón desconocida"
+msgstr "No se ha podido aÃ±adir mensajes al resumen: razÃ³n desconocida"
 
 #: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
-msgstr "Mensaje añadido al Maildir cancelado"
+msgstr "Mensaje aÃ±adido al Maildir cancelado"
 
 #: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "No pude añadir el mensaje a la carpeta tipo maildir: %s: %s"
+msgstr "No se puede aÃ±adir el mensaje a la carpeta tipo maildir: %s: %s"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
-msgstr "Contenido inválido en el mensaje"
+msgstr "Contenido invÃ¡lido en el mensaje"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
@@ -9438,7 +9550,7 @@ msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"No pude abrir la carpeta `%s':\n"
+"No se ha podido abrir la carpeta Â«%sÂ»:\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
@@ -9447,102 +9559,102 @@ msgstr ""
 #: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Folder `%s' does not exist."
-msgstr "La carpeta `%s' no existe."
+msgstr "La carpeta Â«%sÂ» no existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:169
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
-"No pude crear la carpeta `%s':\n"
+"No se ha podido crear la carpeta Â«%sÂ»:\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
-msgstr "`%s' no es un directorio tipo maildir."
+msgstr "Â«%sÂ» no es un directorio tipo maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
-msgstr "No pude borrar la carpeta `%s': %s"
+msgstr "No se ha podido borrar la carpeta Â«%sÂ»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:283
+#: camel/providers/local/camel-spool-store.c:313
 #, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr "No pude analizar la carpeta `%s': %s"
+msgstr "No se ha podido analizar la carpeta Â«%sÂ»: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "No puedo abrir el maildir en esta ruta: %s: %s"
+msgstr "No se puede abrir el maildir en esta ruta: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr "Comprobando la consistencia de la carpeta"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: camel/providers/local/camel-maildir-summary.c:729
+#: camel/providers/local/camel-maildir-summary.c:733
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:679
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Guardando carpeta"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "No puedo crear un bloqueo de carpetas en %s: %s"
+msgstr "No se puede crear un bloqueo de carpetas en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr "No puedo abrir el buzón: %s: %s\n"
+msgstr "No se puede abrir el buzÃ³n: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
-msgstr "Adición de mensaje cancelada"
+msgstr "AdiciÃ³n de mensaje cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "No puedo añadir el mensaje al archivo mbox: %s: %s"
+msgstr "No se puede aÃ±adir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"No puedo obtener el mensaje; %s de la carpeta %s\n"
+"No se puede obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fallo la construcción del mensaje: ¿Buzón corrompido?"
+msgstr "Fallo la construcciÃ³n del mensaje: Â¿BuzÃ³n corrompido?"
 
 #: camel/providers/local/camel-mbox-store.c:94
 #, c-format
@@ -9550,7 +9662,7 @@ msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
-"No puedo abrir el archivo `%s':\n"
+"No se ha podido abrir el archivo Â«%sÂ»:\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:110
@@ -9559,14 +9671,14 @@ msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
-"No pude crear el archivo `%s':\n"
+"No se ha podido crear el archivo Â«%sÂ»:\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:119
 #: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
-msgstr "`%s' no es un archivo normal."
+msgstr "Â«%sÂ» no es un archivo normal."
 
 #: camel/providers/local/camel-mbox-store.c:138
 #: camel/providers/local/camel-mbox-store.c:161
@@ -9575,83 +9687,83 @@ msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"No pude borrar la carpeta `%s':\n"
+"No se ha podido borrar la carpeta Â«%sÂ»:\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
-msgstr "La carpeta `%s' no esta vacía. No fue borrada."
+msgstr "La carpeta Â«%sÂ» no esta vacÃa. No fue borrada."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:351
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "No pude abrir la carpeta: %s: %s"
+msgstr "No se ha podido abrir la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:399
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
+msgstr "AnÃ¡lisis errÃ³neo del correo cerca de la posiciÃ³n %ld en la carpeta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:455
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "No pude comprobar la carpeta: %s: %s"
+msgstr "No se puede comprobar la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
+#: camel/providers/local/camel-mbox-summary.c:593
+#: camel/providers/local/camel-mbox-summary.c:684
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "No pude abrir el archivo %s: %s"
+msgstr "No se ha podido abrir el archivo %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:605
+#: camel/providers/local/camel-spool-summary.c:170
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "No puedo abrir el archivo de correo temporal: %s"
+msgstr "No se puede abrir el archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:618
+#: camel/providers/local/camel-mbox-summary.c:780
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "No pude cerrar la carpeta origen %s: %s"
+msgstr "No se ha podido cerrar la carpeta origen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:627
 #, c-format
 msgid "Could not close temp folder: %s"
-msgstr "No pude cerrar la carpeta temporal: %s"
+msgstr "No se ha podido cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:638
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "No pude cambiar el nombre a la carpeta: %s"
+msgstr "No se ha podido cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:722
+#: camel/providers/local/camel-mbox-summary.c:730
 #: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:929
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
+msgstr "Resumen y carpeta no concuerdan, incluso despuÃ©s de una sincronizaciÃ³n"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:855
+#: camel/providers/local/camel-spool-summary.c:342
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:890
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "No pude almacenar carpeta:: %s"
+msgstr "No se ha podido almacenar carpeta:: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:984
+#: camel/providers/local/camel-mbox-summary.c:1010
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:1001
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
@@ -9659,87 +9771,87 @@ msgstr "Error la escribir al archivo temporal: %s: %s"
 #
 #: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
-msgstr "Adición de mensaje en el MH cancelada"
+msgstr "AdiciÃ³n de mensaje en el MH cancelada"
 
 #: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "No pude añadir el mensaje a la carpeta mh: %s: %s"
+msgstr "No se ha podido aÃ±adir el mensaje a la carpeta mh: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
-msgstr "`%s' no es un directorio."
+msgstr "Â«%sÂ» no es un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
+msgstr "No se puede abrir el directorio MH en la ruta: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
-msgstr "El Spool `%s' no pudo abrirse: %s"
+msgstr "La cola Â«%sÂ» no pudo abrirse: %s"
 
 #: camel/providers/local/camel-spool-store.c:130
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
-msgstr "Spool %s no es un directorio o fichero normal"
+msgstr "La cola Â«%sÂ» no es un directorio o archivo normal"
 
 #: camel/providers/local/camel-spool-store.c:150
 #, c-format
 msgid "Folder `%s/%s' does not exist."
-msgstr "La carpeta `%s/%s' no existe."
+msgstr "La carpeta Â«%s/%sÂ» no existe."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "`%s' is not a mailbox file."
-msgstr "`%s' no es un fichero mailbox"
+msgstr "Â«%sÂ» no es un archivo mailbox"
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:194
 msgid "Store does not support an INBOX"
 msgstr "Almacenar no soporta un INBOX"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:206
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:206
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "Arbol de carpetas Spool %s"
+msgstr "Ãrbol de carpetas de cola %s"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:214
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:222
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:183
+#: camel/providers/local/camel-spool-summary.c:193
+#: camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "No pude sincronizar la carpeta temporal %s: %s"
+msgstr "No se ha podido sincronizar la carpeta temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "No pude sincronizar la carpeta de correo %s: %s"
+msgstr "No se ha podido sincronizar la carpeta de correo %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:250
+#: camel/providers/local/camel-spool-summary.c:269
+#: camel/providers/local/camel-spool-summary.c:282
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
-"No pude sincronizar la carpeta de correo %s: %s\n"
-"La carpeta puede estar corrupta, copia guardada en `%s'"
+"No se ha podido sincronizar la carpeta de correo %s: %s\n"
+"La carpeta puede estar corrupta, copia guardada en Â«%sÂ»"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -9752,24 +9864,24 @@ msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 #: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
 msgid "Could not read greeting from %s: %s"
-msgstr "No puedo leer saludo desde %s: %s"
+msgstr "No se ha podido leer saludo desde %s: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "El servidor NNTP %s devolvió un código de error %d %s"
+msgstr "El servidor NNTP %s devolviÃ³ un cÃ³digo de error %d %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
-msgstr "Noticias USENET vía %s"
+msgstr "Noticias USENET vÃa %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Esta opción es para autenticarse con el servidor NNTP usando una contraseña "
+"Esta opciÃ³n es para autenticarse con el servidor NNTP usando una contraseÃ±a "
 "de texto."
 
 #: camel/providers/nntp/camel-nntp-summary.c:234
@@ -9780,7 +9892,7 @@ msgstr "No existe la carpeta %s"
 #: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
-msgstr "No pude obtener grupo: %s"
+msgstr "No se ha podido obtener el grupo: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
@@ -9805,55 +9917,55 @@ msgstr "Usar cancelar"
 #: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
-msgstr "Operación falló: %s"
+msgstr "OperaciÃ³n fallÃ³: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 msgid "User cancelled"
 msgstr "Usuario cancelado"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No se puede obtener el sumario POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get message %s: %s"
-msgstr "No puedo obtener mensaje %s: %s"
+msgstr "No se puede obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
-msgstr "Razón Desconocida"
+msgstr "RazÃ³n desconocida"
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
-msgstr "Almacén del mensaje"
+msgstr "AlmacÃ©n del mensaje"
 
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
@@ -9862,7 +9974,7 @@ msgstr "Dejar mensajes en el servidor"
 #: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
-msgstr "Borrar tras %s día(s)"
+msgstr "Borrar tras %s dÃa(s)"
 
 #: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
@@ -9877,8 +9989,9 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña en "
-"texto plano. Esta es la única opción implementada por muchos servidores POP."
+"Esta opciÃ³n es para conectar con servidores POP usando una contraseÃ±a en "
+"texto plano. Esta es la Ãºnica opciÃ³n implementada por muchos servidores "
+"POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -9886,9 +9999,9 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that claim "
 "to support it."
 msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña cifrada "
-"por medio del protocolo APOP. Esto no funcionará para todos los usuarios ni "
-"siquiera en servidores que dicen implementarlo."
+"Esta opciÃ³n es para conectar con servidores POP usando una contraseÃ±a "
+"cifrada por medio del protocolo APOP. Esto no funcionarÃ¡ para todos los "
+"usuarios ni siquiera en servidores que dicen implementarlo."
 
 #: camel/providers/pop3/camel-pop3-store.c:183
 #, c-format
@@ -9905,7 +10018,7 @@ msgstr "No se pudo conectar al servidor POP %s en modo seguro: %s"
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "No pude conectar con el servidor POP: %s"
+msgstr "No se ha podido conectar con el servidor POP: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
 #: camel/providers/pop3/camel-pop3-store.c:502
@@ -9915,43 +10028,42 @@ msgid ""
 "mechanism."
 msgstr ""
 "No se pudo conectar con el servidor POP %s: \n"
-"No hay soporte para el sistema de autenticación pedido."
+"No hay soporte para el sistema de autenticaciÃ³n pedido."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "SASL `%s' Falló el inicio de sesión para servidor POP %s: %s"
+msgstr "SASL Â«%sÂ» FallÃ³ el inicio de sesiÃ³n para servidor POP %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr ""
-"No puedo inicier sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr "No se pudo iniciar la sesiÃ³n en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
-msgstr "No pude autenticarme en el servidor POP %s: %s"
+msgstr "No se ha podido autenticar en el servidor POP %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
-msgstr "%sPor favor escriba la contraseña POP para %s@%s"
+msgstr "%s Por favor escriba la contraseÃ±a POP para %s@%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:523
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"No pude conectar con el servidor POP %s\n"
-"Error al enviar la contraseña: %s"
+"No se ha podido conectar con el servidor POP %s\n"
+"Error al enviar la contraseÃ±a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid "No such folder `%s'."
-msgstr "No existe la carpeta `%s'."
+msgstr "No existe la carpeta Â«%sÂ»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:109
@@ -9962,27 +10074,26 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr "Para enviar correo pasÃ¡ndoselo al programa Â«sendmailÂ» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:108
 msgid "Could not parse recipient list"
-msgstr "No pude analizar la lista de destinatarios"
+msgstr "No se ha podido analizar la lista de destinatarios"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "No pude comunicar con sendmail: %s: correo no enviado"
+msgstr "No se ha podido comunicar con sendmail: %s: correo no enviado"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "No pude hacer un fork a sendmail: %s: correo no enviado"
+msgstr "No se ha podido hacer un fork a sendmail: %s: correo no enviado"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
-msgstr "No pude enviar mensaje: %s"
+msgstr "No se ha podido enviar mensaje: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
@@ -9992,7 +10103,7 @@ msgstr "sendmail finalizo con %s: correo no enviado."
 #: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "No pude ejecutar %s: correo no enviado."
+msgstr "No se ha podido ejecutar %s: correo no enviado."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
@@ -10005,7 +10116,7 @@ msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
-msgstr "Envío de correo vía el programa sendmail"
+msgstr "Entregar correo por medio de sendmail"
 
 #: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
@@ -10013,7 +10124,7 @@ msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
+msgstr "Para enviar correo conectÃ¡ndose a un servidor de correo usando SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -10021,7 +10132,7 @@ msgstr "Error de sintaxis, comando no reconocido"
 
 #: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
-msgstr "Error de sintaxis en los parámetros o los argumentos"
+msgstr "Error de sintaxis en los parÃ¡metros o los argumentos"
 
 #: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
@@ -10029,7 +10140,7 @@ msgstr "Comando no implementado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
-msgstr "Parámetro del comando no implementado"
+msgstr "ParÃ¡metro del comando no implementado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
@@ -10045,49 +10156,47 @@ msgstr "Servicio preparado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
-msgstr "Servicio cerrando los canales de transmisión"
+msgstr "Servicio cerrando los canales de transmisiÃ³n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
-msgstr "Servicio no disponible, cerrando los canales de transmisión"
+msgstr "Servicio no disponible, cerrando los canales de transmisiÃ³n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
-msgstr "Acción de correo requerida en orden, completada"
+msgstr "AcciÃ³n de correo requerida en orden, completada"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
-msgstr "El usuario no es local: lo reenviaré a <forward-path>"
+msgstr "El usuario no es local, lo reenviarÃ© a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr "AcciÃ³n solicitada del correo no realizada: el mailbox no estÃ¡ disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Acción solicitada no realizada: el mailbox no está disponible"
+msgstr "AcciÃ³n solicitada no realizada: el mailbox no estÃ¡ disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
-msgstr "Acción solicitada abortada: error en procesamiento"
+msgstr "AcciÃ³n solicitada abortada: error en procesamiento"
 
 #: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
-msgstr "El usuario no es local: por favor pruebe con <forward-path>"
+msgstr "El usuario no es local, por favor pruebe con <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr "AcciÃ³n solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
+msgstr "AcciÃ³n solicitada no realizada: excediÃ³ la capacidad de almacenamiento"
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
+msgstr "AcciÃ³n solicitada no realizada: nombre no permitido para mailbox"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -10095,31 +10204,31 @@ msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
-msgstr "Fallo en la transacción"
+msgstr "Fallo en la transacciÃ³n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
-msgstr "Es necesaria una transición de contraseña"
+msgstr "Es necesaria una transiciÃ³n de contraseÃ±a"
 
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
-msgstr "El método de autenticación es demasiado débil"
+msgstr "El mÃ©todo de autenticaciÃ³n es demasiado dÃ©bil"
 
 #: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Cifrado requerida por el mecanismo de autenticación pedido"
+msgstr "Cifrado requerida por el mecanismo de autenticaciÃ³n pedido"
 
 #: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
-msgstr "Fallo temporal en la autenticación"
+msgstr "Fallo temporal en la autenticaciÃ³n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
-msgstr "Autenticación requerida"
+msgstr "AutenticaciÃ³n requerida"
 
 #: camel/providers/smtp/camel-smtp-transport.c:295
 msgid "Welcome response error"
-msgstr "Error en la respuesta Welcome: %s"
+msgstr "Error en la respuesta Welcome"
 
 #: camel/providers/smtp/camel-smtp-transport.c:339
 #: camel/providers/smtp/camel-smtp-transport.c:378
@@ -10134,22 +10243,21 @@ msgstr "el servidor no parece soportar SSL"
 #: camel/providers/smtp/camel-smtp-transport.c:354
 #, c-format
 msgid "STARTTLS request timed out: %s"
-msgstr "Petición STARTTLS expiró: %s"
+msgstr "PeticiÃ³n STARTTLS expirÃ³: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:369
 msgid "STARTTLS response error"
-msgstr "eror de respuesta en STARTTLS"
+msgstr "error de respuesta en STARTTLS"
 
 #: camel/providers/smtp/camel-smtp-transport.c:472
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
-"El servidor SMTP %s no implementa el método de autenticación requerido %s"
+msgstr "El servidor SMTP %s no implementa el mÃ©todo de autenticaciÃ³n requerido %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:510
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
-msgstr "%sPor favor escriba la contraseña SMTP para %s@%s"
+msgstr "%s Por favor escriba la contraseÃ±a SMTP para %s@%s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
@@ -10158,7 +10266,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"No pude autenticarme en el servidor SMTP.\n"
+"No se ha podido autenticar en el servidor SMTP.\n"
 "%s\n"
 "\n"
 
@@ -10170,23 +10278,23 @@ msgstr "Servidor SMTP %s"
 #: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "Envío de correo SMTP vía %s"
+msgstr "EnvÃo de correo SMTP vÃa %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
-msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
+msgstr "No se puede enviar el mensaje: direcciÃ³n del remitente no vÃ¡lida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
 #: camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: no recipients defined."
-msgstr "No puedo enviar el mensaje: no hay destinatarios."
+msgstr "No se puede enviar el mensaje: no hay destinatarios."
 
 #: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "No puedo enviar el mensaje: uno o más destinatarios inválidos"
+msgstr "No se puede enviar el mensaje: uno o mÃ¡s destinatarios invÃ¡lidos"
 
 #: camel/providers/smtp/camel-smtp-transport.c:881
 msgid "SMTP Greeting"
@@ -10195,38 +10303,38 @@ msgstr "Saludo del SMTP"
 #: camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "HELO request timed out: %s"
-msgstr "Petición HELO expiró: %s"
+msgstr "ExpirÃ³ el tiempo para la peticiÃ³n HELO: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:949
 msgid "HELO response error"
-msgstr "Error en respuesta HELO"
+msgstr "Error en la respuesta a HELO"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
-msgstr "Autenticación SMTP"
+msgstr "AutenticaciÃ³n SMTP"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
-msgstr "Error al crear el objeto de autenticación SASL."
+msgstr "Error al crear el objeto de autenticaciÃ³n SASL."
 
 #: camel/providers/smtp/camel-smtp-transport.c:1038
 #: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
-msgstr "Expiró el tiempo para AUTH: %s"
+msgstr "ExpirÃ³ el tiempo para la peticiÃ³n AUTH: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
-msgstr "Error en la petición de AUTH."
+msgstr "Error en la peticiÃ³n de AUTH."
 
 #: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
-msgstr "Respuesta de autenticación errónea desde el servidor.\n"
+msgstr "Respuesta de autenticaciÃ³n errÃ³nea desde el servidor.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
+msgstr "ExpirÃ³ el tiempo para la peticiÃ³n MAIL FROM: %s: correo no enviado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
@@ -10235,41 +10343,41 @@ msgstr "Respuesta de error a MAIL FROM:"
 #: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
+msgstr "ExpirÃ³ el tiempo para pa peticiÃ³n RCPT TO: %s: correo no enviado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
-msgstr "Falló RCPT TO <%s>"
+msgstr "FallÃ³ RCPT TO <%s>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
-msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
+msgstr "ExpirÃ³ el tiempo para DATA: %s: correo no enviado"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
 #: camel/providers/smtp/camel-smtp-transport.c:1273
 msgid "DATA response error"
-msgstr "DATA respondió con un error"
+msgstr "DATA respondiÃ³ con un error"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1313
 #: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
-"Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
-"no enviado"
+"ExpirÃ³ el tiempo para el envÃo de DATA: terminaciÃ³n del mensaje: %s: "
+"correo no enviado"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1356
 msgid "DATA termination response error"
-msgstr "Error de respuesta en la terminación DATA"
+msgstr "Error de respuesta en la terminaciÃ³n DATA"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RSET request timed out: %s"
-msgstr "Expiró el tiempo para RSET: %s"
+msgstr "ExpirÃ³ el tiempo parala peticiÃ³n RSET: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1399
 msgid "RSET response error"
@@ -10278,54 +10386,54 @@ msgstr "Error en respuesta RSET"
 #: camel/providers/smtp/camel-smtp-transport.c:1422
 #, c-format
 msgid "QUIT request timed out: %s"
-msgstr "Petición QUIT expiró: %s"
+msgstr "ExpirÃ³ el tiempo para la peticiÃ³n QUIT: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1442
 msgid "QUIT response error"
 msgstr "Respuesta de error a QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:218
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:502
 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:551
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:165
+#: composer/e-msg-composer-attachment.c:181
 #, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "No puedo adjuntar el archivo %s: %s"
+msgstr "No se puede adjuntar el archivo %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:173
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "No puedo adjuntar el archivo %s: no es un archivo normal"
+msgstr "No se puede adjuntar el archivo %s: no es un archivo normal"
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
@@ -10340,114 +10448,33 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:67
 msgid "Suggest automatic display of attachment"
-msgstr "Sugerir mostrar adjuntos automáticamente"
-
-#: composer/e-msg-composer-hdrs.c:365
-msgid "Click here for the address book"
-msgstr "Presione aquí para acceder a la agenda"
+msgstr "Sugerir mostrar adjuntos automÃ¡ticamente"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:400
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:174
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:411
-msgid "From:"
-msgstr "De:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:417
-msgid "Subject:"
-msgstr "Asunto:"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:431
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:432
-msgid "Enter the recipients of the message"
-msgstr "Escriba los destinatarios del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:435
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:436
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Escriba las direcciones que recibirán una copia del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:439
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:440
-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 recibirán una copia del mensaje sin aparecer en "
-"la lista de destinatarios del mensaje."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:447
-msgid "Post To:"
-msgstr "Publicar A:"
-
-#: composer/e-msg-composer-hdrs.c:449
-msgid "Posting destination"
-msgstr "Publicar destino"
-
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjuntar un archivo"
-
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:504
 msgid "Could not create a PGP signature context"
-msgstr "No pude crear un contexto de firma PGP."
+msgstr "No se ha podido crear un contexto de firma PGP."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:783
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Error cargando el archivo: %s:\n"
+"Error leyendo el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "¡Aviso!"
-
 #: composer/e-msg-composer.c:1164
 msgid "File exists, overwrite?"
-msgstr "El archivo existe, ¿Sobreescribir?"
+msgstr "El archivo existe, Â¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1182
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1205
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
@@ -10459,7 +10486,7 @@ msgstr "Error accediendo al archivo: %s"
 
 #: composer/e-msg-composer.c:1248
 msgid "Unable to retrieve message from editor"
-msgstr "No pude obtener los mensajes del editor"
+msgstr "No se ha podido obtener los mensajes del editor"
 
 #: composer/e-msg-composer.c:1255
 #, c-format
@@ -10467,7 +10494,7 @@ msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"No pude buscar en el archivo: %s\n"
+"No se puede buscar en el archivo: %s\n"
 "%s"
 
 #: composer/e-msg-composer.c:1262
@@ -10476,103 +10503,184 @@ msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
-"No pude truncar el archivo: %s\n"
+"No se puede truncar el archivo: %s\n"
 "%s"
 
 #: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"No se puede copiar el descriptor del archivo: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1280
+#, c-format
+msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1375
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
-"¿Quiere tratar de recuperarlos?"
+"Ximian Evolution ha encontrado archivos no guardados de una sesiÃ³n previa.\n"
+"Â¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1536
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"El mensaje \"%s\" no se ha enviado.\n"
+"El mensaje Â«%sÂ» no se ha enviado.\n"
 "\n"
-"¿Quiere guardar los cambios?"
+"Â¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1540
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1572
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1930
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:1971 mail/mail-account-gui.c:1226
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2770
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2801
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
-"No puedo crear una ventana de composición:\n"
-"No puedo activar el control de selección de direcciones."
+"No se ha podido crear una ventana de composiciÃ³n:\n"
+"No se puede activar el control de selecciÃ³n de direcciones."
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2827
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
-"No pude crear una ventana de composición:\n"
-"No puedo activar el componente del editor HTML.\n"
-"Por favor, asegúrese de que tiene la versión \n"
+"No se ha podido crear una ventana de composiciÃ³n:\n"
+"No se puede activar el componente del editor HTML.\n"
+"Por favor, asegÃºrese de que tiene la versiÃ³n \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2887
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
-"No pude crear una ventana de composición:\n"
-"No puedo activar el componente del editor HTML."
+"No se ha podido crear una ventana de composiciÃ³n:\n"
+"No se puede activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:3868
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be "
 "edited.)<b>"
+msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+
+#: composer/e-msg-composer-hdrs.c:361
+msgid "Click here for the address book"
+msgstr "Pulse aquÃ para acceder a la agenda"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:393
+msgid "Reply-To:"
+msgstr "Responder a:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:404
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:410
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: composer/e-msg-composer-hdrs.c:424
+msgid "To:"
+msgstr "A:"
+
+#: composer/e-msg-composer-hdrs.c:425
+msgid "Enter the recipients of the message"
+msgstr "Escriba los destinatarios del mensaje"
+
+#: composer/e-msg-composer-hdrs.c:428
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:429
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Escriba las direcciones que recibirÃ¡n una copia del mensaje"
+
+#: composer/e-msg-composer-hdrs.c:432
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:433
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
 msgstr ""
-"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+"Escriba las direcciones que recibirÃ¡n una copia del mensaje sin aparecer en "
+"la lista de destinatarios del mensaje."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:440
+msgid "Post To:"
+msgstr "Publicar A:"
 
-#: composer/evolution-composer.c:393
+#: composer/e-msg-composer-hdrs.c:442
+msgid "Posting destination"
+msgstr "Publicar destino"
+
+#: composer/e-msg-composer-select-file.c:103
+#: composer/e-msg-composer-select-file.c:120
+msgid "Attach file(s)"
+msgstr "Adjuntar archivo(s)"
+
+#: composer/evolution-composer.c:407
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
-"No pude crear una ventana de composición, porque no ha configurado\n"
-"todavía ninguna identidad en el componente de correo."
+"No se ha podido crear una ventana de composiciÃ³n, porque no ha configurado\n"
+"todavÃa ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:408
+#: composer/evolution-composer.c:422
 msgid "Cannot initialize the Evolution composer."
-msgstr "No puedo inicializar el editor de correo de Evolution."
+msgstr "No se puede inicializar el editor de correo de Evolution."
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -10584,11 +10692,11 @@ msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
 msgid "address card"
-msgstr "tarjeta de dirección"
+msgstr "tarjeta de direcciÃ³n"
 
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
-msgstr "información del agenda"
+msgstr "informaciÃ³n del agenda"
 
 #: default_user/searches.xml.h:1
 msgid "Body contains"
@@ -10622,22 +10730,25 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: e-util/e-component-listener.c:128
+msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr "ping_timeout_calbak: no se pudo determinar si el objeto CORBA es nil o no"
+
+#: e-util/e-dialog-utils.c:237
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 "Ya existe una archivo con ese nombre.\n"
-"¿Sobreescribirlo?"
+"Â¿Sobreescribirlo?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-passwords.c:343
 msgid "Remember this password"
-msgstr "Recuerda esta contraseña"
+msgstr "Recuerda esta contraseÃ±a"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:345
 msgid "Remember this password for the remainder of this session"
-msgstr "Recordar esta clave durante el resto de esta sesión"
+msgstr "Recordar esta clave durante el resto de esta sesiÃ³n"
 
 #: e-util/e-pilot-settings.c:96
 msgid "Sync Private Records:"
@@ -10645,273 +10756,189 @@ msgstr "Sincronizando Registros Privados"
 
 #: e-util/e-pilot-settings.c:105
 msgid "Sync Categories:"
-msgstr "Sincronizando categorías:"
+msgstr "Sincronizando categorÃas:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1630
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1627
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
+#: filter/filter-datespec.c:65 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:180
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:66
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:72
+#: filter/filter-datespec.c:67
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:69
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
+#: filter/filter-datespec.c:69 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:70
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+#: filter/filter-datespec.c:70 filter/filter.glade.h:23
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:76
+#: filter/filter-datespec.c:71
 msgid "year"
-msgstr "año"
+msgstr "aÃ±o"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+#: filter/filter-datespec.c:71 filter/filter.glade.h:33
 msgid "years"
-msgstr "años"
+msgstr "aÃ±os"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 msgid "You must choose a date."
 msgstr "Debe elegir una fecha"
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
-msgstr "<pinche aquí para añadir una fecha>"
+msgstr "<pinche aquÃ para aÃ±adir una fecha>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
 #. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
 #, c-format
 msgid "%d %s ago"
 msgstr "hace%d %s"
 
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:417
 msgid "Select a time to compare against"
 msgstr "Selecciones una hora con la que comparar"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
-msgstr "Debe especificar un nombre de fichero"
+#: filter/filter-file.c:166
+msgid "You must specify a file name."
+msgstr "Debe especificar un nombre de archivo"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
-msgstr "`%s' no existe o no es un fichero normal."
+msgstr "Â«%sÂ» no existe o no es un archivo normal."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:293
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Entonces"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Añadir acción"
-
-#: filter/filter-folder.c:149
-msgid "You must specify a folder.\n"
-msgstr "Debe especificar una carpeta\n"
+#: filter/filter-folder.c:153
+msgid "You must specify a folder."
+msgstr "Debe especificar una carpeta."
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
+#: mail/mail-account-gui.c:1459 mail/mail-account-gui.c:1473
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-input.c:200
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en la expresión regular '%s':\n"
-"%s"
-
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Importante"
-
-#. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
-msgid "Work"
-msgstr "Trabajo"
-
-#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
-msgid "Personal"
-msgstr "Privado"
-
-#. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
-msgid "To Do"
-msgstr "Para Hacer"
-
-#. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr "Más tarde"
-
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
-msgid "Test"
-msgstr "Prueba"
-
-#: filter/filter-rule.c:223
-msgid "You must name this filter."
-msgstr "Debes dar un nombre a este filtro."
-
-#: filter/filter-rule.c:764
-msgid "Rule name: "
-msgstr "Nombre de la regla:"
-
-#: filter/filter-rule.c:768
-msgid "Untitled"
-msgstr "Sin título"
-
-#: filter/filter-rule.c:785
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:803
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:807
-msgid "if all criteria are met"
-msgstr "si se cumplen todos los criterios"
-
-#: filter/filter-rule.c:812
-msgid "if any criteria are met"
-msgstr "si se cumple algún criterio"
-
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Añadir criterio"
-
-#: filter/filter-rule.c:908
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:908
-msgid "outgoing"
-msgstr "saliente"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Comparar con"
@@ -10937,27 +10964,27 @@ msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"La fecha del mensaje será comparada contra las\n"
-"12:00am de la fecha especificada aquí."
+"La fecha del mensaje serÃ¡ comparada contra las\n"
+"12:00am de la fecha especificada aquÃ."
 
 #: filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"La fecha del mensaje será comparada con una\n"
+"La fecha del mensaje serÃ¡ comparada con una\n"
 "fecha relativa al momento de ejecutar el\n"
-"filtro. Por ejemplo: «Hace una semana»."
+"filtro. Por ejemplo: Â«Hace una semanaÂ»."
 
 #: filter/filter.glade.h:11
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"La fecha del mensaje será comparada con la\n"
+"La fecha del mensaje serÃ¡ comparada con la\n"
 "fecha actual cuando el filtrado se realice"
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Carpetas virtuales"
 
@@ -10997,10 +11024,86 @@ msgstr "con todas las carpetas locales y remotas activas"
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en la expresiÃ³n regular Â«%sÂ»:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:63
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:64
+#: mail/mail-config.glade.h:132
+msgid "Work"
+msgstr "Trabajo"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+msgid "Personal"
+msgstr "Privado"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123
+msgid "To Do"
+msgstr "Para Hacer"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:67
+msgid "Later"
+msgstr "MÃ¡s tarde"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:62
+msgid "Test"
+msgstr "Prueba"
+
+#: filter/filter-rule.c:218
+msgid "You must name this filter."
+msgstr "Debes dar un nombre a este filtro."
+
+#: filter/filter-rule.c:750
+msgid "Rule name: "
+msgstr "Nombre de la regla:"
+
+#: filter/filter-rule.c:754
+msgid "Untitled"
+msgstr "Sin tÃtulo"
+
+#: filter/filter-rule.c:771
+msgid "If"
+msgstr "Si"
+
+#: filter/filter-rule.c:789
+msgid "Execute actions"
+msgstr "Ejecutar acciones"
+
+#: filter/filter-rule.c:793
+msgid "if all criteria are met"
+msgstr "si se cumplen todos los criterios"
+
+#: filter/filter-rule.c:798
+msgid "if any criteria are met"
+msgstr "si se cumple algÃºn criterio"
+
+#: filter/filter-rule.c:893
+msgid "incoming"
+msgstr "entrante"
+
+#: filter/filter-rule.c:893
+msgid "outgoing"
+msgstr "saliente"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
-msgstr "Ajustar puntuación"
+msgstr "Ajustar puntuaciÃ³n"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
@@ -11008,7 +11111,7 @@ msgstr "Asignar Color"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
-msgstr "Asignar puntuación"
+msgstr "Asignar puntuaciÃ³n"
 
 #: filter/libfilter-i18n.h:5
 msgid "Attachments"
@@ -11019,247 +11122,256 @@ msgid "Beep"
 msgstr "Pitar"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
-msgstr "Fecha de recepción"
+msgstr "Fecha de recepciÃ³n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
-msgstr "Fecha de envío"
+msgstr "Fecha de envÃo"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Borrado"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "No Existe"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no contiene"
+msgid "Draft"
+msgstr "Borrador"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba en"
+msgid "Exist"
+msgstr "Salir"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existe"
+msgid "Expression"
+msgstr "ExpresiÃ³n"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "no devuelve"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "no suena como"
+msgid "Follow Up"
+msgstr "Seguimiento"
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comienza por"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1780
+msgid "Label"
+msgstr "Etiquetar"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "No Existe"
+msgid "Mailing list"
+msgstr "Lista de correo"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Borrador"
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "finaliza con"
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Salir"
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
+msgid "Pipe Message to Shell Command"
+msgstr "Redirigir mensaje a Orden de Shell"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expresión"
+msgid "Play Sound"
+msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Seguimiento"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:55
+msgid "Read"
+msgstr "LeÃdo"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "es"
+msgid "Regex Match"
+msgstr "ExpresiÃ³n regular"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "está después de"
+msgid "Replied to"
+msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "está antes de"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "PuntuaciÃ³n"
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "está Marcado"
+#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1762
+msgid "Sender"
+msgstr "Remitente"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "es mayor que"
+msgid "Set Status"
+msgstr "Poner estado"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "es menor que"
+msgid "Shell Command"
+msgstr "Comando de shell"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no es"
+msgid "Size (kB)"
+msgstr "TamaÃ±o (Kb)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "no está Marcado"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
-msgid "Label"
-msgstr "Etiqueta"
+msgid "Source Account"
+msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Lista de correo"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Cabecera especÃfica"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
+msgid "Stop Processing"
+msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
+#: filter/libfilter-i18n.h:38 mail/mail-format.c:902
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:264
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Asunto"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
+msgid "Unset Status"
+msgstr "Sin estado"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Redirigir mensaje a Orden de Shell"
+msgid "contains"
+msgstr "contiene"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Tocar un sonido:"
+msgid "does not contain"
+msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "Leído"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "no acaba en"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "does not exist"
+msgstr "no existe"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Expresión regular"
+msgid "does not return"
+msgstr "no devuelve"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Respondido a"
+msgid "does not sound like"
+msgstr "no suena como"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "devuelve"
+msgid "does not start with"
+msgstr "no comienza por"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "devuelve mayor que"
+msgid "ends with"
+msgstr "finaliza con"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "devuelve menor que"
+msgid "exists"
+msgstr "existe"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "estÃ¡ Marcado"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
-msgid "Sender"
-msgstr "Remitente"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "estÃ¡ despuÃ©s de"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Poner estado"
+msgid "is before"
+msgstr "estÃ¡ antes de"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Comando de shell"
+msgid "is greater than"
+msgstr "es mayor que"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Tamaño (Kb)"
+msgid "is less than"
+msgstr "es menor que"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "suena como"
+msgid "is not Flagged"
+msgstr "no estÃ¡ Marcado"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Fuente de la cuenta"
+msgid "is not"
+msgstr "no es"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Cabecera específica"
+msgid "is"
+msgstr "es"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comienza por"
+msgid "returns greater than"
+msgstr "devuelve mayor que"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "devuelve menor que"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Parar el proceso"
+msgid "returns"
+msgstr "devuelve"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "suena como"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Sin estado"
+msgid "starts with"
+msgstr "comienza por"
 
-#: filter/rule-editor.c:180
+#: filter/rule-editor.c:169
 msgid "Rules"
 msgstr "Reglas"
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-editor.c:240 filter/rule-editor.c:317
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "El nombre de la regla '%s' no es único, elija otro"
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "El nombre de la regla Â«%sÂ» no es Ãºnico, elija otro"
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:283
 msgid "Add Rule"
-msgstr "Añadir Regla"
+msgstr "AÃ±adir Regla"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:362
 msgid "Edit Rule"
 msgstr "Editar Regla"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:661
+msgid "Rule name"
+msgstr "Nombre de la regla:"
+
+#: filter/score-editor.c:113
 msgid "Score Rules"
-msgstr "Reglas de puntuación"
+msgstr "Reglas de puntuaciÃ³n"
 
 #: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Debes dar un nombre a esta carpeta virtual."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:220
 msgid "You need to to specify at least one folder as a source."
 msgstr "Debes especificar al menos una carpeta como fuente."
 
+#: filter/vfolder-rule.c:499
+msgid "VFolder source"
+msgstr "Fuente de la carpeta virtual"
+
 #: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution está importando su antiguo correo de Elm"
+msgstr "Evolution estÃ¡ importando su antiguo correo de Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
 #: importers/pine-importer.c:101
@@ -11284,8 +11396,8 @@ msgid "Scanning %s"
 msgstr "Guardando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:104
+#: mail/folder-browser-ui.c:354
 msgid "Mail"
 msgstr "Correo"
 
@@ -11295,7 +11407,7 @@ msgid ""
 "Would you like to import them into Evolution?"
 msgstr ""
 "Evolution ha encontrado archivos de correo de Elm\n"
-"¿Quiere importarlos a Evolution?"
+"Â¿Quiere importarlos a Evolution?"
 
 #: importers/elm-importer.c:574
 msgid "Elm"
@@ -11307,7 +11419,7 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
-"¿Quiere importarlos a Evolution?"
+"Â¿Quiere importarlos a Evolution?"
 
 #: importers/netscape-importer.c:70
 #, c-format
@@ -11334,11 +11446,11 @@ msgstr ""
 "-3 a 3 que pueden ser asignadas a los mesajes y ser filtrados \n"
 "conformemente.\n"
 "\n"
-"Como una solución, un conjunto de filtros llamados \"Filtro de Prioridad\"\n"
-"fue añadido para convertir las prioridades de correo de Netscape en\n"
+"Como una soluciÃ³n, un conjunto de filtros llamados Â«Filtro de PrioridadÂ»\n"
+"fue aÃ±adido para convertir las prioridades de correo de Netscape en\n"
 "puntuaciones de Evolution, y los filtros afectados usan puntuaciones en\n"
 "lugar de prioridades. Verifique los filtros importados para asegurarse de\n"
-"que todo funciona como se pretendía."
+"que todo funciona como se pretendÃa."
 
 #: importers/netscape-importer.c:677
 msgid ""
@@ -11348,9 +11460,9 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 "Algunos de sus filtros de correo de Netscape usan\n"
-"las características \"Ignorar hilo\" o \"Mirar Hilo\"\n"
-"que no están implementadas en Evolution.\n"
-"Estos filtros se desecharán."
+"las caracterÃsticas Â«Ignorar hiloÂ» o Â«Mirar HiloÂ»\n"
+"que no estÃ¡n implementadas en Evolution.\n"
+"Estos filtros se desecharÃ¡n."
 
 #: importers/netscape-importer.c:694
 msgid ""
@@ -11362,17 +11474,17 @@ msgid ""
 msgstr ""
 "Algunos de los filtros de correo de Netscape prueban\n"
 "el cuerpo de los mensajes buscando (des)igualdades\n"
-"con una cadena dada, lo cual no está implementado \n"
-"en Evolution. Esos filtros serán modificados para probar\n"
-"si esa cadena está o no contenida en el cuerpo del mensaje."
+"con una cadena dada, lo cual no estÃ¡ implementado \n"
+"en Evolution. Esos filtros serÃ¡n modificados para probar\n"
+"si esa cadena estÃ¡ o no contenida en el cuerpo del mensaje."
 
 #: importers/netscape-importer.c:1227
 msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution está importando su vieja información de Netscape"
+msgstr "Evolution estÃ¡ importando su vieja informaciÃ³n de Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1092
+#: shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Papelera"
 
@@ -11390,11 +11502,11 @@ msgstr "Comenzando a importar"
 
 #: importers/netscape-importer.c:2133
 msgid "Settings"
-msgstr "Configuración"
+msgstr "ConfiguraciÃ³n"
 
 #: importers/netscape-importer.c:2138
 msgid "Mail Filters"
-msgstr "Filtros de Correo"
+msgstr "Filtros de correo"
 
 #: importers/netscape-importer.c:2161
 msgid ""
@@ -11402,11 +11514,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 "Evolution ha encontrado archivos de correo de Netscape.\n"
-"¿Quiere importarlos a Evolution?"
+"Â¿Quiere importarlos a Evolution?"
 
 #: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
-msgstr "Evolution está importando su vieja información de Pine"
+msgstr "Evolution estÃ¡ importando su vieja informaciÃ³n de Pine"
 
 #: importers/pine-importer.c:663
 msgid ""
@@ -11414,398 +11526,414 @@ msgid ""
 "Would you like to import them into Evolution?"
 msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
-"¿Quiere importarlos a Evolution?"
+"Â¿Quiere importarlos a Evolution?"
 
 #: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del Editor"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Control de Configuración de Tipos de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Control de configuración para las cuentas de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Control de Configuración para el envío de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Control de configuración para el compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure las preferencias de correo incluyendo seguridad y visualizacion de "
-"mensajes, aquí"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "Configure las fuentes usadas por Evolution aquí"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Componente Evolution para manejar el correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componente de correo del resumen de trabajo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componente para mostrar carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Componente para factoría de carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Factoría para el compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Factoría para el componente de Resumen de Correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-msgid "Font Preferences"
-msgstr "Configuración de Fuentes"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Opciones de Correo"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Interfaz de configuración del correo"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:104
 msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:105
 msgid "Public Mail"
-msgstr "Correo Público"
+msgstr "Correo pÃºblico"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:105
 msgid "Public folder containing mail"
-msgstr "Carpeta pública  conteniendo correo"
+msgstr "Carpeta pÃºblica  conteniendo correo"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:106
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:106
 msgid "Virtual Trash folder"
-msgstr "Carpetas de papeleras virtuales"
+msgstr "Carpetas de papelera virtual"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:134
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:428
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:428
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:814
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Algunas de tus opciones de correo parece que están corruptas, por favor "
-"comprueba que todo está en orden."
+"Algunas de tus opciones de correo parece que estÃ¡n corruptas, por favor "
+"comprueba que todo estÃ¡ en orden."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:979
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1003
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
-
-#: mail/component-factory.c:998
-msgid "Warning: Unsent Messages"
-msgstr "Aviso: Mensajes no enviados"
+msgstr "Tiene mensajes no enviados, Â¿quiere salir de todas formas?"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1045
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1045
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1046
 msgid "Compose a new mail message"
 msgstr "Redactar mensaje nuevo"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1054
 msgid "New Message Post"
-msgstr "Publicar Anuncio Nuevo"
+msgstr "Publicar anuncio nuevo"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1054
 msgid "_Post Message"
-msgstr "Publicar Mensaje"
+msgstr "Publicar mensaje"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1055
 msgid "Post a new mail message"
 msgstr "Publicar un anuncio nuevo"
 
-#: mail/component-factory.c:1078
+#: mail/component-factory.c:1083
 msgid "Cannot initialize the Evolution mail component."
-msgstr "No puedo inicializar el componente de correo de Evolution."
+msgstr "No se puede inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1087
+#: mail/component-factory.c:1092
 msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"No puedo inicializar el componente de configuración de correo de Evolution."
+msgstr "No se puede inicializar el componente de configuraciÃ³n de correo de Evolution."
 
-#: mail/component-factory.c:1093
+#: mail/component-factory.c:1098
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
-"No puedo inicializar el componente de información sobre carpetas de "
+"No se puede inicializar el componente de informaciÃ³n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1339 mail/component-factory.c:1369
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1380
 msgid "Cannot register storage with shell"
-msgstr "No puedo registrar un sistema de guardado con la shell"
+msgstr "No se puede registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:471
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para «%s»"
-
-#: mail/folder-browser-ui.c:473
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:321 mail/mail-display.c:377 mail/mail-display.c:896
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr "No puedo crear el directorio temporal: %s"
+msgstr "No se ha podido crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:776
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:779 mail/folder-browser.c:787
+#: mail/folder-browser.c:790
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:783
 #, c-format
 msgid "%d visible"
 msgstr "%d visible"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:788
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:793
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:795
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:797
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1136
 msgid "Create _Virtual Folder From Search..."
-msgstr "Crear una Carpeta _Virtual de la Búsqueda"
+msgstr "Crear una carpeta _virtual de la bÃºsqueda"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1716
 msgid "VFolder on _Subject"
-msgstr "Carpeta virtual según el a_sunto"
+msgstr "Carpeta virtual segÃºn el a_sunto"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1717
 msgid "VFolder on Se_nder"
-msgstr "Carpeta virtual según el _remitente"
+msgstr "Carpeta virtual segÃºn el _remitente"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1718
 msgid "VFolder on _Recipients"
-msgstr "Carpeta virtual según los _destinatarios"
+msgstr "Carpeta virtual segÃºn los _destinatarios"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1719
 msgid "VFolder on Mailing _List"
-msgstr "Carpeta virtual según la _Lista de Correo"
+msgstr "Carpeta virtual segÃºn la _lista de correo"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1723
 msgid "Filter on Sub_ject"
-msgstr "Filtrar según el As_unto"
+msgstr "Filtrar segÃºn el as_unto"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1724
 msgid "Filter on Sen_der"
-msgstr "Filtrar según el Re_mitente"
+msgstr "Filtrar segÃºn el re_mitente"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1725
 msgid "Filter on Re_cipients"
-msgstr "Filtrar según los Des_tinatarios"
+msgstr "Filtrar segÃºn los des_tinatarios"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1726 mail/folder-browser.c:2049
 msgid "Filter on _Mailing List"
-msgstr "Filtrar según la Lista de _Correo"
+msgstr "Filtrar segÃºn la lista de _Correo"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1744
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1746
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1751 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1752 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1753
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1757
 msgid "Follo_w Up..."
 msgstr "_Seguir"
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1758
 msgid "Fla_g Completed"
-msgstr "Terminado"
+msgstr "Marcar como terminado"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1759
 msgid "Cl_ear Flag"
 msgstr "Li_mpiar marca"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
-msgstr "Mar_car como leído"
+msgstr "Mar_car como leÃdo"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1764
 msgid "Mark as _Unread"
-msgstr "Marcar como _no leído"
+msgstr "Marcar como _no leÃdo"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1765
 msgid "Mark as _Important"
-msgstr "Marcar como _Importante"
+msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1766
 msgid "_Mark as Unimportant"
-msgstr "Marcar como No Im_portante"
+msgstr "Marcar como no im_portante"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1771
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1775
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1776 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1784
 msgid "Add Sender to Address_book"
-msgstr "Añadir Remitente a la Agen_da"
+msgstr "AÃ±adir remitente a la agen_da"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1788
 msgid "Appl_y Filters"
 msgstr "Apl_icar filtros"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1792
 msgid "Crea_te Rule From Message"
-msgstr "Crear Reg_la desde el Mensaje"
+msgstr "Crear reg_la desde el mensaje"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2050
 msgid "VFolder on M_ailing List"
-msgstr "Carpeta virtual según la Lista de Correo"
+msgstr "Carpeta virtual segÃºn la lista de correo"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2052
 #, c-format
 msgid "Filter on _Mailing List (%s)"
-msgstr "Filtrar según la Lista de Correo (%s)"
+msgstr "Filtrar segÃºn la lista de Correo (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2053
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
-msgstr "Carpeta virtual según la Lista de Correo (%s)"
+msgstr "Carpeta virtual segÃºn la lista de correo (%s)"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/folder-info.c:71
+#: mail/folder-browser-ui.c:481
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades para Â«%sÂ»"
+
+#: mail/folder-browser-ui.c:483
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
-msgstr "Obteniendo información de la carpeta"
+msgstr "Obteniendo informaciÃ³n de la carpeta"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencias del Editor"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Control de ConfiguraciÃ³n de Tipos de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Control de configuraciÃ³n para las cuentas de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Control de ConfiguraciÃ³n para el envÃo de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Control de configuraciÃ³n para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure las preferencias de correo incluyendo seguridad y visualizaciÃ³n de "
+"mensajes, aquÃ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure aquÃ la ortografÃa, firmas y la composiciÃ³n de mensajes."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Configure the fonts used by Evolution here"
+msgstr "Configure las fuentes usadas por Evolution aquÃ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquÃ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution component for handling mail."
+msgstr "Componente Evolution para manejar el correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution mail composer."
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution mail executive summary component."
+msgstr "Componente de correo del resumen de trabajo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Evolution mail folder display component."
+msgstr "Componente para mostrar carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "Evolution mail folder factory component."
+msgstr "Componente para factorÃa de carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "Factory for the Evolution composer."
+msgstr "FÃ¡brica para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Factory for the Mail Summary component."
+msgstr "FÃ¡brica para el componente de Resumen de Correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17
+msgid "Font Preferences"
+msgstr "ConfiguraciÃ³n de Fuentes"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+#: mail/GNOME_Evolution_Mail.server.in.in.h:19 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr "Opciones de Correo"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+#: mail/GNOME_Evolution_Mail.server.in.in.h:20
+msgid "Mail configuration interface"
+msgstr "Interfaz de configuraciÃ³n del correo"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 msgid "Factory to import mbox into Evolution"
-msgstr "Factoría para importar archivos de mbox a Evolution."
+msgstr "FÃ¡brica para importar archivos de mbox a Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importa archivos de mbox a Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factoría para importar mensajes de Outlook Express 4 a Evolution."
+msgstr "FÃ¡brica para importar mensajes de Outlook Express 4 a Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa archivos de Outlook Express 4 a Evolution."
 
@@ -11827,9 +11955,10 @@ msgid ""
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buzón de correo, puede\n"
-"que un fallo (como la falta de disco) no sea recuperable automáticamente.\n"
-"Por favor use esta opción con cuidado."
+"Nota: Cuando se convierte entre distintos formatos de buzÃ³n de correo, "
+"puede\nque un fallo (como la falta de disco) no sea recuperable "
+"automÃ¡ticamente.\n"
+"Por favor use esta opciÃ³n con cuidado."
 
 #: mail/local-config.glade.h:7
 msgid "maildir"
@@ -11843,97 +11972,96 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
-msgstr "No ha rellenado toda la información requerida."
+msgstr "No ha rellenado toda la informaciÃ³n requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:739 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:126
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1834
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:219
 msgid "Are you sure you want to delete this account?"
-msgstr "¿Esta seguro que quiere borrar esta cuenta?"
+msgstr "Â¿Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:226
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "¿Quiere borrar realmente la cuenta?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:335 mail/mail-composer-prefs.c:644
+#: mail/mail-composer-prefs.c:662
 msgid "Disable"
 msgstr "Inhabilitar"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:337 mail/mail-composer-prefs.c:644
+#: mail/mail-composer-prefs.c:662
 msgid "Enable"
 msgstr "Habilitar"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:375
+msgid "[Default]"
+msgstr "[Predeterminada]"
+
+#: mail/mail-accounts.c:417 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:805
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:422 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:424 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
-msgstr "Añadir Regla de Filtrado"
+msgstr "AÃ±adir Regla de Filtrado"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr "La(s) siguiente(s) regla(s) de filtrado:\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11941,10 +12069,15 @@ msgid ""
 "And have been updated."
 msgstr ""
 "usaban la carpeta borrada:\n"
-"    '%s'\n"
+"    Â«%sÂ»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:98 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "No mostrar otra vez este mensaje."
+
+#: mail/mail-callbacks.c:187
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11954,9 +12087,17 @@ msgstr ""
 "No ha configurado el cliente de correo.\n"
 "Necesita hacerlo para poder enviar,\n"
 "recibir o escribir mensajes.\n"
-"¿Querría configurarlo ahora?"
+"Â¿QuerrÃa configurarlo ahora?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:210
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Necesita configurar una cuenta para\n"
+"antes de poder escribir mensajes de correo."
+
+#: mail/mail-callbacks.c:224
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11964,7 +12105,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:231
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11973,84 +12114,84 @@ msgstr ""
 "correo para poder enviarlo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:250
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
-"Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que los "
-"siguientes destinatarios desean y son capacess de recibir  mensajes "
+"EstÃ¡ enviando un mensaje formateado en HTML. Por favor, asegÃºrese de que "
+"los siguientes destinatarios desean y son capaces de recibir  mensajes "
 "formateados en HTML:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:262
 msgid "Send anyway?"
-msgstr "¿Enviar de todos modos?"
+msgstr "Â¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:280
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 "Este mensaje no tiene asunto.\n"
-"¿Quiere enviarlo?"
+"Â¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:302
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Dado que la lista de contactos a la que estas enviado está configurada para "
-"esconder la lista de direcciones, este mensaje solo contendrá destinatarios "
+"Dado que la lista de contactos a la que estas enviado estÃ¡ configurada para "
+"esconder la lista de direcciones, este mensaje solo contendrÃ¡ destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:306
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Es posible que el servidor de correo revele los destinatarios añadiendo una "
+"Es posible que el servidor de correo revele los destinatarios aÃ±adiendo una "
 "cabecera Apparently-To.\n"
-"¿Enviar de todos modos?"
+"Â¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:440
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:696
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
-"No pude abrir la carpeta de borradores para esta cuenta.\n"
-"¿Quiere usar la carpeta de borradores predeterminada?"
+"No se puede abrir la carpeta de borradores para esta cuenta.\n"
+"Â¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1148
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
+msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribiÃ³:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1642 mail/message-browser.c:136
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1644 mail/message-browser.c:138
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2288
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr "¿Esta seguro que quiere editar los %d mensajes?"
+msgstr "Â¿Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2304
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12058,7 +12199,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2340
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12066,148 +12207,171 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2350
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "¿Esta seguro que quiere reenviar todos los %d mensajes?"
+msgstr "Â¿Esta seguro que quiere reenviar todos los %d mensajes?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2370
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "¿Sobreescribir archivo?"
+#: mail/mail-callbacks.c:2411
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"No se puede obtener el mensaje; Â«%sÂ»\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2416
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Â«%sÂ» ya existe\n"
+"Â¿Quiere sobreescribirlo?"
+
+#: mail/mail-callbacks.c:2457
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2459
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
-msgstr "¿Ir a la siguiente carpeta con mensajes sin leer?"
-
-#: mail/mail-callbacks.c:2662
+#: mail/mail-callbacks.c:2530
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
-"No hay más mensajes nuevos en esta carpeta.\n"
-"¿Quiere ir a la siguiente carpeta?"
+"No hay mÃ¡s mensajes nuevos en esta carpeta.\n"
+"Â¿Quiere ir a la siguiente carpeta?"
 
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2745
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Esta operación borrará permanentemente todos los mensajes marcados como "
-"borrados. Si continuas, no podrás recuperar esos mensajes.\n"
+"Esta operaciÃ³n borrarÃ¡ permanentemente todos los mensajes marcados como "
+"borrados. Si continuas, no podrÃ¡s recuperar esos mensajes.\n"
 "\n"
-"¿Borrar realmente esos mensajes?"
+"Â¿Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
-"Error cargando la información del filtro:\n"
+"Error cargando la informaciÃ³n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2839
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2881
 #, c-format
 msgid "Page %d of %d"
-msgstr "Página %d de %d"
+msgstr "PÃ¡gina %d de %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2936
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "US-Letter"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2995
 msgid "Printing of message failed"
-msgstr "Ha fallado la impresión del mensaje"
+msgstr "Ha fallado la impresiÃ³n del mensaje"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3186
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "¿Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
+msgstr "Â¿Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
 
-#: mail/mail-composer-prefs.c:223
+#: mail/mail-composer-prefs.c:226
 msgid ""
 "Please specify signature filename\n"
-"in Andvanced section of signature settings."
+"in Advanced section of signature settings."
 msgstr ""
-"Por favor especifique el nombre del fichero de la firma\n"
-"en la sección Avanzada de la configuración de firmas"
+"Por favor especifique el nombre del archivo de la firma\n"
+"en la secciÃ³n Avanzada de la configuraciÃ³n de firmas"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr " [guión]"
+#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
+#: mail/mail-composer-prefs.c:370 mail/mail-composer-prefs.c:425
+msgid "[script]"
+msgstr " [guiÃ³n]"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr "Por favos especifique un nombre válido de guión"
+#: mail/mail-composer-prefs.c:314
+msgid "You must specify a valid script name."
+msgstr "Por favor especifique un nombre vÃ¡lido de guiÃ³n"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:329 mail/mail-config.c:2571
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:809
+msgid "Language(s)"
+msgstr "Idioma(s)"
+
+#: mail/mail-composer-prefs.c:851
 msgid "Add script signature"
-msgstr "Añadir script de firma"
+msgstr "AÃ±adir guiÃ³n de firma"
+
+#: mail/mail-composer-prefs.c:870
+msgid "Signature(s)"
+msgstr "Firmas(s)"
+
+#: mail/mail-config.c:598
+#, c-format
+msgid "Account %d"
+msgstr "Cuenta %d"
+
+#: mail/mail-config.c:2262
+msgid "Checking Service"
+msgstr "Comprobando el servicio"
 
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
-msgstr "Añadir firma"
+#: mail/mail-config.c:2340 mail/mail-config.c:2343
+msgid "Connecting to server..."
+msgstr "Conectando al servidor..."
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:150
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields below "
 "do not need to be filled in, unless you wish to include this information in "
 "email you send."
 msgstr ""
-"Por favor escriba debajo su nombre y dirección de correo. Los campos  "
-"«opcionales» no hace falta que los rellene,\n"
-"a menos que quiera incluir esta información en las cartas que envíe."
+"Por favor escriba debajo su nombre y direcciÃ³n de correo. Los campos  "
+"Â«opcionalesÂ» no hace falta que los rellene,\n"
+"a menos que quiera incluir esta informaciÃ³n en las cartas que envÃe."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Por favor rellene la información acerca del servidor de correo de entrada. Si "
-"no está seguro, pregúntele a su\n"
+"Por favor rellene la informaciÃ³n acerca del servidor de correo de entrada. "
+"Si no estÃ¡ seguro, pregÃºntele a su\n"
 "administrador de sistemas o a su Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:154
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:156
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Por favor escriba debajo la información acerca de cómo enviará su correo. Si "
-"no está seguro, pregúntele\n"
+"Por favor escriba debajo la informaciÃ³n acerca de cÃ³mo enviarÃ¡ su correo. "
+"Si no estÃ¡ seguro, pregÃºntele\n"
 "a su administrador de sistemas o a su Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:158
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12215,143 +12379,126 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"Casi ha acabado con el proceso de configuración del correo. La identidad, el "
-"servidor de correo de entrada y el método de envío de correo que ha "
-"especificado serán agrupados para crear una cuenta de correo de Evolution. "
+"Casi ha acabado con el proceso de configuraciÃ³n del correo. La identidad, el "
+"servidor de correo de entrada y el mÃ©todo de envÃo de correo que ha "
+"especificado serÃ¡n agrupados para crear una cuenta de correo de Evolution. "
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo.Este "
-"nombre sólo se usará para mostrar información."
+"nombre sÃ³lo se usarÃ¡ para mostrar informaciÃ³n."
 
 #. set window title
-#: mail/mail-config-druid.c:637
+#: mail/mail-config-druid.c:643
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "Cuenta %d"
-
-#: mail/mail-config.c:2316
-msgid "Checking Service"
-msgstr "Comprobando el servicio"
-
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL no está soportado en esta compilación de evolution)"
+msgstr "(SSL no estÃ¡ soportado en esta compilaciÃ³n de evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL no está implementado en esta compilación de evolution)"
+msgstr "(SSL no estÃ¡ implementado en esta compilaciÃ³n de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
-
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnÑñoOPpQqRrSsTtUuVvWwXxYyZz"
+msgstr "S_iempre cifrarme a mÃ mismo cuando envÃe correo cifrado"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
-msgstr "Información de la cuenta"
+msgstr "InformaciÃ³n de la cuenta"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
-msgstr "Gestión de la cuenta"
+msgstr "GestiÃ³n de la cuenta"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
-msgstr "Añadir guión"
+msgstr "AÃ±adir guiÃ³n"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
-msgstr "Añadir nueva firma..."
+msgstr "AÃ±adir nueva firma..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
+msgstr "S_iempre cifrarme a mÃ mismo cuando envÃe correo cifrado"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Siempre mandar Copia de Carbón Oculta (Bcc) a:"
+msgstr "Siempre mandar Copia de CarbÃ³n Oculta (Bcc) a:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
-msgstr "Siempre mandar Copia Carbón (Cc) a:"
+msgstr "Siempre mandar Copia CarbÃ³n (Cc) a:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre confiar en las claves de mi anillo cuando encripte"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
-msgstr "Autenticación"
+msgstr "AutenticaciÃ³n"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
-msgstr "_Detectar enlaces automáticamente"
+msgstr "_Detectar enlaces automÃ¡ticamente"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
-msgstr "Báltico (ISO-8859-13)"
+msgstr "BÃ¡ltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
-msgstr "Báltico (ISO-8859-4)"
+msgstr "BÃ¡ltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "Juego de caracteres:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "C_olores"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
-msgstr "Verificar orto_grafía mientras se escribe"
+msgstr "Verificar orto_grafÃa mientras se escribe"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras dudosas"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Componiendo mensajes"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
-msgstr "Configuración"
+msgstr "ConfiguraciÃ³n"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12360,148 +12507,146 @@ msgid ""
 "\n"
 "Click \"Finish\" to save your settings."
 msgstr ""
-"Enhorabuena, la configuración de su correo esta completa.\n"
+"Enhorabuena, la configuraciÃ³n de su correo esta completa.\n"
 "\n"
-"Ahora está listo para mandar y recibir correo \n"
+"Ahora estÃ¡ listo para mandar y recibir correo \n"
 "usando Evolution. \n"
 "\n"
-"Pulse «Finalizar» para guardar su configuración."
+"Pulse Â«FinalizarÂ» para guardar su configuraciÃ³n."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamiento predefinido"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Borrando mensajes"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "No firmar las peticiones de reunión (para compatibilidad con Outlook)"
+msgstr "No firmar las peticiones de reuniÃ³n (para compatibilidad con Outlook)"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1262
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Cuentas de Correo"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
-msgstr "Dir_ección de correo:"
+msgstr "Dir_ecciÃ³n de correo:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Vaciar pap_elera al salir"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Execute Command..."
 msgstr "Ejecutar orden"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Fi_xed -width:"
 msgstr "Anchura fija:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Font Properties"
 msgstr "Propiedades de Fuentes"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Format messages in _HTML"
 msgstr "Formatear mensajes en _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Highlight _quotations with"
 msgstr "_Resaltar citas con"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Inline"
-msgstr "Incluido en línea"
+msgstr "Incluido en lÃnea"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Labels and Colors"
 msgstr "Etiquetas y Colores"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Loading Images"
-msgstr "Cargando Imágenes"
+msgstr "Cargando ImÃ¡genes"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
-msgstr "Configuración del correo"
+msgstr "ConfiguraciÃ³n del correo"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
-msgstr "Localización del Mailbox"
+msgstr "LocalizaciÃ³n del Mailbox"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Editor de Mensajes"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
 #: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
-msgstr "Notificación de correo nuevo"
+msgstr "NotificaciÃ³n de correo nuevo"
 
 #: mail/mail-config.glade.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the first "
 "time"
-msgstr "Nota: Se le pedirá una contraseña hasta que conecte por primera vez"
+msgstr "Nota: Se le pedirÃ¡ una contraseÃ±a hasta que conecte por primera vez"
 
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
@@ -12509,11 +12654,11 @@ msgstr "Fuentes en pantalla"
 
 #: mail/mail-config.glade.h:80
 msgid "Optional Information"
-msgstr "Información opcional"
+msgstr "InformaciÃ³n opcional"
 
 #: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
-msgstr "Organi_zación:"
+msgstr "Organi_zaciÃ³n:"
 
 #: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
@@ -12549,7 +12694,7 @@ msgstr "Citado"
 
 #: mail/mail-config.glade.h:94
 msgid "Re_member this password"
-msgstr "Re_cuerda esta contraseña"
+msgstr "Re_cuerda esta contraseÃ±a"
 
 #: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
@@ -12561,15 +12706,15 @@ msgstr "Recibiendo mensajes"
 
 #: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
-msgstr "Opciones de recepción"
+msgstr "Opciones de recepciÃ³n"
 
 #: mail/mail-config.glade.h:98
 msgid "Remember this _password"
-msgstr "Recuerda esta contraseña"
+msgstr "Recuerda esta contraseÃ±a"
 
 #: mail/mail-config.glade.h:99
 msgid "Required Information"
-msgstr "Información requerida"
+msgstr "InformaciÃ³n requerida"
 
 #: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
@@ -12613,13 +12758,11 @@ msgstr "Mensajes Enviados y Borradores"
 
 #: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
-msgstr "El ser_vidor requiere autenticación"
+msgstr "El ser_vidor requiere autenticaciÃ³n"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/help/hyperbola-filefmt.c:397
 #: mail/mail-config.glade.h:113
 msgid "Server Configuration"
-msgstr "Configuración del servidor"
+msgstr "ConfiguraciÃ³n del servidor"
 
 #: mail/mail-config.glade.h:114
 msgid "Server _Type: "
@@ -12634,584 +12777,587 @@ msgid "Specify _filename:"
 msgstr "Especificar nombre de archivo:"
 
 #: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "Idioma para Ortografía"
-
-#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
-msgstr "Ortografía"
+msgstr "OrtografÃa"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
-msgstr "Mailbox estándar de Unix"
+msgstr "Mailbox estÃ¡ndar de Unix"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 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 guión será usada como su\n"
-"firma. El nombre que especifique será usado\n"
-"únicamente para mostrarlo por pantella."
+"La salida de este guiÃ³n serÃ¡ usada como su\n"
+"firma. El nombre que especifique serÃ¡ usado\n"
+"Ãºnicamente para mostrarlo por pantalla."
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:122
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Esta página permite configurar el comportamiento de la revisión ortográfica y "
-"el idioma. La lista de idiomas aquí refleja únicamente los idiomas para los "
-"cuales hay instalado un diccionario."
+"Esta pÃ¡gina permite configurar el comportamiento de la revisiÃ³n "
+"ortogrÃ¡fica y el idioma. La lista de idiomas aquÃ refleja Ãºnicamente los "
+"idiomas para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"Escriba el nombre por el que querría referirse a esta cuenta.\n"
-"Por ejemplo: \"Trabajo\" o \"Personal\"."
+"Escriba el nombre por el que querrÃa referirse a esta cuenta.\n"
+"Por ejemplo: Â«TrabajoÂ» o Â«PersonalÂ»."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:127
 msgid "V_ariable-width:"
 msgstr "Anchura variable:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:128
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
-"Bienvenido al asistente de configuración de correo de Evolution.\n"
+"Bienvenido al asistente de configuraciÃ³n de correo de Evolution.\n"
 "\n"
-"Pulse «Siguiente» para comenzar. "
+"Pulse Â«SiguienteÂ» para comenzar. "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:133
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:135
 msgid "_Add Signature"
-msgstr "_Añadir firma"
+msgstr "_AÃ±adir firma"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:136
 msgid "_Always load images off the net"
-msgstr "C_argar imágenes fuera de la red"
+msgstr "C_argar imÃ¡genes fuera de la red"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:137
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:138
 msgid "_Authentication Type: "
-msgstr "Tipo de _autenticación: "
+msgstr "Tipo de _autenticaciÃ³n: "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:139
 msgid "_Authentication type: "
-msgstr "Tipo de _autenticación: "
+msgstr "Tipo de _autenticaciÃ³n: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:140
 msgid "_Automatically check for new mail"
-msgstr "Comprobar el correo _automáticamente"
+msgstr "Comprobar el correo _automÃ¡ticamente"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:141
 msgid "_Automatically insert smiley images"
-msgstr "Instertar smiley's automáticamente"
+msgstr "Insertar caritas grÃ¡ficas automÃ¡ticamente"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:142
 msgid "_Beep when new mail arrives"
 msgstr "Emitir un pitido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:143
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
-msgstr "Firma por omisión:"
+msgstr "Firma por omisiÃ³n:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Pre_determinados"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:148
 msgid "_Do not notify me when new mail arrives"
-msgstr "_No notificarme cuando llege correo nuevo"
+msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:150
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:151
 msgid "_Fixed-width:"
 msgstr "_Anchura fija:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "_Estilo de reenvio:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
-msgstr "Cargar imágenes si e_l remitente esta el la agenda de direcciones"
+msgstr "Cargar imÃ¡genes si e_l remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
-msgstr "_Marcar mensajes como leídos tras"
+msgstr "_Marcar mensajes como leÃdos tras"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
-msgstr "_No cargar nunca imágenes desde la red"
+msgstr "_No cargar nunca imÃ¡genes desde la red"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
-msgstr "Tocar un fichero de sonido cuando llegue correo nuevo"
+msgstr "Tocar un archivo de sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
+msgstr "Pr_eguntar al mandar mensajes con el asunto vacÃo"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Recibiendo correo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Estilo de _Respuesta;"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
-msgstr "Volver a configuración p_redeterminada"
+msgstr "Volver a configuraciÃ³n p_redeterminada"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
-msgstr "_Guión:"
+msgstr "_GuiÃ³n:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
-msgstr "Mostrar imágenes animadas"
+msgstr "Mostrar imÃ¡genes animadas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Firmas:"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:174
 msgid "_Use secure connection (SSL):"
 msgstr "U_sar conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:175
 msgid "_Variable-width:"
 msgstr "Anchura _variable"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:176
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:177
 msgid "color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "description"
-msgstr "descripción"
+msgstr "descripciÃ³n"
 
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
-msgstr "No pude crear un contexto de firma S/MIME."
+msgstr "No se ha podido crear un contexto de firma S/MIME."
 
 #: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
-msgstr "No pude crear un contexto de certificado S/MIME."
+msgstr "No se ha podido crear un contexto de certificado S/MIME."
 
 #: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
-msgstr "No pude crear un contexto de cifrado S/MIME."
+msgstr "No se ha podido crear un contexto de cifrado S/MIME."
 
 #: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
-msgstr "No pude crear un contexto sobre tipo S/MIME."
+msgstr "No se ha podido crear un contexto sobre tipo S/MIME."
 
 #: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
-msgstr "No pude crear un contexto de decodificación S/MIME."
+msgstr "No se ha podido crear un contexto de decodificaciÃ³n S/MIME."
+
+#: mail/mail-display.c:188
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"EL archivo Â«%sÂ» ya existe.\n"
+"Â¿Quiere que lo sobreescriba?"
+
+#: mail/mail-display.c:191
+msgid "Overwrite file?"
+msgstr "Â¿Sobreescribir archivo?"
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:316
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:392
 #, c-format
 msgid "Could not create temporary file '%s': %s"
-msgstr "No puedo crear el fichero temporal: \"%s\": %s"
+msgstr "No se ha podido crear el archivo temporal: Â«%sÂ»: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:440
 msgid "Save Attachment..."
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:441
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:442
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:498
 #, c-format
 msgid "View Inline (via %s)"
-msgstr "Ver incluido (vía %s)"
+msgstr "Ver incluido (vÃa %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:502
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:522
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1316
 msgid "Downloading images"
-msgstr "Descargar _Imágenes"
+msgstr "Descargar _ImÃ¡genes"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1493
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1825
 msgid "Overdue:"
 msgstr "Retrasadas:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1829
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2178
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2179
 msgid "Copy Link Location"
-msgstr "Copiar Dirección del enlace"
+msgstr "Copiar DirecciÃ³n del enlace"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2181
 msgid "Save Link as (FIXME)"
-msgstr "Guardar enlace como (ARRÉGLAME)"
+msgstr "Guardar enlace como (ARRÃ‰GLAME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2183
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:677 mail/mail-format.c:1345 mail/mail-format.c:1414
+#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:755 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:839
 msgid "Bad Address"
-msgstr "Dirección errónea"
+msgstr "DirecciÃ³n errÃ³nea"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:880 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:260 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:884
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:889 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:899
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Transporte"
-
-#: mail/mail-format.c:1848
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1457
+msgid "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
-"Este mensaje está firmado digitalmente. Pulsa en el icono del candado para "
-"más información."
+"Este mensaje estÃ¡ firmado digitalmente. Pulsa en el icono del candado para "
+"mÃ¡s informaciÃ³n."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1485
 msgid "Could not create a PGP verfication context"
-msgstr "No pude crear un contexto de verificación PGP."
+msgstr "No se ha podido crear un contexto de verificaciÃ³n PGP."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1493
 msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Este mensaje está firmado digitalmente y es auténtico."
+msgstr "Este mensaje estÃ¡ firmado digitalmente y es autÃ©ntico."
 
-#: mail/mail-format.c:1892
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:1500
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
-"Este mensaje está firmado digitalmente pero no se puede verificar su "
+"Este mensaje estÃ¡ firmado digitalmente pero no se puede verificar su "
 "autenticidad."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1764
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1775
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntero a archivo local (%s) valido en «%s»"
+msgstr "Puntero a archivo local (%s) valido en Â«%sÂ»"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1778
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1811
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+msgstr "Puntero a datos externos desconocidos (tipo Â«%sÂ»)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1813
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Carpetas locales/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
-"No puedo guardar la meta información de la carpeta: probablemente\n"
+"No se puede guardar la meta informaciÃ³n de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
-msgstr "No puedo guardar la meta información de la carpeta en %s: %s"
+msgstr "No se puede guardar la meta informaciÃ³n de la carpeta en %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
-msgstr "No puedo borrar la meta información de la carpeta %s: %s"
+msgstr "No se puede borrar la meta informaciÃ³n de la carpeta %s: %s"
 
-#: mail/mail-local.c:1329
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Cambiando la carpeta «%s» al formato «%s»"
+msgstr "Cambiando la carpeta Â«%sÂ» al formato Â«%sÂ»"
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
-"Si no puede volver a abrir este buzón, entonces\n"
+"Si no puede volver a abrir este buzÃ³n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1447
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1511
 msgid "You cannot change the format of a non-local folder."
 msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
-"Error mientras `%s':\n"
+"Error mientras Â«%sÂ»:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
-"Error mientras hacia:\n"
+"Error al efectuar operaciÃ³n:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:899
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
-msgstr "Aun así, este mensaje fue enviado correctamente."
+msgstr "Aun asÃ, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
-msgstr "Enviando «%s»"
+msgstr "Enviando Â«%sÂ»"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:548
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Analizando carpetas en «%s»"
+msgstr "Analizando carpetas en Â«%sÂ»"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "Guardando carpeta '%s'"
+msgstr "Guardando carpeta Â«%sÂ»"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1916
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
-"No pude crear el archivo de salida: %s\n"
+"No se puede crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13220,138 +13366,136 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2018
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:2035
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"No pude crear el archivo de salida: %s:\n"
+"No se puede crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:2065
 #, c-format
 msgid "Could not write data: %s"
-msgstr "No pude escribir datos: %s"
+msgstr "No se ha podido escribir datos: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Buscar"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:128
 msgid "(Untitled Message)"
-msgstr "(Mensaje sin título)"
+msgstr "(Mensaje sin tÃtulo)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:219
 msgid "Untitled Message"
-msgstr "Mensaje sin título"
+msgstr "Mensaje sin tÃtulo"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:221
 msgid "Empty Message"
-msgstr "Mensaje vacío"
+msgstr "Mensaje vacÃo"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:269
 msgid "Find in Message"
 msgstr "Buscar en Mensaje"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:272
+msgid "Search"
+msgstr "Buscar"
+
+#: mail/mail-search.c:298
 msgid "Case Sensitive"
-msgstr "Sensible a mayúsculas"
+msgstr "Sensible a mayÃºsculas"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:300
 msgid "Search Forward"
 msgstr "Buscar hacia adelante"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-first-time-druid.c:290
-#: mail/mail-search.c:343
+#: mail/mail-search.c:320
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:323
 msgid "Matches:"
 msgstr "Coincide:"
 
+#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
+msgid "_Search"
+msgstr "_Buscar"
+
 #: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:251
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Camino: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:298
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:300
 msgid "Cancel All"
 msgstr "Cancelar todo"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:359
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:360 mail/mail-send-recv.c:413
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:211
 msgid "User canceled operation."
-msgstr "Operación cancelada por el usuario."
-
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Recuerda esta contraseña"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr "Recordar esta clave durante el resto de esta sesión"
+msgstr "OperaciÃ³n cancelada por el usuario."
 
-#: mail/mail-session.c:330
+#: mail/mail-session.c:244
 #, c-format
 msgid "Enter Password for %s"
-msgstr "Introduzca su contraseña para %s"
+msgstr "Introduzca su contraseÃ±a para %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:246
 msgid "Enter Password"
-msgstr "Introduzca contraseña"
+msgstr "Introduzca contraseÃ±a"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:261
+msgid "_Remember this password"
+msgstr "_Recuerda esta contraseÃ±a"
+
+#: mail/mail-session.c:262
+msgid "_Remember this password for the remainder of this session"
+msgstr "Recordar esta clave durante el resto de esta sesiÃ³n"
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
-msgstr "No pude guardar el fichero de firma:%s"
+msgstr "No se ha podido guardar el archivo de firma:%s"
 
 #: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Guardar firma"
-
-#: mail/mail-signature-editor.c:181
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13359,17 +13503,21 @@ msgid ""
 msgstr ""
 "Esta firma ha cambiado, pero no ha sido guardada.\n"
 "\n"
-"¿Quiere guardar los cambios?"
+"Â¿Quiere guardar los cambios?"
+
+#: mail/mail-signature-editor.c:178
+msgid "Save signature"
+msgstr "Guardar firma"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:323
 msgid "Edit signature"
 msgstr "Editar firma"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:359
 msgid "Enter a name for this signature."
 msgstr "Introduzca un nombre para esta firma."
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:362 my-evolution/e-summary-preferences.c:619
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -13378,25 +13526,25 @@ msgstr "Nombre:"
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:264
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:413
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:79
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando vfolder: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:197
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:444
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13406,100 +13554,100 @@ msgid ""
 msgstr ""
 "La(s) siguiente(s) carpeta(s) virtual(es):\n"
 "%sUsaban la carpeta borrada:\n"
-"    '%s'\n"
+"    Â«%sÂ»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:753 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:810
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:850
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:868
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
+msgstr "Tratando de editar una carpeta virtual Â«%sÂ» que no existe."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:921
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:212
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:214
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:737
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:738
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:739
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:740
 msgid "Multiple Unseen Messages"
-msgstr "Múltiples mensajes sin leer"
+msgstr "MÃºltiples mensajes sin leer"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:741
 msgid "Multiple Messages"
-msgstr "Múltiples mensajes"
+msgstr "MÃºltiples mensajes"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:745
 msgid "Lowest"
-msgstr "La más baja"
+msgstr "La mÃ¡s baja"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:746
 msgid "Lower"
-msgstr "Más baja"
+msgstr "MÃ¡s baja"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:750
 msgid "Higher"
-msgstr "Más alta"
+msgstr "MÃ¡s alta"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:751
 msgid "Highest"
-msgstr "La más alta"
+msgstr "La mÃ¡s alta"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2589
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13507,8 +13655,6 @@ msgstr "Generando la lista de mensajes"
 msgid "Due By"
 msgstr "Debido a"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1199
 #: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Marca de Estado"
@@ -13529,57 +13675,53 @@ msgstr "Lugar Original"
 msgid "Received"
 msgstr "Recibido"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-search-bar-criterion.c:46
-# src/file-manager/fm-list-view.c:1587
-# src/file-manager/fm-search-list-view.c:146
 #: mail/message-list.etspec.h:11
 msgid "Size"
-msgstr "Tamaño"
+msgstr "TamaÃ±o"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:49
 msgid "Call"
 msgstr "Llamada"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:50
 msgid "Do Not Forward"
 msgstr "No Reenviar"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:51
 msgid "Follow-Up"
 msgstr "_Seguir"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:52
 msgid "For Your Information"
-msgstr "Para su información"
+msgstr "Para su informaciÃ³n"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:53 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:54
 msgid "No Response Necessary"
 msgstr "No es necesario una respuesta"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:56 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:57 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:58
 msgid "Review"
-msgstr "Revisión"
+msgstr "RevisiÃ³n"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:242 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Marcar para Seguimiento"
 
 #: mail/message-tags.glade.h:1
 msgid "C_ompleted"
-msgstr "Terminado"
+msgstr "Terminad_o"
 
 #: mail/message-tags.glade.h:5
 msgid ""
@@ -13587,7 +13729,7 @@ msgid ""
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
-"Pr favor, seleccione una acción de seguimiento desde el menú \"Marcar\"."
+"Pr favor, seleccione una acciÃ³n de seguimiento desde el menÃº Â«MarcarÂ»."
 
 #: mail/message-tags.glade.h:7
 msgid "_Clear Flag"
@@ -13601,54 +13743,52 @@ msgstr "Debido a"
 msgid "_Flag:"
 msgstr "Marca"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:232
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
-msgstr "Analizando carpetas bajo %s en «%s»"
+msgstr "Analizando carpetas bajo %s en Â«%sÂ»"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:234
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
-msgstr "Analizando carpetas de nivel superior en «%s»"
+msgstr "Analizando carpetas de nivel superior en Â«%sÂ»"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
-msgstr "Suscribiendo a carpeta «%s»"
+msgstr "Suscribiendo a carpeta Â«%sÂ»"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
-msgstr "De-suscribiendo la carpeta «%s»"
+msgstr "De-suscribiendo la carpeta Â«%sÂ»"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1439
 msgid "Scanning folders..."
 msgstr "Buscando carpetas..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1546
 msgid "No server has been selected"
-msgstr "No se ha seleccionado ningún servidor"
+msgstr "No se ha seleccionado ningÃºn servidor"
 
 #: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:3
 msgid "All folders"
 msgstr "Todas las carpetas"
 
-#: mail/subscribe-dialog.glade.h:2
+#: mail/subscribe-dialog.glade.h:4
 msgid "Apri file"
-msgstr "Fichero Apri"
+msgstr "Archivo Apri"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-window.c:1267
-#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13657,61 +13797,167 @@ msgstr "Fichero Apri"
 msgid "Close"
 msgstr "Cerrar"
 
-#: mail/subscribe-dialog.glade.h:4
+#: mail/subscribe-dialog.glade.h:6
 msgid "Display Options"
 msgstr "Mostrar opciones"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:7
 msgid "Folders whose names begin with:"
 msgstr "Carpetas cuyo nombre comience por:"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:8
 msgid "Manage Subscriptions"
 msgstr "Administrar Suscripciones"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Regenerar la lista"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:10
 msgid "S_elect server: "
 msgstr "Seleccione un servidor:"
 
-#: mail/subscribe-dialog.glade.h:9
+#: mail/subscribe-dialog.glade.h:11
 msgid "Salve file"
-msgstr "Guardar fichero"
+msgstr "Guardar archivo"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:12
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:13
 msgid "_Unsubscribe"
 msgstr "De-s_uscribir"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/component-factory.c:54
+msgid "Folder containing the Evolution Summary"
+msgstr "La carpeta contiene el Resumen de Evolution"
+
+#: my-evolution/e-summary.c:199
+msgid "%A, %B %e %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:514
+msgid "Please wait..."
+msgstr "Por favor espere..."
+
+#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Ha fallado la impresiÃ³n del resumen"
+
+#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:378
+msgid "No appointments"
+msgstr "Sin citas"
+
+#: my-evolution/e-summary-calendar.c:414
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:416
+msgid "%l:%M %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:434
+msgid "No description"
+msgstr "Sin descripciÃ³n"
+
+#: my-evolution/e-summary-mail.c:156
+msgid "Mail summary"
+msgstr "Resumen de correo"
+
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1119
+msgid "Local Folders"
+msgstr "Carpetas locales"
+
+#: my-evolution/e-summary-preferences.c:353
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Palabra del DÃa"
+
+#: my-evolution/e-summary-preferences.c:371
+msgid "Quotes of the Day"
+msgstr "Frase del DÃa"
+
+#: my-evolution/e-summary-preferences.c:609
+msgid "Add a news feed"
+msgstr "AÃ±adir una fuente de noticias"
+
+#: my-evolution/e-summary-preferences.c:615
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Escriba la URL de la fuente de noticias que quiere aÃ±adir"
+
+#: my-evolution/e-summary-rdf.c:303
+msgid "Error downloading RDF"
+msgstr "Error obteniendo RDF"
+
+#: my-evolution/e-summary-rdf.c:446
+msgid "News Feed"
+msgstr "Fuentes de noticias"
+
+#: my-evolution/e-summary-shown.c:518
+msgid "All"
+msgstr "Todo"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:530
+msgid "Add"
+msgstr "AÃ±adir"
+
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Mostrados"
+
+#: my-evolution/e-summary-tasks.c:327
+msgid "No tasks"
+msgstr "No hay tareas"
+
+#: my-evolution/e-summary-tasks.c:371
+msgid "(No Description)"
+msgstr "(Sin descripciÃ³n)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mi Tiempo"
+
+#: my-evolution/e-summary-weather.c:269
+msgid "There was an error downloading data for"
+msgstr "Hubo un error descargando datos para"
+
+#: my-evolution/e-summary-weather.c:490
+msgid "Weather"
+msgstr "Tiempo"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:592
+msgid "KBOS"
+msgstr "LEMD:LEVS:LEVC"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configuration control for the Evolution Summary."
-msgstr "Control de configuración para el sumario de Evolution."
+msgstr "Control de configuraciÃ³n para el sumario de Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Configura la apariencia del Sumario de Evolution aquí"
+msgstr "Configura la apariencia del Sumario de Evolution aquÃ"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 msgid "Evolution Summary component."
 msgstr "Componente del Sumario de Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Factoría para el control de configuración del Sumario de Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-msgid "Factory for the Evolution Summary component."
-msgstr "Factoría para el componente de Sumario de Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 msgid "Summary Preferences"
-msgstr "Configuración del Sumario"
+msgstr "ConfiguraciÃ³n del Sumario"
 
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
@@ -13799,7 +14045,7 @@ msgstr "Afonsos"
 
 #: my-evolution/Locations.h:22
 msgid "Africa"
-msgstr "África"
+msgstr "Ãfrica"
 
 #: my-evolution/Locations.h:23
 msgid "Afyon"
@@ -13827,7 +14073,7 @@ msgstr "Ainsworth"
 
 #: my-evolution/Locations.h:29
 msgid "Air Force"
-msgstr "Fuerzas aéreas"
+msgstr "Fuerzas aÃ©reas"
 
 #: my-evolution/Locations.h:30
 msgid "Ajaccio/Campo dell'Oro"
@@ -13959,7 +14205,7 @@ msgstr "Alma"
 
 #: my-evolution/Locations.h:64
 msgid "Almeria"
-msgstr "Almería"
+msgstr "AlmerÃa"
 
 #: my-evolution/Locations.h:65
 msgid "Alpena"
@@ -14115,7 +14361,7 @@ msgstr "Antalya"
 
 #: my-evolution/Locations.h:103
 msgid "Antartica"
-msgstr "Antártico"
+msgstr "AntÃ¡rtico"
 
 #: my-evolution/Locations.h:104
 msgid "Antigo"
@@ -14259,7 +14505,7 @@ msgstr "Asturias"
 
 #: my-evolution/Locations.h:140
 msgid "Asuncion"
-msgstr "Asunción"
+msgstr "AsunciÃ³n"
 
 #: my-evolution/Locations.h:141
 msgid "Athens"
@@ -14275,7 +14521,7 @@ msgstr "Atlanta"
 
 #: my-evolution/Locations.h:144
 msgid "Atlantic"
-msgstr "Atlántico"
+msgstr "AtlÃ¡ntico"
 
 #: my-evolution/Locations.h:145
 msgid "Atlantic City"
@@ -14335,11 +14581,11 @@ msgstr "Bagotville"
 
 #: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
-msgstr "Bahia Blanca"
+msgstr "BahÃa Blanca"
 
 #: my-evolution/Locations.h:163
 msgid "Bahias de Huatulco"
-msgstr "Bahias de Huatulco"
+msgstr "BahÃas de Huatulco"
 
 #: my-evolution/Locations.h:165
 msgid "Baker City"
@@ -14443,7 +14689,7 @@ msgstr "Barrow"
 
 #: my-evolution/Locations.h:190
 msgid "Barter Island"
-msgstr "Barter Island"
+msgstr "Isla Barter"
 
 #: my-evolution/Locations.h:191
 msgid "Bartlesville"
@@ -14611,7 +14857,7 @@ msgstr "Berlevag"
 
 #: my-evolution/Locations.h:234
 msgid "Berlin"
-msgstr "Berlín"
+msgstr "BerlÃn"
 
 #: my-evolution/Locations.h:235
 msgid "Berlin-Tegel"
@@ -14631,7 +14877,7 @@ msgstr "Bethel"
 
 #: my-evolution/Locations.h:239
 msgid "Bethlehem Airport"
-msgstr "Aeropuerto de Belén"
+msgstr "Aeropuerto de BelÃ©n"
 
 #: my-evolution/Locations.h:240
 msgid "Bettles"
@@ -14747,7 +14993,7 @@ msgstr "Bodo"
 
 #: my-evolution/Locations.h:268
 msgid "Bogota/Eldorado"
-msgstr "Bogotá/Eldorado"
+msgstr "BogotÃ¡/Eldorado"
 
 #: my-evolution/Locations.h:269
 msgid "Boise"
@@ -14755,7 +15001,7 @@ msgstr "Boise"
 
 #: my-evolution/Locations.h:271
 msgid "Bologna"
-msgstr "Boloña"
+msgstr "BoloÃ±a"
 
 #: my-evolution/Locations.h:272
 msgid "Bolzano"
@@ -14943,7 +15189,7 @@ msgstr "Budapest"
 
 #: my-evolution/Locations.h:319
 msgid "Buffalo"
-msgstr "Búfalo"
+msgstr "BÃºfalo"
 
 #: my-evolution/Locations.h:321
 msgid "Bullfrog"
@@ -15047,7 +15293,7 @@ msgstr "Cambridge"
 
 #: my-evolution/Locations.h:346
 msgid "Cameron"
-msgstr "Camerún"
+msgstr "CamerÃºn"
 
 #: my-evolution/Locations.h:347
 msgid "Camiri"
@@ -15079,31 +15325,31 @@ msgstr "Canaan"
 
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
-msgstr "Canárias/Fuerteventura"
+msgstr "CanÃ¡rias/Fuerteventura"
 
 #: my-evolution/Locations.h:356
 msgid "Canarias/Gran Canaria"
-msgstr "Canárias/Gran Canária"
+msgstr "CanÃ¡rias/Gran CanÃ¡ria"
 
 #: my-evolution/Locations.h:357
 msgid "Canarias/Hierro"
-msgstr "Canárias/Hierro"
+msgstr "CanÃ¡rias/Hierro"
 
 #: my-evolution/Locations.h:358
 msgid "Canarias/Lanzarote"
-msgstr "Canárias/Lanzarote"
+msgstr "CanÃ¡rias/Lanzarote"
 
 #: my-evolution/Locations.h:359
 msgid "Canarias/La Palma"
-msgstr "Canárias/La Palma"
+msgstr "CanÃ¡rias/La Palma"
 
 #: my-evolution/Locations.h:360
 msgid "Canarias/Tenerife Norte"
-msgstr "Canárias/Tenerife Norte"
+msgstr "CanÃ¡rias/Tenerife Norte"
 
 #: my-evolution/Locations.h:361
 msgid "Canarias/Tenerife Sur"
-msgstr "Canárias/Tenerife Sur"
+msgstr "CanÃ¡rias/Tenerife Sur"
 
 #: my-evolution/Locations.h:362
 msgid "Canberra"
@@ -15111,7 +15357,7 @@ msgstr "Canberra"
 
 #: my-evolution/Locations.h:363
 msgid "Cancun"
-msgstr "Cancún"
+msgstr "CancÃºn"
 
 #: my-evolution/Locations.h:364
 msgid "Cannes-Mandelieu"
@@ -15235,7 +15481,7 @@ msgstr "Cedar Rapids"
 
 #: my-evolution/Locations.h:395
 msgid "Central and South America"
-msgstr "América central y sur"
+msgstr "AmÃ©rica central y sur"
 
 #: my-evolution/Locations.h:396
 msgid "Cervia"
@@ -15635,7 +15881,7 @@ msgstr "Conceicao Do Araguaia"
 
 #: my-evolution/Locations.h:498
 msgid "Concepcion"
-msgstr "Concepción"
+msgstr "ConcepciÃ³n"
 
 #: my-evolution/Locations.h:499
 msgid "Concord"
@@ -15667,7 +15913,7 @@ msgstr "Copper Harbor"
 
 #: my-evolution/Locations.h:506
 msgid "Cordoba"
-msgstr "Córdoba"
+msgstr "CÃ³rdoba"
 
 #: my-evolution/Locations.h:507
 msgid "Cordova"
@@ -15883,7 +16129,7 @@ msgstr "Dayton-Fairborn"
 
 #: my-evolution/Locations.h:565
 msgid "Dayton-South Airport"
-msgstr "Dayton-South Airport"
+msgstr "Aeropuerto de Dayton-South"
 
 #: my-evolution/Locations.h:566
 msgid "Dead Horse"
@@ -16049,8 +16295,6 @@ msgstr "Doha"
 msgid "Dole"
 msgstr "Dole"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1262
 #: my-evolution/Locations.h:609
 msgid "Donetsk"
 msgstr "Donetsk"
@@ -16101,7 +16345,7 @@ msgstr "Dubbo"
 
 #: my-evolution/Locations.h:621
 msgid "Dublin"
-msgstr "Dublín"
+msgstr "DublÃn"
 
 #: my-evolution/Locations.h:622
 msgid "Du Bois"
@@ -16825,7 +17069,7 @@ msgstr "Geneve"
 
 #: my-evolution/Locations.h:808
 msgid "Genova"
-msgstr "Génova"
+msgstr "GÃ©nova"
 
 #: my-evolution/Locations.h:809
 msgid "George Airport"
@@ -16913,7 +17157,7 @@ msgstr "Granada"
 
 #: my-evolution/Locations.h:833
 msgid "Grand Canyon"
-msgstr "Gran Cañon"
+msgstr "Gran CaÃ±on"
 
 #: my-evolution/Locations.h:834
 msgid "Grand Cayman"
@@ -17029,11 +17273,11 @@ msgstr "Guangzhou"
 
 #: my-evolution/Locations.h:863
 msgid "Guantanamo"
-msgstr "Guantánamo"
+msgstr "GuantÃ¡namo"
 
 #: my-evolution/Locations.h:864
 msgid "Guarany"
-msgstr "Guaraní"
+msgstr "GuaranÃ"
 
 #: my-evolution/Locations.h:865
 msgid "Guaratingueta"
@@ -17097,7 +17341,7 @@ msgstr "La Habana"
 
 #: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
-msgstr "Hachijojima Airport"
+msgstr "Aeropuerto de Hachijojima"
 
 #: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
@@ -17112,7 +17356,7 @@ msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Granizo"
 
@@ -17354,7 +17598,7 @@ msgstr "Honningsvag"
 
 #: my-evolution/Locations.h:948
 msgid "Honolulu"
-msgstr "Honolulú"
+msgstr "HonolulÃº"
 
 #: my-evolution/Locations.h:949
 msgid "Hoonah"
@@ -17482,7 +17726,7 @@ msgstr "Idaho Falls"
 
 #: my-evolution/Locations.h:982
 msgid "Iguazu"
-msgstr "Iguazú"
+msgstr "IguazÃº"
 
 #: my-evolution/Locations.h:983
 msgid "Iki Airport"
@@ -17522,7 +17766,7 @@ msgstr "Indiana"
 
 #: my-evolution/Locations.h:993
 msgid "Indianapolis"
-msgstr "Indianápolis"
+msgstr "IndianÃ¡polis"
 
 #: my-evolution/Locations.h:994
 msgid "Indian Springs"
@@ -17574,7 +17818,7 @@ msgstr "Iraklion"
 
 #: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
-msgstr "Irán, República Islámica de"
+msgstr "IrÃ¡n, RepÃºblica IslÃ¡mica de"
 
 #: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
@@ -17654,7 +17898,7 @@ msgstr "Jacksonville"
 
 #: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
-msgstr "Jacksonville-Craig Airport"
+msgstr "Aeropuerto de Jacksonville-Craig"
 
 #: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
@@ -17678,7 +17922,7 @@ msgstr "Jan Smuts"
 
 #: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
-msgstr "Jeddah King Abdul Aziz International Airport"
+msgstr "Aeropuerto Internacional de Jeddah King Abdul Aziz"
 
 #: my-evolution/Locations.h:1037
 msgid "Jefferson City"
@@ -17722,7 +17966,7 @@ msgstr "Juanjui"
 
 #: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
-msgstr "Juan Santamaría"
+msgstr "Juan SantamarÃa"
 
 #: my-evolution/Locations.h:1049
 msgid "Juigalpa"
@@ -17750,7 +17994,7 @@ msgstr "Kadena Ab"
 
 #: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
-msgstr "Kagoshima Airport"
+msgstr "Aeropuerto de Kagoshima"
 
 #: my-evolution/Locations.h:1056
 msgid "Kahului"
@@ -17794,7 +18038,7 @@ msgstr "Kanoya Ab"
 
 #: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
-msgstr "Kansai International Airport"
+msgstr "Aeropuerto Internacional de Kansai"
 
 #: my-evolution/Locations.h:1067
 msgid "Kansas"
@@ -17930,7 +18174,7 @@ msgstr "Killeen-Gray AAF"
 
 #: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
-msgstr "King Khaled International Airport"
+msgstr "Aeropuerto Internacional de King Khaled"
 
 #: my-evolution/Locations.h:1101
 msgid "Kingman"
@@ -17978,7 +18222,7 @@ msgstr "Kishineu"
 
 #: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
-msgstr "Kitakyushu Airport"
+msgstr "Aeropuerto de Kitakyushu"
 
 #: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
@@ -18018,7 +18262,7 @@ msgstr "Kobenhavn/Roskilde"
 
 #: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
-msgstr "Kochi Airport"
+msgstr "Aeropuerto de Kochi"
 
 #: my-evolution/Locations.h:1123
 msgid "Kodiak"
@@ -18058,11 +18302,11 @@ msgstr "Konya"
 
 #: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
-msgstr "Korea, República Democrática Popular de"
+msgstr "Korea, RepÃºblica DemocrÃ¡tica Popular de"
 
 #: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
-msgstr "República Coreana"
+msgstr "RepÃºblica Coreana"
 
 #: my-evolution/Locations.h:1134
 msgid "Kos"
@@ -18102,7 +18346,7 @@ msgstr "Kryviy Rig/Lozovatka"
 
 #: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
-msgstr "Kumamoto Airport"
+msgstr "Aeropuerto de Kumamoto"
 
 #: my-evolution/Locations.h:1144
 msgid "Kunming"
@@ -18110,7 +18354,7 @@ msgstr "Kunming"
 
 #: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
-msgstr "Kushiro Airport"
+msgstr "Aeropuerto de Kushiro"
 
 #: my-evolution/Locations.h:1147
 msgid "Kyiv/Boryspil"
@@ -18130,7 +18374,7 @@ msgstr "Laconia"
 
 #: my-evolution/Locations.h:1151
 msgid "La Coruna"
-msgstr "La Coruña"
+msgstr "La CoruÃ±a"
 
 #: my-evolution/Locations.h:1152
 msgid "La Crosse"
@@ -18266,7 +18510,7 @@ msgstr "La Romana"
 
 #: my-evolution/Locations.h:1185
 msgid "Las Americas"
-msgstr "Las Américas"
+msgstr "Las AmÃ©ricas"
 
 #: my-evolution/Locations.h:1186
 msgid "Las Tunas"
@@ -18526,7 +18770,7 @@ msgstr "Lorient-Lann-Bihoue"
 
 #: my-evolution/Locations.h:1253
 msgid "Los Alamos"
-msgstr "Los Álamos"
+msgstr "Los Ãlamos"
 
 #: my-evolution/Locations.h:1254
 msgid "Los Angeles"
@@ -18634,7 +18878,7 @@ msgstr "Madinah"
 
 #: my-evolution/Locations.h:1281
 msgid "Madison"
-msgstr "Mádison"
+msgstr "MÃ¡dison"
 
 #: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
@@ -18678,7 +18922,7 @@ msgstr "Malad City"
 
 #: my-evolution/Locations.h:1292
 msgid "Malaga"
-msgstr "Málaga"
+msgstr "MÃ¡laga"
 
 #: my-evolution/Locations.h:1293
 msgid "Malatya"
@@ -18710,7 +18954,7 @@ msgstr "Manao"
 
 #: my-evolution/Locations.h:1301
 msgid "Manchester"
-msgstr "Mánchester"
+msgstr "MÃ¡nchester"
 
 #: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
@@ -18805,6005 +19049,5878 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
-msgstr "Matsumoto Airport"
+msgstr "Aeropuerto de Matsumoto"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
-msgstr "Matsuyama Airport"
+msgstr "Aeropuerto de Matsuyama"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
-msgstr "Memambetsu Airport"
+msgstr "Aeropuerto de Memambetsu"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
-msgstr "Mérida"
+msgstr "MÃ©rida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
-msgstr "Míchigan"
+msgstr "MÃchigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Oriente Medio"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
-msgstr "Milán/Linate"
+msgstr "MilÃ¡n/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
-msgstr "Milán/Malpensa"
+msgstr "MilÃ¡n/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
-msgstr "Mineápolis"
+msgstr "MineÃ¡polis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
-msgstr "Mineápolis [2]"
+msgstr "MineÃ¡polis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
-msgstr "Mineápolis [3]"
+msgstr "MineÃ¡polis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Misisipi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
-msgstr "Miyakejima Airport"
+msgstr "Aeropuerto de Miyakejima"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
-msgstr "Miyazaki Airport"
+msgstr "Aeropuerto de Miyazaki"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
-msgstr "Mobile Regional Airport"
+msgstr "Aeropuerto regional de Mobile"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
-msgstr "Mombetsu Airport"
+msgstr "Aeropuerto de Mombetsu"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
-msgstr "Montagüe"
+msgstr "MontaguÃ©"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
-msgstr "Moscú Domodedovo"
+msgstr "MoscÃº Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
-msgstr "Moscú Sheremetyevo"
+msgstr "MoscÃº Sheremetyevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscaline"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
-msgstr "Nagasaki Airport"
+msgstr "Aeropuerto de Nagasaki"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
-msgstr "Nagoya Airport"
+msgstr "Aeropuerto de Nagoya"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
-msgstr "Naha Airport"
+msgstr "Aeropuerto de Naha"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
-msgstr "Nakashibetsu Airport"
+msgstr "Aeropuerto de Nakashibetsu"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
-msgstr "Nankishirahama Airport"
+msgstr "Aeropuerto de Nankishirahama"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
-msgstr "Nápoles"
+msgstr "NÃ¡poles"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "Nueva Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "Nueva Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
-msgstr "Nuevo México"
+msgstr "Nuevo MÃ©xico"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "Nueva Orleans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "Nueva Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "Nueva Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
-msgstr "New Tokyo International Airport"
+msgstr "Aeropuerto Internacional de New Tokyo"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "Nueva York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
-msgstr "Cataratas del Niágara"
+msgstr "Cataratas del NiÃ¡gara"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
-msgstr "Niigata Airport"
+msgstr "Aeropuerto de Niigata"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "Carolina del Norte"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "Dakota del Norte"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
-msgstr "Nueva Escócia"
+msgstr "Nueva EscÃ³cia"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
-msgstr "Obihiro Airport"
+msgstr "Aeropuerto de Obihiro"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
-msgstr "Oita Airport"
+msgstr "Aeropuerto de Oita"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
-msgstr "Okayama Airport"
+msgstr "Aeropuerto de Okayama"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
-msgstr "Oki Airport"
+msgstr "Aeropuerto de Oki"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Ciudad de Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Ciudad de Oklahoma-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Ciudad de Oklahoma-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Isla Okushiri"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
-msgstr ""
-"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
-"Orange#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
-"Naranja"
+msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
-msgstr "Oregón"
+msgstr "OregÃ³n"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Aeropuerto Internacional de Osaka"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
-msgstr "Oshima Airport"
+msgstr "Aeropuerto de Oshima"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
-msgstr "Ciudad de Panamá"
+msgstr "Ciudad de PanamÃ¡"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
-msgstr "París"
+msgstr "ParÃs"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
-msgstr "París/Charles De Gaulle"
+msgstr "ParÃs/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
-msgstr "París/Le Bourget"
+msgstr "ParÃs/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
-msgstr "París/Orly"
+msgstr "ParÃs/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsilvania"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
-msgstr "República Popular de China"
+msgstr "RepÃºblica Popular de China"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Filadelfia"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ciudad de Ponca"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Puerto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Puerto Alegre Apt"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Puerto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Puerto Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
-msgstr "Pretória"
+msgstr "PretÃ³ria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
-msgstr "Prístina"
+msgstr "PrÃstina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
-msgstr "Puerto Limón"
+msgstr "Puerto LimÃ³n"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
-msgstr "Quántico"
+msgstr "QuÃ¡ntico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Ciudad de Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Isla Rebun"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reinosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Isla de Rodas"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
-msgstr "Rio De Janeiro"
+msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "La Rioja"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Isla de Rishiri"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Rusia"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
-msgstr "Safford-Municipal Airport"
+msgstr "Aeropuerto municipal de Safford"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "Isla de San Nicholas"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
-msgstr "San Sebastián"
+msgstr "San SebastiÃ¡n"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
-msgstr "Santa María"
+msgstr "Santa MarÃa"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
-msgstr "Santa Marta/Simón Bolivar"
+msgstr "Santa Marta/SimÃ³n Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
-msgstr "Santa Mónica"
+msgstr "Santa MÃ³nica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AF"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Aeropuerto de Sendai"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Aeropuerto Internacional de Seoul/Kimp'O"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Lago Snowshoe"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
-msgstr "Sofía"
+msgstr "SofÃa"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "Carolina del Sur"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "Dakota del Sur"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "San Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "San Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "San Luis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
-msgstr "Espíritu de San Luis"
+msgstr "EspÃritu de San Luis"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholmo (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholmo (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Lago Storm"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "San Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "San Petersburgo"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "San Petersburgo / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
-msgstr "Isla San Simón"
+msgstr "Isla San SimÃ³n"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracusa"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Aeropuerto de Takamatsu"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Aeropuerto de Tanegashima"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
-msgstr "Tesalónica"
+msgstr "TesalÃ³nica"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima, isla de"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
-msgstr "Tokyo International Airport"
+msgstr "Aeropuerto internacional de Tokyo"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
-msgstr "Tokyo New International Airport"
+msgstr "Aeropuerto internacional nuevo de Tokyo"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori, aeropuerto de"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
-msgstr "Toyama Airport"
+msgstr "Aeropuerto de Toyama"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Verdad o Consecuencias"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
-msgstr "Tsushima Airport"
+msgstr "Aeropuerto de Tsushima"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
-msgstr "Tucuman"
+msgstr "TucumÃ¡n"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
-msgstr "Turín"
+msgstr "TurÃn"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
-msgstr "Emiratos Árabes Unidos"
+msgstr "Emiratos Ãrabes Unidos"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venecia"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
-msgstr "Virginia Tech Airport"
+msgstr "Aeropuerto tÃ©cnico de  Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
-msgstr "Wadi Al Dawasser Airport"
+msgstr "Aeropuerto de Wadi Al Dawasser"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
-msgstr "Wakkanai Airport"
+msgstr "Aeropuerto de Wakkanai"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallops, isla de"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
-msgstr "West Palm Beach"
+msgstr "Indicolm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
-msgstr "Willow Airport"
+msgstr "Aeropuerto de Willow"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
-msgstr "Wisconsin Rapids"
+msgstr "RÃ¡pidos de Wisconsin"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
-msgstr "Yamagata Airport"
+msgstr "Aeropuerto de Yamagata"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
-msgstr "Yamaguchi Ube Airport"
+msgstr "Aeropuerto de Yamaguchi Ube"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Yao, aeropuerto"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "ES"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:51
-msgid "Folder containing the Evolution Summary"
-msgstr "La carpeta contiene el Resumen de Evolution"
-
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
-msgid "Appointments"
-msgstr "Citas"
-
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
-msgstr "Sin citas"
-
-#: my-evolution/e-summary-calendar.c:418
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:438
-msgid "No description"
-msgstr "Sin descripción"
-
-#: my-evolution/e-summary-mail.c:153
-msgid "Mail summary"
-msgstr "Resumen de correo"
-
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
-msgid "Local Folders"
-msgstr "Carpetas locales"
-
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "LEMD:LEVS:LEVC"
-
-#: my-evolution/e-summary-preferences.c:584
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Palabra del Día"
-
-#: my-evolution/e-summary-preferences.c:602
-msgid "Quotes of the Day"
-msgstr "Frase del Día"
-
-#: my-evolution/e-summary-preferences.c:840
-msgid "Add a news feed"
-msgstr "Añadir una fuente de noticias"
-
-#: my-evolution/e-summary-preferences.c:848
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Escriba la URL de la fuente de noticias que quiere añadir"
-
-#: my-evolution/e-summary-rdf.c:303
-msgid "Error downloading RDF"
-msgstr "Error obteniendo RDF"
-
-#: my-evolution/e-summary-rdf.c:446
-msgid "News Feed"
-msgstr "Fuentes de noticias"
-
-#: my-evolution/e-summary-shown.c:519
-msgid "All"
-msgstr "Todo"
-
-#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
-msgid "Add"
-msgstr "Añadir"
-
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Mostrados"
-
-#: my-evolution/e-summary-tasks.c:328
-msgid "No tasks"
-msgstr "No hay tareas"
-
-#: my-evolution/e-summary-tasks.c:372
-msgid "(No Description)"
-msgstr "(Sin descripción)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Mi Tiempo"
-
-#: my-evolution/e-summary-weather.c:268
-msgid "There was an error downloading data for"
-msgstr "Hubo un error descargando datos para"
-
-#: my-evolution/e-summary-weather.c:489
-msgid "Weather"
-msgstr "Tiempo"
-
-#: my-evolution/e-summary.c:188
-msgid "%A, %B %e %Y"
-msgstr "%A, %e %B %Y"
-
-#: my-evolution/e-summary.c:504
-msgid "Please wait..."
-msgstr "Por favor espere..."
-
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir resumen"
-
-#: my-evolution/e-summary.c:640
-msgid "Printing of Summary failed"
-msgstr "Ha fallado la impresión del resumen"
-
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr " C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "nudos"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kph"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "millas"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
-msgstr "kilómetros"
+msgstr "kilÃ³metros"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Cielo claro"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Nubosidad intermitente"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Nubes dispersas"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Algunas nubes"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Cubierto"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
-msgstr "Inválido"
+msgstr "InvÃ¡lido"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Variable"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Norte"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Norte - Nordeste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Nordeste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Este - Nordeste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Este"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Este - Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Sur - Sureste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Sur"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Sur - Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Oeste - Suroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Oeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Oeste - Noroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Noroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Llovizna"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Llovizna en las proximidades"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Ligera llovizna"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Llovizna moderada"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Fuerte Llovizna"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Llovizna suave"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
-msgstr "Llovizna a ráfagas"
+msgstr "Llovizna a rÃ¡fagas"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Llovizna parcial"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Tormenta"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Llovizna ventosa"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Chaparrones"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Lloviznas racheadas"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
-msgstr "Lloviznas muy frías"
+msgstr "Lloviznas muy frÃas"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Lluvia"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Lluvia en las proximidades"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Lluvia moderada"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Lluvia fuerte"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
-msgstr "Lluvia a ráfagas"
+msgstr "Lluvia a rÃ¡fagas"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Lluvia parcial"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Aguacero"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Chaparrones"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Lluvia racheada"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
-msgstr "Lluvia muy fría"
+msgstr "Lluvia muy frÃa"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Nieve"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Nevadas en las proximidades"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Ligera nevada"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Nevada moderada"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Nevada fuerte"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Nevada suave"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
-msgstr "Ráfagas de nieve"
+msgstr "RÃ¡fagas de nieve"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Nevadas parciales"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Tormenta de nieve"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Ventisca de nieve"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Chubascos de nieve"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Rachas de nieve"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Heladas"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Copos de nieve"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Granizo en los alrededores"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Granizada ligera"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Granizada moderada"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Granizada abundante"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Granizada muy intensa"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Lugares con granizo"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Granizada parcial"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Granizo abundante"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Granizada"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Granizada cambiando"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Granizo con heladas"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Helada"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Heladas en las proximidades"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Algunas placas de hielo"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Helada moderada"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Helada intensa"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Lugares con cristales de hielo"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Helada parcial"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Tormenta de hielo"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Ventisca de hielo"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Tormenta de cristales de hielo"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Cristales de hielo cambiando"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Cristales de hielo congelados"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Bolas de hielo"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Granizo en los alrededores"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Poco granizo"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Granizo moderado"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Granizo abundante"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Granizo muy abundante"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Lugares con granizo"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Granizo parcial"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Tormenta de granizo"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Tormenta de granizo"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Granizo con lluvia"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Granizada cambiando"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Granizada con hielo"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Granizo en las proximidades"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Ligera granizada"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Granizo moderado"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Granizada intensa"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Suave granizada"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
-msgstr "Granizo a ráfagas"
+msgstr "Granizo a rÃ¡fagas"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Granizada parcial"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Tormenta de granizo"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Ventisca de granizo"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Chubasco de granizo"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Rachas de granizo"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Granizada con hielo"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
-msgstr "Granizo pequeño"
+msgstr "Granizo pequeÃ±o"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Granizo en los alrededores"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Granizo moderado"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Granizo abundante"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Granizo muy abundante"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Lugares con granizo"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Granizada parcial"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
-msgstr "Pequeña granizada"
+msgstr "PequeÃ±a granizada"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Granizada muy abundante"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Granizo con lluvia"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Granizada cambiando"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Granizo con hielo"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Precipitaciones indeterminadas"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
-msgstr "Precipitación en los alrededores"
+msgstr "PrecipitaciÃ³n en los alrededores"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
-msgstr "Precipitación ligera"
+msgstr "PrecipitaciÃ³n ligera"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
-msgstr "Precipitación moderada"
+msgstr "PrecipitaciÃ³n moderada"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
-msgstr "Precipitación abundante"
+msgstr "PrecipitaciÃ³n abundante"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
-msgstr "Precipitación torrencial"
+msgstr "PrecipitaciÃ³n torrencial"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
-msgstr "Lugares con precipitación"
+msgstr "Lugares con precipitaciÃ³n"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
-msgstr "Precipitación parcial"
+msgstr "PrecipitaciÃ³n parcial"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Tormenta desconocida"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
-msgstr "Precipitación torrencial"
+msgstr "PrecipitaciÃ³n torrencial"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Lluvia, de tipo desconocido"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
-msgstr "Precipitación cambiando"
+msgstr "PrecipitaciÃ³n cambiando"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
-msgstr "Precipitación con hielo"
+msgstr "PrecipitaciÃ³n con hielo"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Niebla"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Neblina en los alrededores"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Neblina ligera"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Neblina moderada"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Neblina gruesa"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Cortina de neblina"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Lugares con neblina"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Neblina parcial"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Neblina con viento"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Neblina cambiando"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Neblina con hielo"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "neblina"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Niebla en los alrededores"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Niebla ligera"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Niebla moderada"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Niebla gruesa"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Niebla muy gruesa"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Lugares con niebla"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Niebla parcial"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Niebla con viento"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Niebla cambiando"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Niebla con hielo"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Humo"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Humo en los alrededores"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Humo ligero"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Humo moderado"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Humo grueso"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Cortina de humo"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Lugares con humo"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Humo parcial"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Niebla con truenos"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Humo con viento"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Humo cambiando"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
-msgstr "Ceniza volcánica"
+msgstr "Ceniza volcÃ¡nica"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
-msgstr "Cenizas volcánicas en los alrededores"
+msgstr "Cenizas volcÃ¡nicas en los alrededores"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
-msgstr "Cenizas volcánicas moderadas"
+msgstr "Cenizas volcÃ¡nicas moderadas"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
-msgstr "Cenizas volcánicas gruesas"
+msgstr "Cenizas volcÃ¡nicas gruesas"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
-msgstr "Cortina de cenizas volcánicas"
+msgstr "Cortina de cenizas volcÃ¡nicas"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
-msgstr "Lugares con cenizas volcánicas"
+msgstr "Lugares con cenizas volcÃ¡nicas"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
-msgstr "Cenizas volcánicas parciales"
+msgstr "Cenizas volcÃ¡nicas parciales"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
-msgstr "Cenizas volcánicas con truenos"
+msgstr "Cenizas volcÃ¡nicas con truenos"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
-msgstr "Cenizas volcánicas abundantes"
+msgstr "Cenizas volcÃ¡nicas abundantes"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
-msgstr "Lluvia de cenizas volcánicas"
+msgstr "Lluvia de cenizas volcÃ¡nicas"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
-msgstr "Cambiando cenizas volcánicas"
+msgstr "Cambiando cenizas volcÃ¡nicas"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
-msgstr "Cenizas volcánicas con hielo"
+msgstr "Cenizas volcÃ¡nicas con hielo"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Arena"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Arena en los alrededores"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Arena ligera"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Arena moderada"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Arena abundante"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Lugares con arena"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Arena parcial"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Arena muy abundante"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Arena cambiando"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Bruma"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Bruma en los alrededores"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Bruma ligera"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Bruma moderada"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Bruma gruesa"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Cortina de bruma"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Lugares con bruma"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Bruma parcial"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Bruma con vientos"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Cambiando la bruma"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Bruma con hielo"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
-msgstr "Rocío"
+msgstr "RocÃo"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
-msgstr "Rocío en los alrededores"
+msgstr "RocÃo en los alrededores"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
-msgstr "Rocío ligero"
+msgstr "RocÃo ligero"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
-msgstr "Rocío moderado"
+msgstr "RocÃo moderado"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
-msgstr "Rocío abundante"
+msgstr "RocÃo abundante"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
-msgstr "Rocío muy abundante"
+msgstr "RocÃo muy abundante"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
-msgstr "Lugares con rocío"
+msgstr "Lugares con rocÃo"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
-msgstr "Rocío parcial"
+msgstr "RocÃo parcial"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
-msgstr "Cortina de rocío"
+msgstr "Cortina de rocÃo"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
-msgstr "Rocío cambiando"
+msgstr "RocÃo cambiando"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
-msgstr "Rocío con hielo"
+msgstr "RocÃo con hielo"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Polvo"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Polvo en los alrededores"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Polvo ligero"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Polvo moderado"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Polvo abundante"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Lugares con polvo"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Polvo parcial"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Cortina de polvo"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Cambiando el polvo"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Borrasca"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Chubasco en los alrededores"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Chubascos ligeros"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Chubascos moderados"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Chubascos abundantes"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Chubascos parciales"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Chubascos con truenos"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Chubascos muy abundantes"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Cambiando chubascos"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Chubascos con heladas"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Tormenta de arena"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Tormenta de arena en los alrededores"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Tormenta de arena ligera"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Tormenta de arena moderada"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Tormenta de arena abundante"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Tormenta de arena muy abundante"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Tormenta de arena parcial"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Tormenta de arena con truenos"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Tormenta de arena muy intensa"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Cambiando la tormenta de arena"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Tormenta de arena helada"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Tormenta de polvo"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Tormenta de polvo en los alrededores"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Tormenta de polvo ligera"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Tormenta de polvo moderada"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Tormenta de polvo abundante"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Tormenta de polvo muy abundante"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Tormenta de polvo parcial"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Tormenta de polvo con truenos"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Tormenta de polvo muy intensa"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Tormenta de polvo cambiando"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Tormenta de polvo helada"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Nublado"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Nublado en los alrededores"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Nublado ligero"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Nublado moderado"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Nublado abundante"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Nublado muy abundante"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Lugares con nublado"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Nublado parcial"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Nublado con vientos"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Nublado cambiando"
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Tornado en los alrededores"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Tornado moderado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Tornado violento"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Tornado parcial"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Tornado con truenos"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Cambiando el tornado"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Tornado helado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Remolinos de polvo"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Remolino de polvo en los alrededores"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Remolino de polvo ligero"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Remolino de polvo moderado"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Remolino de polvo abundante"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Remolino de polvo intenso"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Lugares con remolino de polvo"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Remolinos de polvo parciales"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Remolinos de polvo muy intensos"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Remolinos de polvo cambiando"
 
 #: my-evolution/my-evolution.glade.h:1
 msgid "Add n_ews feed"
-msgstr "Añadir fuente de _noticias"
+msgstr "AÃ±adir fuente de _noticias"
 
 #: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
@@ -24815,15 +24932,15 @@ msgstr "Borrar fuente de _noticias"
 
 #: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
-msgstr "¿Cuantos mensajes debe mostrar de una vez el agenda?"
+msgstr "Â¿Cuantos mensajes debe mostrar de una vez el calendario?"
 
 #: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
-msgstr "Número má_ximo de elementos mostrados:"
+msgstr "NÃºmero mÃ¡_ximo de elementos mostrados:"
 
 #: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
-msgstr "Configuración de las fuentes de noticias"
+msgstr "ConfiguraciÃ³n de las fuentes de noticias"
 
 #: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
@@ -24835,11 +24952,11 @@ msgstr "Una s_emana"
 
 #: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
-msgstr "Ti_empo de actualización (segundos):"
+msgstr "Ti_empo de actualizaciÃ³n (segundos):"
 
 #: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
-msgstr "_Tiempo de actualización (segundos):"
+msgstr "_Tiempo de actualizaciÃ³n (segundos):"
 
 #: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
@@ -24863,7 +24980,7 @@ msgstr "Tareas "
 
 #: my-evolution/my-evolution.glade.h:17
 msgid "Weather Settings"
-msgstr "Configuración de Meteorología"
+msgstr "ConfiguraciÃ³n de MeteorologÃa"
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -24871,7 +24988,7 @@ msgstr "_Fahrenheit"
 
 #: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
-msgstr "_Cinco días"
+msgstr "_Cinco dÃas"
 
 #: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
@@ -24883,7 +25000,7 @@ msgstr "Fuentes de _noticias"
 
 #: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
-msgstr "_Un día"
+msgstr "_Un dÃa"
 
 #: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
@@ -24891,113 +25008,94 @@ msgstr "_Horario"
 
 #: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
-msgstr "_Tiempo"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-"Control de configuración para la configuración de carpetas de Evolution"
+msgstr "_MeteorologÃa"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Configurar carpetas especiales y el comportamiento de las carpetas fuera de "
-"línea aquí"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
-msgid "Folder Settings"
-msgstr "Configuración de Carpetas"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "La shell de Evolution."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
-msgstr "Cancelar operación"
+msgstr "Cancelar operaciÃ³n"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr ""
-"No puedo transferir la carpeta:\n"
+"No se puede transferir la carpeta:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
 #, c-format
 msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" en %s..."
+msgstr "Â«%sÂ» en Â«%sÂ»..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
-msgstr "Añadir una carpeta"
+msgstr "AÃ±adir una carpeta"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Borradores"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1082
 msgid "Inbox"
 msgstr "Entrada"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Salida"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Enviado"
 
-#: shell/e-setup.c:126
+#: shell/e-setup.c:129
 msgid "Evolution installation"
-msgstr "Instalación de Evolution"
+msgstr "InstalaciÃ³n de Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:133
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
-"Esta nueva versión de Evolution necesita instalar archivos "
-"adicionales\nen su carpeta personal de Evolution"
+"Esta nueva versiÃ³n de Evolution necesita instalar archivos adicionales\n"
+"en su carpeta personal de Evolution"
 
-#: shell/e-setup.c:131
+#: shell/e-setup.c:134
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Por favor, pulse en «Aceptar» para instalar los archivos, o «Cancelar» para "
-"salir."
+"Por favor, pulse en Â«AceptarÂ» para instalar los archivos, o Â«CancelarÂ» "
+"para salir."
 
-#: shell/e-setup.c:171
+#: shell/e-setup.c:174
 msgid "Could not update files correctly"
-msgstr "No pude actualizar correctamente los archivos"
+msgstr "No se han podido actualizar correctamente los archivos"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:197
 #, c-format
 msgid ""
 "Cannot create the directory\n"
 "%s\n"
 "Error: %s"
 msgstr ""
-"No puedo crear el directorio\n"
+"No se puede crear el directorio\n"
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:212
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
-"`%s'."
+"Â«%sÂ»."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:285
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -25008,7 +25106,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:303
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -25017,9 +25115,9 @@ msgid ""
 msgstr ""
 "El directorio %s\n"
 "no tiene los permisos adecuados. Por favor\n"
-"hágalo legible y ejecutable, y reinicie Evolution."
+"hÃ¡galo legible y ejecutable, y reinicie Evolution."
 
-#: shell/e-setup.c:306
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "File %s\n"
@@ -25030,18 +25128,18 @@ msgstr ""
 "debe ser eliminador para que Evolution funcione correctamente.\n"
 "Por favor elimine ese archivo y reinicie Evolution."
 
-#: shell/e-setup.c:329
+#: shell/e-setup.c:332
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
 "Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
-"El archivo `%s' no es un directorio.\n"
-"Por favor, renombre lo para permitir la instalación\n"
+"El archivo Â«%sÂ» no es un directorio.\n"
+"Por favor, renombre lo para permitir la instalaciÃ³n\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:346
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -25053,84 +25151,127 @@ msgstr ""
 "directorio de Resumen de Trabajo.\n"
 "Debe ser borrado antes de ejecutar\n"
 "Evolution.\n"
-"¿Quiere que borre ese directorio?"
+"Â¿Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:368
+#: shell/e-setup.c:371
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
 "Evolution directory.  Please move it in order\n"
 "to allow installation of the Evolution user files."
 msgstr ""
-"El directorio `%s' existe pero no es el directorio\n"
+"El directorio Â«%sÂ» existe pero no es el directorio\n"
 "de Evolution. Por favor, renombre lo para permitir la\n"
-"instalación de los archivos de usuario de Evolution."
+"instalaciÃ³n de los archivos de usuario de Evolution."
 
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Producido por"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell.c:174
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"No se pudo activar el componente %s :\n"
+"El error del sistema de activaciÃ³n es:\n"
+"%s"
+
+#: shell/e-shell.c:754
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No se puede configurar una carpeta local -- %s"
+
+#: shell/e-shell.c:1821
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"El componente de Evolution que se ocupa de las carpetas de tipo\n"
+"Â«%sÂ» ha fallado inesperadamente. DeberÃ¡ salir de Evolution y volver\n"
+"a entrar para poder acceder otra vez a esa informaciÃ³n."
+
+#: shell/e-shell.c:2086
+msgid "Invalid arguments"
+msgstr "Argumentos invÃ¡lidos"
+
+#: shell/e-shell.c:2088
+msgid "Cannot register on OAF"
+msgstr "No se puede registrarme en OAF"
+
+#: shell/e-shell.c:2090
+msgid "Configuration Database not found"
+msgstr "No se encontrÃ³ la base de datos de configuraciÃ³n"
+
+#: shell/e-shell.c:2092 shell/e-storage.c:576
+msgid "Generic error"
+msgstr "Error genÃ©rico"
+
+#: shell/e-shell-config-autocompletion.c:112
 msgid "Extra Completion folders"
-msgstr "Carpetas Extra para Completar Direcciones"
+msgstr "Carpetas Adicionales para Completar Direcciones"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 msgid "Select Default Folder"
 msgstr "Seleccionar Carpeta Predeterminada"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 msgid "Default Folders"
 msgstr "Carpetas Predefinidas"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 msgid "Offline Folders"
-msgstr "Carpetas sin de conexión"
+msgstr "Carpetas sin conexiÃ³n"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "Autocompletar carpetas"
 
-#: shell/e-shell-folder-commands.c:140
+#: shell/e-shell-folder-commands.c:141
 #, c-format
 msgid "Cannot copy folder: %s"
-msgstr "No pude copiar la carpeta: %s"
+msgstr "No se puede copiar la carpeta: %s"
 
 #: shell/e-shell-folder-commands.c:143
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "No se puede mover la carpeta: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:189
 msgid "Cannot move a folder over itself."
-msgstr "No se puede mover una carpeta sobre sí misma."
+msgstr "No se puede mover una carpeta sobre sÃ misma."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:191
 msgid "Cannot copy a folder over itself."
-msgstr "No se puede copiar una carpeta sobre sí misma."
+msgstr "No se puede copiar una carpeta sobre sÃ misma."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:205
 msgid "Cannot move a folder into one of its descendants."
 msgstr "No se puede mover una carpeta dentro de uno de sus descendientes."
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:320
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Especificar una carpeta en la que copiar la carpeta «%s»:"
+msgstr "Especificar una carpeta en la que copiar la carpeta Â«%sÂ»:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:324
 msgid "Copy folder"
 msgstr "Copiar carpeta"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:364
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Especificar una carpeta a la que mover la carpeta «%s»:"
+msgstr "Especificar una carpeta a la que mover la carpeta Â«%sÂ»:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:368
 msgid "Move folder"
 msgstr "Mover carpeta"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:392
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25139,17 +25280,17 @@ msgstr ""
 "No se puede borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:402
 #, c-format
 msgid "Delete \"%s\""
-msgstr "Borrar «%s»"
+msgstr "Borrar Â«%sÂ»"
 
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:403
 #, c-format
 msgid "Really delete folder \"%s\"?"
-msgstr "¿Seguro que quiere borrar \"%s\"?"
+msgstr "Â¿Seguro que quiere borrar Â«%sÂ»?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:483
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25158,26 +25299,26 @@ msgstr ""
 "No se puede renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:532
 #, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "Renombrar carpeta «%s» a:"
+msgstr "Renombrar carpeta Â«%sÂ» a:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:538
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nombre de carpeta especificado no es valido: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:581
 msgid "Selected folder does not belong to another user"
-msgstr "La carpeta selecionada no pertenece a otro usuario"
+msgstr "La carpeta seleccionada no pertenece a otro usuario"
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:584
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25186,32 +25327,28 @@ msgstr ""
 "No se pudo borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"No puedo crear la carpeta especificada:\n"
+"No se puede crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:292
 msgid "Create New Folder"
-msgstr "Crear Carpeta _Nueva"
+msgstr "Crear Carpeta Nueva"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Nuevo..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:653 shell/e-shell-folder-title-bar.c:654
 msgid "(Untitled)"
-msgstr "(Sin título)"
+msgstr "(Sin tÃtulo)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25222,13 +25359,14 @@ msgstr ""
 "Elija el archivo que quiere importar a Evolution, y seleccione de la lista el "
 "tipo de archivo que es.\n"
 "\n"
-"Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
+"Si no lo sabe, puede elegir Â«AutomÃ¡ticoÂ» y Evolution tratarÃ¡ de "
+"encargarse."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:816
 msgid "Please select the information that you would like to import:"
-msgstr "Por favor seleccione la información que quieras importar:"
+msgstr "Por favor seleccione la informaciÃ³n que quieras importar:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25237,21 +25375,21 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:352
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:491 shell/e-shell-importer.c:508
+#: shell/e-shell-importer.c:554
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25260,7 +25398,7 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse "
 "de\n%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:516
 msgid "Importing"
 msgstr "Importando"
 
@@ -25273,17 +25411,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:553
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:570
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25292,31 +25430,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:624
 msgid "Automatic"
-msgstr "Automático"
+msgstr "AutomÃ¡tico"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:673
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:678
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:687
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:712
 msgid "Import data and settings from older programs"
-msgstr "Importa datos y configuración de programas antiguos"
+msgstr "Importa datos y configuraciÃ³n de programas antiguos"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:716
 msgid "Import a single file"
-msgstr "Importar un único archivo"
+msgstr "Importar un Ãºnico archivo"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:782 shell/e-shell-startup-wizard.c:642
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25324,558 +25462,513 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:645
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:909 shell/e-shell-startup-wizard.c:770
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1079
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1080
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:588
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:160
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr ""
-"Error mientras se sincrinizaba `%s':\n"
+"Error mientras se sincronizaba Â«%sÂ»:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:238
 msgid "Syncing Folder"
 msgstr "Sincronizando carpeta"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:315
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando \"%s\" (%d de %d)..."
+msgstr "Sincronizando Â«%sÂ» (%d de %d)..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Preferencias de Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#: shell/e-shell-shared-folder-picker-dialog.c:352
 msgid "Opening Folder"
 msgstr "Abriendo carpeta"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:359
 #, c-format
 msgid "Opening Folder \"%s\""
-msgstr "Abriendo carpeta %s"
+msgstr "Abriendo carpeta Â«%sÂ»"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, c-format
 msgid "in \"%s\" ..."
-msgstr "en %s ..."
+msgstr "en Â«%sÂ» ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:444
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "No se pudo abrir la carpeta compartida:: %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:497
 msgid "Cannot find the specified shared folder."
 msgstr "No se pudo encontrar la carpeta compartida especificada"
 
-#: shell/e-shell-startup-wizard.c:159
+#: shell/e-shell-startup-wizard.c:156
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
 "(%s)"
 msgstr ""
-"No pude iniciar la interfaz del  Asistente de Correo de Evolution\n"
+"No se ha podido iniciar la interfaz del Asistente de Correo de Evolution\n"
 "(%s)"
 
-#: shell/e-shell-startup-wizard.c:169
+#: shell/e-shell-startup-wizard.c:167
 msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "No pude iniciar la interfaz del Asistente de Correo de Evolution\n"
+msgstr "No se ha podido iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:105
 msgid "New"
 msgstr "Nuevo"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "No ha especificado un nombre de carpeta."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr ""
-"El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr "El nombre de la carpeta no puede contener el carÃ¡cter de retorno de carro."
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain slashes."
 msgstr "El nombre de la carpeta no puede contener barras (/)."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
 msgid "'.' and '..' are reserved folder names."
-msgstr "'.' y '..' son nombres reservados de carpetas."
+msgstr "Â«.Â» y Â«..Â» son nombres reservados de carpetas."
 
-#: shell/e-shell-view-menu.c:94
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: shell/e-shell-view.c:235
+msgid "(No folder displayed)"
+msgstr "(No hay carpetas mostrÃ¡ndose)"
+
+#: shell/e-shell-view.c:1996
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:1998
+msgid "(None)"
+msgstr "(nada)"
+
+#: shell/e-shell-view.c:2041
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution estÃ¡ conectado.  Pulse este botÃ³n para trabajar "
+"desconectado."
+
+#: shell/e-shell-view.c:2048
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution estÃ¡ en proceso de desconectarse."
+
+#: shell/e-shell-view.c:2054
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+"Ximian Evolution estÃ¡ desconectado.  Pulse este botÃ³n para trabajar "
+"conectado."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:91
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+
+#: shell/e-shell-view-menu.c:99
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:193
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr "Crear Atajo"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:776
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:226
-msgid "(No folder displayed)"
-msgstr "(No hay carpetas mostrándose)"
-
-#: shell/e-shell-view.c:1861
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:1863
-msgid "(None)"
-msgstr "(nada)"
-
-#: shell/e-shell-view.c:1910
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution está conectado.  Pulse este botón para trabajar "
-"desconectado."
-
-#: shell/e-shell-view.c:1917
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution está en proceso de desconectarse."
-
-#: shell/e-shell-view.c:1923
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
-"conectado."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"No se pudo activar el componente %s :\n"
-"El error del sistema de activación es:\n"
-"%s"
-
-#: shell/e-shell.c:739
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No puedo configurar una carpeta local -- %s"
-
-#: shell/e-shell.c:1877
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"El componente de Evolution que se ocupa de las carpetas de tipo\n"
-"«%s» ha fallado inesperadamente. Deberá salir de Evolution y volver\n"
-"a entrar para poder acceder otra vez a esa información."
-
-#: shell/e-shell.c:2178
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:2180
-msgid "Cannot register on OAF"
-msgstr "No puedo registrarme en OAF"
-
-#: shell/e-shell.c:2182
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
+#: shell/e-shortcuts.c:647
+msgid "Error saving shortcuts."
+msgstr "Error guardando atajos."
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
-msgid "Generic error"
-msgstr "Error genérico"
+#: shell/e-shortcuts.c:1094
+msgid "Shortcuts"
+msgstr "Atajos"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:79
 msgid "Create new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:80
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:174
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
-"¿Realmente quiere quitar el grupo\n"
-"`%s' del menú de atajos?"
+"Â¿Realmente quiere quitar el grupo\n"
+"Â«%sÂ» del menÃº de atajos?"
 
-#: shell/e-shortcuts-view.c:178
+#: shell/e-shortcuts-view.c:179
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:242
 msgid "_Small Icons"
-msgstr "Icono_s pequeños"
+msgstr "Icono_s pequeÃ±os"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:243
 msgid "Show the shortcuts as small icons"
-msgstr "Mostrar los atajos como iconos pequeños"
+msgstr "Mostrar los atajos como iconos pequeÃ±os"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:245
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:246
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:257
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:258
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:260
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:261
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:263
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:264
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:269
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:270
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:275
 msgid "Create _Default Shortcuts"
 msgstr "Crear Atajos Predeterminados"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:276
 msgid "Create Default Shortcuts"
 msgstr "Crear atajos Predeterminados"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:395
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:396
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:409
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:411 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:411
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-icon-view.c:328
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:414
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:414
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:416
 msgid "Re_move"
 msgstr "Bo_rrar"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:416
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:641
-msgid "Error saving shortcuts."
-msgstr "Error guardando atajos."
-
-#: shell/e-shortcuts.c:1080
-msgid "Shortcuts"
-msgstr "Atajos"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Activar"
-
-#: shell/e-storage.c:569
+#: shell/e-storage.c:574
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:578
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:580
 msgid "The specified folder type is not valid"
-msgstr "Es tipo de archivo especificado no es válido"
+msgstr "Es tipo de archivo especificado no es vÃ¡lido"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:582
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:584
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:586
 msgid "The folder is not empty"
-msgstr "Esta carpeta no está vacía"
+msgstr "Esta carpeta no estÃ¡ vacÃa"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:588
 msgid "The specified folder was not found"
-msgstr "No se encontró la carpeta especificada"
+msgstr "No se encontrÃ³ la carpeta especificada"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:590
 msgid "Function not implemented in this storage"
-msgstr "Función sin implementar en este manejador"
+msgstr "FunciÃ³n sin implementar en este manejador"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:594
 msgid "Operation not supported"
-msgstr "Operación no implementada"
+msgstr "OperaciÃ³n no implementada"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:596
 msgid "The specified type is not supported in this storage"
-msgstr "El tipo especificado no está implementado por este manejador"
+msgstr "El tipo especificado no estÃ¡ implementado por este manejador"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:598
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:600
 msgid "Cannot make a folder a child of one of its descendants"
-msgstr "No puedo mover una carpeta dentro de uno de sus descendientes"
+msgstr "No se puede mover una carpeta dentro de uno de sus descendientes"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:602
 msgid "Cannot create a folder with that name"
-msgstr "No puedo crear una carpeta con ese nombre"
+msgstr "No se puede crear una carpeta con ese nombre"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:604
 msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operación no puede efectuarse en modo desconectado"
+msgstr "Esta operaciÃ³n no puede efectuarse en modo desconectado"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Activar"
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:101
 msgid "<click here to select a folder>"
-msgstr "<pinche aquí para seleccionar una carpeta>"
-
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Error desconocido."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"El error del sistema de componentes es:\n"
-"%s"
+msgstr "<pinche aquÃ para seleccionar una carpeta>"
 
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"El error del sistema de activación es:\n"
-"%s"
-
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1157
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1159
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1161
 msgid "Invalid argument"
-msgstr "Argumento inválido"
+msgstr "Argumento invÃ¡lido"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1163
 msgid "Already has an owner"
-msgstr "Ya tiene un dueño"
+msgstr "Ya tiene un dueÃ±o"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1165
 msgid "No owner"
-msgstr "Sin dueño"
+msgstr "Sin dueÃ±o"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1167
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1169
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1171
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1173
 msgid "Unsupported operation"
-msgstr "Operación no soportada"
+msgstr "OperaciÃ³n no soportada"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1175
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1179
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1181
 msgid "Invalid URI"
-msgstr "URI no válida"
+msgstr "URI no vÃ¡lida"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1185
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1187
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1189
 msgid "Old owner has died"
-msgstr "El antiguo dueño a muerto"
+msgstr "El antiguo dueÃ±o a muerto"
+
+#: shell/evolution-shell-component-utils.c:123
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Error desconocido."
+
+#: shell/evolution-shell-component-utils.c:126
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de componentes es:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:133
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de activaciÃ³n es:\n"
+"%s"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:62
 msgid "Test type"
 msgstr "Tipo de pruebas"
 
+#: shell/evolution-test-component.c:702
+msgid "Evolution Test Component"
+msgstr "Componente de Prueba de Evolution"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
 msgstr "Conexiones activas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
-msgstr "Pulse OK para cerrar estas conexiones y estar fuera de linea"
+msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
-msgstr "Servidor"
+msgstr "AnfitriÃ³n"
 
 #: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
-msgstr "Las siguientes conexiones están actualmente activas:"
+msgstr "Las siguientes conexiones estÃ¡n actualmente activas:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
@@ -25891,17 +25984,17 @@ msgstr "_Correo:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:4
 msgid "_Tasks:"
-msgstr "Tareas"
+msgstr "_Tareas"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Tipo de carpeta:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
@@ -25923,7 +26016,7 @@ msgstr "_Usuario:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
-msgstr "Asistente de configuración de Evolution"
+msgstr "Asistente de configuraciÃ³n de Evolution"
 
 #: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Importing Files"
@@ -25945,11 +26038,11 @@ msgid ""
 "\n"
 "Please click the \"Next\" button to continue. "
 msgstr ""
-"Bienvenido a Evolution. Las siguientes pantallas permitirán a\n"
-"Evolution conectarse a sus cuentas de correo, e importar ficheros de\n"
+"Bienvenido a Evolution. Las siguientes pantallas permitirÃ¡n a\n"
+"Evolution conectarse a sus cuentas de correo, e importar archivos de\n"
 "otras aplicaciones. \n"
 "\n"
-"Por favor pulse el botón «Siguiente» para continuar. "
+"Por favor pulse el botÃ³n Â«SiguienteÂ» para continuar. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:15
 msgid ""
@@ -25958,18 +26051,40 @@ msgid ""
 "\n"
 "Click the \"Finish\" button to save your settings. "
 msgstr ""
-"Ha introducido toda la información necesaria para\n"
+"Ha introducido toda la informaciÃ³n necesaria para\n"
 "configurar Evolution. \n"
 "\n"
-"Pulse el botón «Finalizar» para guardar su configuración. "
+"Pulse el botÃ³n Â«FinalizarÂ» para guardar su configuraciÃ³n. "
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr "Control de configuraciÃ³n para la configuraciÃ³n de carpetas de Evolution"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
+"lÃnea aquÃ"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Folder Settings"
+msgstr "ConfiguraciÃ³n de Carpetas"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "The Evolution shell."
+msgstr "La shell de Evolution."
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Pulse «Importar» para comenzar a importar el archivo en Evolution. "
+msgstr "Pulse Â«ImportarÂ» para comenzar a importar el archivo en Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
-msgstr "Asistente de importación de Evolution"
+msgstr "Asistente de importaciÃ³n de Evolution"
 
 #: shell/importer/import.glade.h:3
 msgid "Import File (step 3 of 3)"
@@ -25981,7 +26096,7 @@ msgstr "Tipo de importador (Paso 1 de 3)"
 
 #: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
-msgstr "Seleccione imortador (paso 2 de 3)"
+msgstr "Seleccione importador (paso 2 de 3)"
 
 #: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
@@ -25993,76 +26108,116 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Bienvenido al asistente de importación de Evolution.\n"
-"Con este asistente será guiado a través del proceso de\n"
+"Bienvenido al asistente de importaciÃ³n de Evolution.\n"
+"Con este asistente serÃ¡ guiado a travÃ©s del proceso de\n"
 "importar archivos externos a Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "No importar"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
-msgstr "No me preguntes más veces"
+msgstr "No me preguntes mÃ¡s veces"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
-#: shell/main.c:96
+#: shell/main.c:104 shell/main.c:466
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:110
 msgid "Evolution is now exiting ..."
-msgstr "Evolution está terminando ..."
+msgstr "Evolution estÃ¡ terminando ..."
 
-#: shell/main.c:277
+#: shell/main.c:209
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.8)\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Hola, Gracias por tomarse el tiempo para descargar esta versiÃ³n preliminar de\n"
+"la suite Ximian Evolution.\n"
+"\n"
+"Esta versiÃ³n de Ximian Evolution no esta completa aÃºn. Se esta acercando, pero \n"
+"algunas prestaciones estÃ¡n incompletas o no funcionan adecuadamente.\n"
+"\n"
+"Si necesita una versiÃ³n estable de Evolution, lo invitamos a desinstalar esta versiÃ³n\n"
+"y instalar una versiÃ³n 1.0.x en su lugar (1.0.8)\n"
+"\n"
+"Si encuentra errores por favor reportelos en bugzilla.ximian.com.\n"
+"Este producto se otorga sin ninguna garantÃa y no esta destinado a personas \n"
+"individuales con ganas de hacer justicia por mano propia.\n"
+"\n"
+"Esperamos que disfrute los resultados de nuestro duro trabajo, y Â¡esperamos "
+"desesperadamente sus contribuciones!\n"
+
+#: shell/main.c:230
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "El Equipo de Ximian Evolution\n"
+
+#: shell/main.c:238
+msgid "Don't tell me again"
+msgstr "No me preguntes mÃ¡s veces"
+
+#: shell/main.c:357
 msgid "Cannot access the Ximian Evolution shell."
-msgstr "No puedo acceder a la shell de Ximian Evolution."
+msgstr "No se puede acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:286
+#: shell/main.c:366
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
+msgstr "No se puede inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:368
+#: shell/main.c:446
 msgid "Disable splash screen"
-msgstr "Deshabilitar pantalla de entrada"
+msgstr "Deshabilita la pantalla de entrada"
 
-#: shell/main.c:370
+#: shell/main.c:448
 msgid "Start in offline mode"
-msgstr "Empezar en modo desconectado"
+msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:372
+#: shell/main.c:450
 msgid "Start in online mode"
-msgstr "Comentar en modo conectado"
+msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:374
+#: shell/main.c:452
 msgid "Send the debugging output of all components to a file."
-msgstr "Enviar la salida de depurado de todos los componente a un archivo."
+msgstr "EnvÃa la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:376
+#: shell/main.c:454
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
-msgstr ""
-"Forzar la actualización de los ficheros de configuración de Evolution 1.0.x"
+msgstr "Fuerza la actualizaciÃ³n de los archivos de configuraciÃ³n de Evolution 1.0.x"
 
-#: shell/main.c:394
+#: shell/main.c:470
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
-"  use %s --help para más información\n"
-
-#: shell/main.c:425
-msgid "Cannot initialize the Bonobo component system."
-msgstr "No puedo inicializar el sistema de componentes Bonobo."
+"  use %s --help para mÃ¡s informaciÃ³n\n"
 
 #: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
@@ -26085,23 +26240,23 @@ msgstr "No ha especificado un nombre de archivo."
 
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
-msgstr "Copiar Contact(os) a Otra Carpeta..."
+msgstr "Copia Contact(os) a Otra Carpeta..."
 
 #: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "Copiar la selección"
+msgstr "Copia la selecciÃ³n"
 
 #: ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
-msgstr "Copiar a la carpeta..."
+msgstr "Copia a la carpeta..."
 
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "Cortar la selección"
+msgstr "Corta la selecciÃ³n"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr "Borrar los contactos seleccionados"
+msgstr "Borra los contactos seleccionados"
 
 #: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
@@ -26113,28 +26268,26 @@ msgstr "_Mover a la carpeta..."
 
 #: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
-msgstr "Pegar el contenido del porta papeles"
+msgstr "Pega el contenido del porta papeles"
 
 #: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
-msgstr "Vista previa de los contactos a imprimir"
+msgstr "Previsualiza los contactos a imprimir"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
-msgstr "Vista pre_via"
+msgstr "Previsualizar la impresiÃ³n"
 
 #: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
-msgstr "Imprimir los contactos seleccionados"
+msgstr "Imprime los contactos seleccionados"
 
 #: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
-msgstr "Guardar los contactos seleccionados en una VCard."
+msgstr "Guarda los contactos seleccionados en una VCard."
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
 #: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar todo"
@@ -26145,21 +26298,16 @@ msgstr "Seleccionar todos los contactos"
 
 #: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
-msgstr "Enviar un mensaje a los contactos seleccionados"
+msgstr "EnvÃa un mensaje a los contactos seleccionados"
 
-#
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
-msgstr "Enviar un mensaje al contacto"
+msgstr "EnvÃa un mensaje al contacto"
 
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
-msgstr "Enviar los contactos seleccionados a otra persona."
+msgstr "EnvÃa los contactos seleccionados a otra persona."
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:1158
-# src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
-# src/nautilus-window-toolbars.c:156
 #: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Parar"
@@ -26176,8 +26324,8 @@ msgstr "Ver el contacto actual"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:93 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "A_cciones"
@@ -26202,14 +26350,13 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensaje al contacto..."
 
 #: ui/evolution-calendar.xml.h:4
 msgid "Day"
-msgstr "Día"
+msgstr "DÃa"
 
 #: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
@@ -26233,7 +26380,7 @@ msgstr "Ir a una _fecha"
 
 #: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
-msgstr "Ir a una fecha específica"
+msgstr "Ir a una fecha especÃfica"
 
 #: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
@@ -26245,19 +26392,19 @@ msgstr "Mes"
 
 #: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
-msgstr "Vista previa del agenda a imprimir"
+msgstr "Previsualiza el calendario a imprimir"
 
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
-msgstr "Imprimir este agenda"
+msgstr "Imprime este calendario"
 
 #: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
-msgstr "Publicar información de disponibilidad para este agenda"
+msgstr "Publica informaciÃ³n de disponibilidad para este agenda"
 
 #: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
-msgstr "Mostrar un día"
+msgstr "Mostrar un dÃa"
 
 #: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
@@ -26269,7 +26416,7 @@ msgstr "Mostrar una semana"
 
 #: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
-msgstr "Mostrar un semana laboral"
+msgstr "Mostrar la semana laboral"
 
 #: ui/evolution-calendar.xml.h:23
 msgid "Week"
@@ -26290,14 +26437,14 @@ msgstr "Barra de herramientas principal"
 
 #: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
-msgstr "Ver el elemento que va a ser impreso"
+msgstr "Previsualizar el elemento que va a ser impreso"
 
 #: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
-msgstr "Imprimir este elemento"
+msgstr "Imprime este elemento"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
 msgid "Save"
 msgstr "Guardar"
 
@@ -26313,14 +26460,12 @@ msgstr "Guardar y cerrar"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
-msgstr "Guardar el elemento y cerrar la ventana de diálogo"
+msgstr "Guarda el elemento y cierra la ventana de diÃ¡logo"
 
 #: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
-msgstr "Guardar este elemento a disco"
+msgstr "Guarda este elemento a disco"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:198
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
@@ -26332,7 +26477,7 @@ msgstr "_Archivo"
 
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
-msgstr "Imprimir ca_becera..."
+msgstr "Imprimir So_bre..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
@@ -26342,12 +26487,11 @@ msgstr "Guardar _como..."
 
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
-msgstr "Guardar el contacto y cerrar la ventana de diálogo"
+msgstr "Guarda el contacto y cierra la ventana de diÃ¡logo"
 
-#
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
-msgstr "Enviar un _mensaje al contacto..."
+msgstr "EnvÃa un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
@@ -26358,7 +26502,7 @@ msgstr "_Guardar"
 
 #: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
-msgstr "Borrar esta lista"
+msgstr "Borra esta lista"
 
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
@@ -26366,68 +26510,67 @@ msgstr "Borrar..."
 
 #: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
-msgstr "Guardar la lista y cerrar la ventana de diálogo"
+msgstr "Guarda la lista y cierra la ventana de diÃ¡logo"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "E_nviar la lista a otros..."
 
-#
 #: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Enviar un _mensaje a la lista..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
-msgstr "Cancelar Encuen_tro"
+msgstr "Cancelar Reun_iÃ³n"
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
-msgstr "Cancelar el encuentro para este elemento"
+msgstr "Cancela la reuniÃ³n para este elemento"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
-msgstr "Reenviar como i_Calendar"
+msgstr "ReenvÃa como i_Calendar"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
-msgstr "Reenviar este elemento por correo"
+msgstr "ReenvÃa este elemento por correo"
 
 #: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
-msgstr "Obtener la ultima información de las reuniones"
+msgstr "Obtiene la Ãºltima informaciÃ³n de la reuniÃ³n"
 
 #: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
-msgstr "Actualizar Encuentro"
+msgstr "Actuali_zar ReuniÃ³n"
 
 #: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
-msgstr "Concertar un _encuentro"
+msgstr "Concertar una _ReuniÃ³n"
 
 #: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
-msgstr "Concertar un encuentro para este elemento"
+msgstr "Concierta una reuniÃ³n para este elemento"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
-msgstr "Personalizar Mi Evolution"
+msgstr "Personaliza Mi Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Cancelar la operación de correo actual"
+msgstr "Cancela la operaciÃ³n de correo actual"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
-msgstr "Componer un _nuevo mensaje"
+msgstr "Redactar un _mensaje nuevo"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
-msgstr "Crear o editar reglas para el filtrado de mensajes"
+msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
-msgstr "Crear o editar definiciones de carpetas virtuales"
+msgstr "Crea o edita definiciones de carpetas virtuales"
 
 #: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
@@ -26435,28 +26578,27 @@ msgstr "Vaciar _Papelera"
 
 #: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
-msgstr "Olvidar _contraseña"
+msgstr "Olvidar _contraseÃ±as"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Olvidar las contraseñas recordadas con lo que será preguntado de nuevo"
+msgstr "Olvida las contraseÃ±as almacenadas asÃ que se le preguntarÃ¡n de nuevo"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
-msgstr "Abrir una ventana para escribir un mensaje de correo"
+msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Eliminar permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Post New Message"
-msgstr "Poner un mensaje nuevo"
+msgstr "Publica un mensaje nuevo"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Post a message to a Public folder"
-msgstr "Poner un mensaje en una carpeta Pública"
+msgstr "Publica un mensaje en una carpeta pÃºblica"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "S_ubscribe to Folders..."
@@ -26464,11 +26606,11 @@ msgstr "_Suscribirse a las carpetas..."
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
-msgstr "Mostrar ventana de vista previa del mensajes"
+msgstr "Muestra una ventana de previsualizaciÃ³n de mensajes"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Suscribirse o de-suscribirse de carpetas de los servidores remotos"
+msgstr "Suscribirse o de-suscribirse de carpetas alojadas en servidores remotos"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
@@ -26480,15 +26622,15 @@ msgstr "_Filtros..."
 
 #: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
-msgstr "Vista _previa"
+msgstr "Panel de _previsualizaciÃ³n"
 
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
-msgstr "Cambiar las propiedades de esta carpeta"
+msgstr "Cambia las propiedades de esta carpeta"
 
 #: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
-msgstr "Copiar mensajes seleccionados al portapapeles"
+msgstr "Copia mensajes seleccionados al portapapeles"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
@@ -26496,7 +26638,7 @@ msgstr "Cor_tar"
 
 #: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
-msgstr "Cortar mensaje(s) seleccionado(s) al portapapeles"
+msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26508,52 +26650,47 @@ msgstr "Ocultar mensajes _borrados"
 
 #: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
-msgstr "Oculta_r mensajes leídos"
+msgstr "Oculta_r mensajes leÃdos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una lÃnea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
-msgstr "Marcar todos como l_eídos"
+msgstr "Marcar todos como l_eÃdos"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
-msgstr "Marcar los mensajes visibles como leídos"
+msgstr "Marca los mensajes visibles como leÃdos"
 
 #: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
-msgstr "Pegar mensaje(s) desde el portapapeles"
+msgstr "Pega un(os) mensaje(s) desde el portapapeles"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Eliminar permanentemente todos los mensajes borrados de esta carpeta"
+msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
 #: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
-msgstr "Seleccionar _Hilo"
+msgstr "Seleccionar _hilo"
 
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Selecciona todos los mensajes que no están seleccionados actualmente"
+msgstr "Selecciona todos los mensajes que no estÃ¡n seleccionados actualmente"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
+msgstr "Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
-msgstr "Seleccionar todos los mensajes visibles"
+msgstr "Selecciona todos los mensajes visibles"
 
 #: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
@@ -26561,11 +26698,11 @@ msgstr "M_ostrar mensajes ocultos"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar mensajes que han estado ocultos temporalmente"
+msgstr "Muestra los mensajes que han estado ocultos temporalmente"
 
 #: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Oculta temporalmente todos los mensajes que han sido leídos"
+msgstr "Oculta temporalmente todos los mensajes que han sido leÃdos"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
@@ -26573,7 +26710,7 @@ msgstr "Oculta temporalmente los mensajes seleccionados"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
-msgstr "Lista de Mensajes Encadenados"
+msgstr "Lista de mensajes encadenados"
 
 #: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
@@ -26585,7 +26722,7 @@ msgstr "_Carpeta"
 
 #: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "_Invertir selección"
+msgstr "_Invertir selecciÃ³n"
 
 #: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
@@ -26595,9 +26732,25 @@ msgstr "_Propiedades..."
 msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:46
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+msgid "_View"
+msgstr "_Vista"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
-msgstr "Aña_dir Remitente a la Agenda"
+msgstr "AÃ±a_dir remitente a la agenda"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
@@ -26605,95 +26758,95 @@ msgstr "A_plicar filtros"
 
 #: ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Addressbook"
-msgstr "Añadir Remitente a la Agenda"
+msgstr "AÃ±adir remitente a la agenda"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
-msgstr "Aplicar filtros a los mensajes seleccionados"
+msgstr "Aplica filtros a los mensajes seleccionados"
 
 #: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Responder a todos los destinatarios del mensaje seleccionado"
+msgstr "Responde a todos los destinatarios del mensaje seleccionado"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Responder a la lista de correo remitente del mensaje seleccionado"
+msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Responder al remitente del mensaje seleccionado"
+msgstr "Responde al remitente del mensaje seleccionado"
 
 #: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
-msgstr "Copiar mensajes seleccionados a otra carpeta"
+msgstr "Copia mensajes seleccionados a otra carpeta"
 
 #: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
-msgstr "Crear una Carpeta _Virtual según el mensaje"
+msgstr "Crea una Carpeta _Virtual segÃºn el mensaje"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
-msgstr "Crear una regla para filtrar los mensajes de este remitente"
+msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Crear una regla para filtrar los mensajes de estos destinatarios"
+msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Crear una regla para filtrar los mensajes de esta lista de correo"
+msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
-msgstr "Crear una regla para filtrar los mensajes con este asunto"
+msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
-msgstr "Crear una carpeta virtual para estos destinatarios"
+msgstr "Crea una carpeta virtual para estos destinatarios"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
-msgstr "Crear una carpeta virtual para esta lista de correo"
+msgstr "Crea una carpeta virtual para esta lista de correo"
 
 #: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
-msgstr "Crear una carpeta virtual para este remitente"
+msgstr "Crea una carpeta virtual para este remitente"
 
 #: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
-msgstr "Crear una carpeta virtual para este asunto"
+msgstr "Crea una carpeta virtual para este asunto"
 
 #: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
-msgstr "Reducir el tamaño del texto"
+msgstr "Reduce el tamaÃ±o del texto"
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
-msgstr "Mostrar el siguiente mensaje importante"
+msgstr "Muestra el siguiente mensaje importante"
 
 #: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
-msgstr "Mostrar el mensaje siguiente"
+msgstr "Muestra el mensaje siguiente"
 
 #: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
-msgstr "Mostrar el siguiente mensaje no leído"
+msgstr "Muestra el siguiente mensaje no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
-msgstr "Mostrar el siguiente hilo no leído"
+msgstr "Muestra el siguiente hilo no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
-msgstr "Mostrar el anterior mensaje importante"
+msgstr "Muestra el anterior mensaje importante"
 
 #: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
-msgstr "Mostrar el mensaje anterior"
+msgstr "Muestra el mensaje anterior"
 
 #: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
-msgstr "Mostrar el anterior mensaje no leído"
+msgstr "Muestra el anterior mensaje no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
@@ -26701,19 +26854,19 @@ msgstr "R_eenviar"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
-msgstr "Filtrar según la _lista de correo..."
+msgstr "Filtrar segÃºn la _lista de correo..."
 
 #: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
-msgstr "Filtrar según el remite_nte..."
+msgstr "Filtrar segÃºn el remite_nte..."
 
 #: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
-msgstr "Filtrar según los destinata_rios..."
+msgstr "Filtrar segÃºn los destinata_rios..."
 
 #: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
-msgstr "Filtrar según el a_sunto..."
+msgstr "Filtrar segÃºn el a_sunto..."
 
 #: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
@@ -26725,31 +26878,31 @@ msgstr "_Seguir"
 
 #: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar que las imágenes en los correos en HTML sean cargadas"
+msgstr "Fuerza a que las imÃ¡genes en los correos en HTML sean cargadas"
 
 #: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
-msgstr "Reenviar el mensaje seleccionado en el cuerpo de un nuevo mensaje"
+msgstr "ReenvÃa el mensaje seleccionado en el cuerpo de un nuevo mensaje"
 
 #: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
-msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
+msgstr "ReenvÃa el mensaje seleccionado citado como una respuesta"
 
 #: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
-msgstr "Reenviar el mensaje seleccionado a alguien"
+msgstr "ReenvÃa a alguien el mensaje seleccionado"
 
 #: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Reenviar el mensaje seleccionado como un adjunto a alguien"
+msgstr "ReenvÃa a alguien el mensaje seleccionado como un adjunto"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
-msgstr "Incrementar el tamaño del texto"
+msgstr "Incrementar el tamaÃ±o del texto"
 
 #: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
-msgstr "Cargar _Imágenes"
+msgstr "Cargar _ImÃ¡genes"
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
@@ -26757,7 +26910,7 @@ msgstr "Marcar como I_mportante"
 
 #: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
-msgstr "Marcar como _no leído"
+msgstr "Marcar como _no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
@@ -26765,15 +26918,15 @@ msgstr "Marcar como No Imp_ortante"
 
 #: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
-msgstr "Marcar mensaje(s) seleccionado(s) como leídos"
+msgstr "Marca el(los) mensaje(s) seleccionado(s) como leÃdos"
 
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
-msgstr "Marcar mensaje(s) seleccionado(s) como importantes"
+msgstr "Marca el(los)r mensaje(s) seleccionado(s) como importantes"
 
 #: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
-msgstr "Marcar mensaje(s) seleccionado(s) como no leídos"
+msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leÃdos"
 
 #: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
@@ -26791,58 +26944,54 @@ msgstr "Mover"
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:1170
 #: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Siguiente"
 
 #: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
-msgstr "Siguiente mensaje importante"
+msgstr "Siguiente mensaje _importante"
 
 #: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
-msgstr "Siguiente hilo"
+msgstr "Siguiente _hilo"
 
 #: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
-msgstr "Siguiente mensaje no leído"
+msgstr "Siguiente m_ensaje no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
-msgstr "Abrir el mensaje seleccionado en una nueva ventana"
+msgstr "Abre el mensaje seleccionado en una nueva ventana"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Abrir el mensaje seleccionado para reenviarlo"
+msgstr "Abre el mensaje seleccionado para reenviarlo"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
-msgstr "Ta_maño original"
+msgstr "Ta_maÃ±o original"
 
 #: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
-msgstr "Mensaje anterior no leído"
+msgstr "Mensaje anterior no leÃdo"
 
 #: ui/evolution-mail-message.xml.h:62
 msgid "Post a Reply"
-msgstr "Poner una Respuesta"
+msgstr "Publicar una respuesta"
 
 #: ui/evolution-mail-message.xml.h:63
 msgid "Post a reply to a message in a Public folder"
-msgstr "Poner una respuesta a un mensaje en una carpeta Pública"
+msgstr "Publica una respuesta a un mensaje en una carpeta pÃºblica"
 
 #: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
-msgstr "Mensaje Importante Anterior"
+msgstr "Mensaje importante an_terior"
 
 #: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
-msgstr "Ver el mensaje que va a ser impreso"
+msgstr "Previsualiza el mensaje que va a ser impreso"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:1122
 #: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Anterior"
@@ -26861,7 +27010,7 @@ msgstr "Reenviar (rebotar) el mensaje seleccionado a alguien"
 
 #: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
-msgstr "Dejar el texto en su tamaño original"
+msgstr "Dejar el texto en su tamaÃ±o original"
 
 #: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
@@ -26869,7 +27018,7 @@ msgstr "Bu_scar mensaje..."
 
 #: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
-msgstr "_Más pequeño"
+msgstr "_MÃ¡s pequeÃ±o"
 
 #: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
@@ -26881,7 +27030,7 @@ msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
 #: ui/evolution-mail-message.xml.h:81
 msgid "Set up the page settings for your current printer"
-msgstr "Configurar los la página para la impresora actual"
+msgstr "Configurar los la pÃ¡gina para la impresora actual"
 
 #: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
@@ -26901,11 +27050,11 @@ msgstr "Mostrar mensajes con todas las cabeceras"
 
 #: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
-msgstr "Mostrar la fuentes sin formatear del mensaje"
+msgstr "Mostrar la fuente del mensaje en bruto"
 
 #: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
-msgstr "Ta_maño del texto"
+msgstr "Ta_maÃ±o del texto"
 
 #: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
@@ -26913,19 +27062,19 @@ msgstr "Recuperar los mensajes seleccionados"
 
 #: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
-msgstr "Carpeta virtual según la _Lista de Correo..."
+msgstr "Carpeta virtual segÃºn la _lista de correo..."
 
 #: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
-msgstr "Carpeta virtual según el Remite_nte..."
+msgstr "Carpeta virtual segÃºn el remite_nte..."
 
 #: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
-msgstr "Carpeta virtual según los Destinata_rios..."
+msgstr "Carpeta virtual segÃºn los destinata_rios..."
 
 #: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
-msgstr "Carpeta virtual según el A_sunto..."
+msgstr "Carpeta virtual segÃºn el a_sunto..."
 
 #: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
@@ -26937,11 +27086,11 @@ msgstr "_Copiar a la Carpeta"
 
 #: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
-msgstr "_Crear filtro del mensaje"
+msgstr "_Crear un filtro del mensaje"
 
 #: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
-msgstr "_Reenviar Mensaje"
+msgstr "_Reenviar mensaje"
 
 #: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
@@ -26949,7 +27098,7 @@ msgstr "_Ir a"
 
 #: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
-msgstr "Incluido en línea"
+msgstr "_Incluido en lÃnea"
 
 #: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
@@ -26957,31 +27106,31 @@ msgstr "_Mayor"
 
 #: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
-msgstr "_Mostrar Mensaje"
+msgstr "_Mostrar mensaje"
 
 #: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
-msgstr "_Mover a la Carpeta"
+msgstr "_Mover a la carpeta"
 
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
-msgstr "Siguie_nte mensaje"
+msgstr "Mensaje _siguiente"
 
 #: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
-msgstr "Vista _Normal"
+msgstr "Vista _normal"
 
 #: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
-msgstr "_Abrir Mensaje"
+msgstr "_Abrir mensaje"
 
 #: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
-msgstr "Mensaje anterior"
+msgstr "Mensaje a_nterior"
 
 #: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
-msgstr "Citado"
+msgstr "_Citado"
 
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
@@ -26995,35 +27144,21 @@ msgstr "_Herramientas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
-msgid "_Close"
-msgstr "_Cerrar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:222
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
-msgid "_View"
-msgstr "_Vista"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Adjuntar un archivo"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
-msgstr "Cerrar el archivo actual"
+msgstr "Cierra el archivo actual"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
-msgstr "Borrar todas menos la firma"
+msgstr "Borra todo menos la firma"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
@@ -27039,10 +27174,8 @@ msgstr "For_mato"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
-msgstr "H_TML"
+msgstr "HT_ML"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2114
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
@@ -27090,7 +27223,7 @@ msgstr "Guardar el archivo actual con un nombre diferente"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
-msgstr "Guardara el mensaje a una carpeta específica"
+msgstr "Guardara el mensaje a una carpeta especÃfica"
 
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
@@ -27135,7 +27268,7 @@ msgstr "Activa si se muestra el campo CC"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
-msgstr "Activa si se muestra el selector 'De'"
+msgstr "Activa si se muestra el selector Â«DeÂ»"
 
 #: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
@@ -27184,10 +27317,8 @@ msgstr "H_TML"
 
 #: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
-msgstr "Guardar el fichero y cerrar la ventana de diálogo"
+msgstr "Guardar el archivo y cerrar la ventana de diÃ¡logo"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-window-menus.c:1325
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
 msgid "_Help"
 msgstr "A_yuda"
@@ -27198,7 +27329,7 @@ msgstr "Editor de _Firmas"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
-msgstr "Añadir carpeta a su lista de carpetas suscritas"
+msgstr "AÃ±adir carpeta a su lista de carpetas suscritas"
 
 #: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
@@ -27238,7 +27369,7 @@ msgstr "Cancelar esta tarea"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
-msgstr "Obtener la última información de la tarea"
+msgstr "Obtener la Ãºltima informaciÃ³n de la tarea"
 
 #: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
@@ -27282,11 +27413,11 @@ msgstr "Acerca de Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
-msgstr "Añadir a la barra de atajo_s"
+msgstr "AÃ±adir a la barra de atajo_s"
 
 #: ui/evolution.xml.h:3
 msgid "Change Evolution's settings"
-msgstr "Cambiar la configuración de Evolution"
+msgstr "Cambiar la configuraciÃ³n de Evolution"
 
 #: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
@@ -27352,8 +27483,6 @@ msgstr "Abrir Carpeta de Otro Usuario"
 msgid "Open a folder belonging to some other user on the server"
 msgstr "Abra una carpeta perteneciente a otro usuario en el servidor"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2126
 #: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
@@ -27364,15 +27493,15 @@ msgstr "Abre esta carpeta en una nueva ventana"
 
 #: ui/evolution.xml.h:26
 msgid "Pi_lot Settings..."
-msgstr "_Configuración del Pilot..."
+msgstr "_ConfiguraciÃ³n del Pilot..."
 
 #: ui/evolution.xml.h:27
 msgid "Pilot Con_duit Settings..."
-msgstr "Comunicación con el Pilot"
+msgstr "ComunicaciÃ³n con el Pilot"
 
 #: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Quitar una carpeta añadida con \"Abrir Carpeta de Otro Usuario\""
+msgstr "Quitar una carpeta aÃ±adida con Â«Abrir Carpeta de Otro UsuarioÂ»"
 
 #: ui/evolution.xml.h:29
 msgid "Send / Receive"
@@ -27384,15 +27513,15 @@ msgstr "Enviar el correo en la cola y obtener el nuevo"
 
 #: ui/evolution.xml.h:31
 msgid "Set up Pilot conduit configuration"
-msgstr "Poner la configuración de Pilot Conduit"
+msgstr "Poner la configuraciÃ³n de Pilot Conduit"
 
 #: ui/evolution.xml.h:32
 msgid "Set up Pilot configuration"
-msgstr "Configuración del Pilot"
+msgstr "ConfiguraciÃ³n del Pilot"
 
 #: ui/evolution.xml.h:33
 msgid "Show information about Ximian Evolution"
-msgstr "Mostrar información acerca de Ximian Evolution"
+msgstr "Mostrar informaciÃ³n acerca de Ximian Evolution"
 
 #: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
@@ -27462,16 +27591,13 @@ msgstr "_Mover..."
 msgid "_New"
 msgstr "_Nuevo"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2140
-# src/file-manager/fm-directory-view.c:2257
 #: ui/evolution.xml.h:58
 msgid "_New Folder"
-msgstr "_Nueva carpeta"
+msgstr "_Carpeta nueva"
 
 #: ui/evolution.xml.h:59
 msgid "_Remove Other User's Folder"
-msgstr "Quitar Carpeta de Otro Usuario"
+msgstr "_Borrar carpeta de otro usuario"
 
 #: ui/evolution.xml.h:60
 msgid "_Rename..."
@@ -27503,7 +27629,7 @@ msgstr "Regenerar la vista"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "Por _Compañía"
+msgstr "Por _compaÃ±Ãa"
 
 #: views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
@@ -27511,31 +27637,31 @@ msgstr "Tarjetas de Visita"
 
 #: views/addressbook/galview.xml.h:3
 msgid "_Phone List"
-msgstr "Lista de teléfonos"
+msgstr "Lista de telÃ©fonos"
 
 #: views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "Vista S_emanal"
+msgstr "Vista s_emanal"
 
 #: views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "Vista _Diaria"
+msgstr "Vista _diaria"
 
 #: views/calendar/galview.xml.h:3
 msgid "_Month View"
-msgstr "Vista Mensual"
+msgstr "Vista mensual"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Work Week View"
-msgstr "Vista de la Semana Laboral"
+msgstr "Vista de la semana laboral"
 
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
-msgstr "Como Carpeta de Enviados"
+msgstr "Como carpeta de enviados"
 
 #: views/mail/galview.xml.h:2
 msgid "By Follow Up Flag"
-msgstr "Por Señal de Seguimiento"
+msgstr "Por SeÃ±al de Seguimiento"
 
 #: views/mail/galview.xml.h:3
 msgid "By Sender"
@@ -27555,17 +27681,17 @@ msgstr "Mensajes"
 
 #: views/tasks/galview.xml.h:1
 msgid "With _Category"
-msgstr "Con _categoría"
+msgstr "Con _categorÃa"
 
 #: views/tasks/galview.xml.h:2
 msgid "_Tasks"
 msgstr "_Tareas"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
 msgid "UTC"
-msgstr "TUC"
+msgstr "UTC"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
@@ -27573,7 +27699,7 @@ msgstr "Seleccione un Zona Horaria"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "Selection:"
-msgstr "Sección:"
+msgstr "SecciÃ³n:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
@@ -27585,181 +27711,172 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Use el botón izquierdo del ratón para hacer zoom en un área del mapa y "
+"Use el botÃ³n izquierdo del ratÃ³n para hacer zoom en un Ã¡rea del mapa y "
 "seleccionar una zona horaria.\n"
-" Use el botón derecho del ratón para salir del zoom."
+" Use el botÃ³n derecho del ratÃ³n para salir del zoom."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:287
 msgid "_Current View"
 msgstr "_Vista actual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:349
 msgid "Custom View"
 msgstr "Vista Personalizada"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:358
 msgid "Save Custom View"
 msgstr "Guardar Vista Personalizada"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:371
 msgid "Define Views"
 msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
-msgstr "LMMJVSD"
+msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1069
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Hoy"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:802
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
 
 #: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "El valor del porcentaje debe estar entre 0 y 100"
+msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1031
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Baltic"
-msgstr "Báltico"
+msgstr "BÃ¡ltico"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Central European"
 msgstr "Centroeuropeo"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:198
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Chinese"
 msgstr "Chino"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Cyrillic"
-msgstr "Cirílico"
+msgstr "CirÃlico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Greek"
 msgstr "Griego"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Japanese"
-msgstr "Japonés"
+msgstr "JaponÃ©s"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Turkish"
 msgstr "Turco"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Western European"
 msgstr "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:87
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96
 msgid "Visual"
 msgstr "Visual"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:165
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Juego de caracteres desconocido: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:207
 msgid "Enter the character set to use"
-msgstr "Introduzca el Juego de caracteres a usar"
+msgstr "Introduzca el juego de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:282
 msgid "Other..."
 msgstr "Otro..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:402
 msgid "Character Encoding"
-msgstr "Codificación de Caracteres"
+msgstr "CodificaciÃ³n de caracteres"
 
 #: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:187
 msgid "Search Editor"
-msgstr "Editor de búsquedas"
+msgstr "Editor de bÃºsquedas"
 
-#: widgets/misc/e-filter-bar.c:211
+#: widgets/misc/e-filter-bar.c:209
 msgid "Save Search"
-msgstr "Guardar búsqueda"
+msgstr "Guardar bÃºsqueda"
 
 #: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
-msgstr "_Guardar búsqueda..."
+msgstr "_Guardar bÃºsqueda..."
 
 #: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
-msgstr "Editar Búsquedas Guardadas"
+msgstr "Editar bÃºsquedas guardadas"
 
 #: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Advanced..."
 msgstr "Avanzado..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
-msgstr "Información"
+msgstr "InformaciÃ³n"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Error"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Pregunta"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Mensaje"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "No mostrar otra vez este mensaje."
-
 #: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Encontrar ahora"
@@ -27768,907 +27885,33 @@ msgstr "_Encontrar ahora"
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:823
+msgid "Item ID"
+msgstr "ID de Elemento"
+
+#: widgets/misc/e-search-bar.c:830
+msgid "Subitem ID"
+msgstr "ID de SubElemento"
+
+#: widgets/misc/e-search-bar.c:837
+msgid "Text"
+msgstr "Texto"
+
+#: widgets/misc/e-search-bar.c:915
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:917
 msgid "Find Now"
 msgstr "Buscar ahora"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "El Servidor de Agendas Personales"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
-msgstr "El Servidor de Calendarios Personales. Factoría de agendas"
-
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): no pude inicializar GNOME-VFS"
-
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): no pude inicializar GNOME"
-
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonob(): no pude inicializar Bonobo"
-
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr "Ximian Evolution"
-
-#, fuzzy
-#~ msgid "Don't tell me again"
-#~ msgstr "No me preguntes más veces"
-
-#~ msgid "_Configure..."
-#~ msgstr "_Configurar..."
-
-#, fuzzy
-#~ msgid "_Configure Pilot..."
-#~ msgstr "Configurar"
-
-#, fuzzy
-#~ msgid "en"
-#~ msgstr "Enviado"
-
-#~ msgid " "
-#~ msgstr " "
-
-#, fuzzy
-#~ msgid "Select PGP program"
-#~ msgstr "Seleccione el binario de PGP"
-
-#~ msgid "Signature #1"
-#~ msgstr "Firma #1"
-
-#~ msgid "Signature #2"
-#~ msgstr "Firma #2"
-
-#~ msgid "_PGP binary path:"
-#~ msgstr "Localización del binario de _PGP:"
-
-#~ msgid "Copy selected messages"
-#~ msgstr "Copiar los mensajes _seleccionados"
-
-#~ msgid "Cut selected messages"
-#~ msgstr "Cortar los mensajes seleccionados"
-
-#, fuzzy
-#~ msgid "&lt;- _Remove"
-#~ msgstr "<- _Quitar"
-
-#, fuzzy
-#~ msgid "_Add -&gt;"
-#~ msgstr "_Añadir ->"
-
-#~ msgid "Scanning for new messages"
-#~ msgstr "Buscando mensajes nuevos"
-
-#, fuzzy
-#~ msgid "The folder %s no longer exists"
-#~ msgstr "Esta carpeta no está vacía"
-
-#~ msgid "1 byte"
-#~ msgstr "1 byte"
-
-#~ msgid "%u bytes"
-#~ msgstr "%u bytes"
-
-#~ msgid ""
-#~ "You forgot to choose a folder.\n"
-#~ "Please go back and specify a valid folder to deliver mail to."
-#~ msgstr ""
-#~ "Se ha olvidado de elegir una carpeta.\n"
-#~ "Vuelva y especifique una carpeta válida donde entregar el correo."
-
-#~ msgid "%s may not be reconfigured because it is not a local folder"
-#~ msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
-
-#~ msgid ""
-#~ "Importing %s\n"
-#~ "Importer not ready.\n"
-#~ "Waiting 5 seconds to retry."
-#~ msgstr ""
-#~ "Importando %s\n"
-#~ "El importador no esta listo.\n"
-#~ "Esperando 5 segundos antes de reintentar."
-
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Asistente de importación de Evolution"
-
-#, fuzzy
-#~ msgid "_Preferences..."
-#~ msgstr "Si_n recurrencia"
-
-#~ msgid "Error in search expression."
-#~ msgstr "Error buscando la expresión."
-
-#~ msgid "Restarting search."
-#~ msgstr "Reiniciando búsqueda."
-
-#, fuzzy
-#~ msgid "Could not parse query string"
-#~ msgstr "No pude analizar la URL `%s'"
-
-#, fuzzy
-#~ msgid "Email is"
-#~ msgstr "Correo electrónico 2"
-
-#~ msgid "Could not create the alarm notify service"
-#~ msgstr "No pude crear el servicio de la alarma de notificación"
-
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "La reunión empieza: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "La tarea empieza: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "La información de disponibilidad comienza: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Empieza: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "La reunión termina: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "La información de disponibilidad finaliza: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Tarea completada: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Plazo para la tarea: <b>"
-
-#~ msgid "Non-Participants"
-#~ msgstr "No participan"
-
-#, fuzzy
-#~ msgid "Set as default"
-#~ msgstr " (predeterminada)"
-
-#, fuzzy
-#~ msgid "Signature hint"
-#~ msgstr "Guardar firma"
-
-#, fuzzy
-#~ msgid "Hide signature hint"
-#~ msgstr "Archivo de firma en HTML:"
-
-#~ msgid " _Refresh List "
-#~ msgstr "_Regenerar la lista "
-
-#~ msgid "Show _folders from server: "
-#~ msgstr "Mostrar _carpetas del servidor:"
-
-#, fuzzy
-#~ msgid "_Server:"
-#~ msgstr "Nombre del _servidor:"
-
-#~ msgid ""
-#~ "Issuer: %s\n"
-#~ "Subject: %s"
-#~ msgstr ""
-#~ "Responsable: %s\n"
-#~ "Asunto: %s"
-
-#~ msgid "You have chosen an invalid date."
-#~ msgstr "Ha elegido una fecha incorrecta."
-
-#~ msgid ""
-#~ "The message's date will be compared against\n"
-#~ "whatever the time is when the filter is run\n"
-#~ "or vfolder is opened."
-#~ msgstr ""
-#~ "La fecha del mensaje será comparada con la\n"
-#~ "fecha del momento de ejecutar el filtro o\n"
-#~ "cuando se abra el vfolder."
-
-#~ msgid "View messages..."
-#~ msgstr "Ver mensajes..."
-
-#, fuzzy
-#~ msgid "Post a Message"
-#~ msgstr "%s - Mensaje"
-
-#~ msgid ""
-#~ "Evolution is unable to get the addressbook local storage.\n"
-#~ "This may have been caused by the evolution-addressbook component "
-#~ "crashing.\n"
-#~ "To help us better understand and ultimately resolve this problem,\n"
-#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-#~ "detailed description of the circumstances under which this error\n"
-#~ "occurred.  Thank you."
-#~ msgstr ""
-#~ "Evolution no puede obtener la agenda local. Esto se puede deber a que "
-#~ "haya fallado el componente evolution-addressbook. Para ayudarnos a "
-#~ "entender mejor y finalmente resolver el problema, por favor envíe un "
-#~ "mensaje a Jon Trowbridge <trow@ximian.com> con una descripción detallada "
-#~ "de las circunstancias bajo las que ocurrió este error.  Gracias."
-
-#~ msgid ""
-#~ "Evolution is unable to get the addressbook local storage.\n"
-#~ "Under normal circumstances, this should never happen.\n"
-#~ "You may need to exit and restart Evolution in order to\n"
-#~ "correct this problem."
-#~ msgstr ""
-#~ "Evolution no puede obtener la agenda de direcciones local.\n"
-#~ "Bajo circunstancias normales, esto no debería pasar nunca.\n"
-#~ "Puede que necesites salir y reiniciar Evolution para arreglar\n"
-#~ "este problema."
-
-#, fuzzy
-#~ msgid "_Browse..."
-#~ msgstr "_Mover..."
-
-#~ msgid "The meeting status has changed. Send an updated version?"
-#~ msgstr ""
-#~ "El estado de la reunión a cambiado. ¿Enviar una versión actualizada?"
-
-#~ msgid "_Delete this Appointment"
-#~ msgstr "_Borrar esta cita"
-
-#, fuzzy
-#~ msgid "SASL Protocol error"
-#~ msgstr "Error crítico"
-
-#, fuzzy
-#~ msgid "I/O Error: %s"
-#~ msgstr "Error de I/O"
-
-#~ msgid "Welcome response error: %s: possibly non-fatal"
-#~ msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
-
-#~ msgid "HELO request timed out: %s: non-fatal"
-#~ msgstr "Expiró el tiempo para HELO: %s: no es fatal"
-
-#~ msgid "HELO response error: %s: non-fatal"
-#~ msgstr "Respuesta de error al HELO: %s: no es fatal"
-
-#~ msgid "QUIT request timed out: %s: non-fatal"
-#~ msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
-
-#~ msgid "Insert File"
-#~ msgstr "Insertar Archivo"
-
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Compañía"
-
-#~ msgid "Evolution News Editor"
-#~ msgstr "Editor de Noticias de Evolution"
-
-#~ msgid "Are you sure you want to delete this news account?"
-#~ msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
-
-#~ msgid "You must configure an account before you can send this email."
-#~ msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
-
-#~ msgid "NNTP Server:"
-#~ msgstr "Servidor NNTP:"
-
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Fuentes de _noticias"
-
-#~ msgid "Source"
-#~ msgstr "Fuente"
-
-#~ msgid "Source Information"
-#~ msgstr "Información de la Fuente"
-
-#~ msgid "newswindow1"
-#~ msgstr "newswindow1"
-
-#~ msgid "Save to Disk..."
-#~ msgstr "Guardar en disco..."
-
-#~ msgid "Executing shell command: %s"
-#~ msgstr "Ejecutando el comando de shell: %s"
-
-#~ msgid "Evolution - Create new folder"
-#~ msgstr "Evolution - Crear nuevas carpetas"
-
-#~ msgid ""
-#~ "The type of the selected folder is not valid for\n"
-#~ "the requested operation."
-#~ msgstr ""
-#~ "El tipo de carpeta seleccionada no es valido para\n"
-#~ "la operación requerida."
-
-#~ msgid "You may only import to local folders"
-#~ msgstr "Solo puedes importar a carpetas locales"
-
-#~ msgid "Create new contact"
-#~ msgstr "Crear nuevo contacto"
-
-#~ msgid "Create new contact list"
-#~ msgstr "Crear nueva lista de contactos"
-
-#~ msgid "_Contact List"
-#~ msgstr "Lista de _contactos"
-
-#~ msgid "Inline Text _File..."
-#~ msgstr "Archivo de texto en línea..."
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Insertar un archivo como texto en el mensaje"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Insertar un archivo de texto..."
-
-#~ msgid "Send _Later"
-#~ msgstr "Enviar _mas tarde"
-
-#~ msgid "Send _later"
-#~ msgstr "Enviar _mas tarde"
-
-#~ msgid "Send the message later"
-#~ msgstr "Enviar el mensaje más tarde"
-
-#~ msgid "_Pilot Settings..."
-#~ msgstr "_Configuración del pilot..."
-
-#, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Fuentes de la agenda de direcciones"
-
-#, fuzzy
-#~ msgid "Could not query for schema information"
-#~ msgstr ""
-#~ "Información opaca de seguimiento inválida:\n"
-#~ "%s"
-
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Componente de resumen de trabajo de Evolution."
-
-#~ msgid "Factory for the Calendar Summary component."
-#~ msgstr "Factoría para el componente de Resumen de Calendario."
-
-#~ msgid "Sta_rt of day:"
-#~ msgstr "Co_mienzo del día:"
-
-#~ msgid "_End of day:"
-#~ msgstr "Fin d_el día:"
-
-#~ msgid "_Other Organizer"
-#~ msgstr "_Otro organizador"
-
-#~ msgid "Clearsigning is not supported by this cipher"
-#~ msgstr "Las firmas en claro no están implementadas en este cifrado"
-
-#~ msgid "Please enter your %s passphrase for %s"
-#~ msgstr "Por favor introduzca su frase de paso%s %s"
-
-#~ msgid "Please enter your %s passphrase"
-#~ msgstr "Por favor introduzca su frase de paso %s"
-
-#~ msgid "Cannot sign this message: no plaintext to sign"
-#~ msgstr "No puedo firmar este mensaje: no hay texto plano que firmar"
-
-#~ msgid "Cannot sign this message: no password provided"
-#~ msgstr "No puedo firmar este mensaje: no se facilito la contraseña"
-
-#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "No puedo firmar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#~ msgid "Cannot sign this message: no plaintext to clearsign"
-#~ msgstr "No puedo firmar este mensaje: no hay texto plano a firmar en claro"
-
-#~ msgid "Cannot verify this message: no plaintext to verify"
-#~ msgstr "No puedo verificar este mensaje: no texto plano a verificar"
-
-#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "No puedo verificar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
-#~ msgstr "No puedo cifrar este mensaje: no hay texto plano a cifrar"
-
-#~ msgid "Cannot encrypt this message: no password provided"
-#~ msgstr "No puedo cifrar este mensaje: no se facilitó la contraseña"
-
-#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "No puedo cifrar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
-#~ msgstr "No puedo descifrar este mensaje: no hay texto cifrado a descifrar"
-
-#~ msgid "Cannot decrypt this message: no password provided"
-#~ msgstr "No puedo descifrar este mensaje: no se facilito la contraseña"
-
-#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "No puedo descifrar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#~ msgid "%s server %s"
-#~ msgstr "%s servidor %s"
-
-#~ msgid "(unknown host)"
-#~ msgstr "(servidor desconocido)"
-
-#~ msgid "No such message: %s"
-#~ msgstr "No existe el mensaje: %s"
-
-#~ msgid "You cannot copy messages from this trash folder."
-#~ msgstr "No puede copiar mensajes de esta papelera."
-
-#~ msgid "Cannot append message to spool file: %s: %s"
-#~ msgstr "No puedo añadir el mensaje al archivo: %s: %s"
-
-#~ msgid "Could not file: %s: %s"
-#~ msgstr "No pude archivar %s: %s"
-
-#, fuzzy
-#~ msgid "Store `%s' does not exist or is not a directory"
-#~ msgstr "`%s' no existe o no es un archivo normal."
-
-#, fuzzy
-#~ msgid "Random"
-#~ msgstr "Radio"
-
-#~ msgid ""
-#~ "Could not get inbox for new mail store:\n"
-#~ "%s\n"
-#~ "No shortcut will be created."
-#~ msgstr ""
-#~ "No pude obtener la carpeta de entrada de correo nuevo:\n"
-#~ "%s\n"
-#~ "No se crearán atajos."
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-undo-signal-handlers.c:174
-#, fuzzy
-#~ msgid " Edit "
-#~ msgstr "_Editar"
-
-#, fuzzy
-#~ msgid " New "
-#~ msgstr "Nuevo"
-
-#, fuzzy
-#~ msgid "Advanced Options"
-#~ msgstr "Cancelar operación"
-
-#, fuzzy
-#~ msgid "Afrikaans"
-#~ msgstr "Arkansas"
-
-#, fuzzy
-#~ msgid "Arabic"
-#~ msgstr "Arica"
-
-#, fuzzy
-#~ msgid "Dari"
-#~ msgstr "Bari"
-
-#, fuzzy
-#~ msgid "Hulu"
-#~ msgstr "Honolulú"
-
-#, fuzzy
-#~ msgid "Same as text"
-#~ msgstr "Somerset"
-
-#, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Borrar todas menos la firma"
-
-#, fuzzy
-#~ msgid "_HTML Signature:"
-#~ msgstr "Firma en _HTML:"
-
-#, fuzzy
-#~ msgid "_Language:"
-#~ msgstr "Idioma"
-
-#, fuzzy
-#~ msgid "_Random"
-#~ msgstr "Radio"
-
-#~ msgid "Could not create a PGP encryption context."
-#~ msgstr "No pude crear un contexto de cifrado PGP."
-
-#~ msgid "Could not create a PGP decryption context."
-#~ msgstr "No pude crear un contexto de cifrado PGP."
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
-#~ msgid "Moving"
-#~ msgstr "Moviendo"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:725
-#~ msgid "Copying"
-#~ msgstr "Copiando"
-
-#, fuzzy
-#~ msgid "Signature name:"
-#~ msgstr "Archivo de firma:"
-
-#~ msgid "Riga"
-#~ msgstr "Riga"
-
-#~ msgid "Are you sure you want to remove the \"%s\" folder?"
-#~ msgstr "¿Esta seguro que quiere borrar la carpeta «%s»?"
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "Esperando la conexión al servidor LDAP..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editar agenda de direcciones"
-
-#, fuzzy
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "Autenticación requerida"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Añadir agenda de direcciones"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgid "Base"
-#~ msgstr "Base"
-
-#, fuzzy
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "_Mi servidor requiere autenticación"
-
-#, fuzzy
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
-#~ "the server"
-#~ msgstr ""
-#~ "Evolution usará esta dirección de correo para autenticarte contra el "
-#~ "servidor"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Se requiere la información de debajo para añadir una agenda.  "
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr ""
-#~ "Esta información no es requerida por la mayoría de los servidores LDAP."
-
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are "
-#~ "used in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Esta información la usa su servidor LDAP para especificar que nodos son "
-#~ "usados en una búsqueda. Para más información contacte con el "
-#~ "administrador del servidor."
-
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact "
-#~ "your server administrator for more information."
-#~ msgstr ""
-#~ "Este es el nodo base de todas sus búsquedas en el servidor LDAP. Para más "
-#~ "información contacte con el administrador del servidor."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Este es el nombre del servidor donde está su agenda."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Este es el puerto que usa su servidor LDAP."
-
-#~ msgid "Name contains"
-#~ msgstr "El nombre contiene"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "C_onteniendo:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Crear una nueva cita con un _recordatorio por defecto"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "Primer día de la se_mana:"
-
-#~ msgid "_Other"
-#~ msgstr "_Otro"
-
-#~ msgid "_Delete this Task"
-#~ msgstr "_Borrar esta tarea"
-
-#~ msgid "Unable to find any of your identities in the attendees list!\n"
-#~ msgstr ""
-#~ "¡No pude encontrar ninguna de tus identidades en la lista de "
-#~ "participantes!\n"
-
-#~ msgid "Invalid type in body-contains, expecting string"
-#~ msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
-
-#, fuzzy
-#~ msgid "Error hashing password."
-#~ msgstr "Error añadiendo tarjeta"
-
-#, fuzzy
-#~ msgid "Invalid password."
-#~ msgstr "Argumento inválido"
-
-#, fuzzy
-#~ msgid "Could not sign: certificate not found for \"%s\"."
-#~ msgstr "Error al buscar el certificado para «%s»."
-
-#, fuzzy
-#~ msgid "Could not clearsign: certificate not found for \"%s\"."
-#~ msgstr "Error al buscar el certificado para «%s»."
-
-#, fuzzy
-#~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr "No pude crear un contexto de cifrado PGP."
-
-#, fuzzy
-#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "No pude conectar con el servidor: %s"
-
-#, fuzzy
-#~ msgid "Could not encrypt: encoding failed."
-#~ msgstr "No pude guardar el archivo de firma."
-
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Por favor introduzca la contraseña NNTP para %s@%s"
-
-#~ msgid "Server rejected username"
-#~ msgstr "El servidor rechazo el nombre de usuario"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Fallo al enviar el nombre de usuario al servidor"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "El servidor rechazo el nombre de usuario ó la contraseña"
-
-#~ msgid "Internal error: uid in invalid format: %s"
-#~ msgstr "Error interno: uid en formato no válido: %s"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "No pude obtener la lista de grupos del servidor."
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
-
-#~ msgid "Could not find 'From' address in message"
-#~ msgstr "No pude encontrar la dirección 'De' en el mensaje"
-
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
-
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "Componente Evolution para el resumen de trabajo."
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "No puedo inicializar el componente de resumen de Evolution."
-
-#, fuzzy
-#~ msgid "Send an email to %s"
-#~ msgstr "Enviar un correo"
-
-#, fuzzy
-#~ msgid "Run %s"
-#~ msgstr "Ejecutar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-window.c:1267
-#, fuzzy
-#~ msgid "Close %s"
-#~ msgstr "Cerrar"
-
-#, fuzzy
-#~ msgid "Move %s to the left"
-#~ msgstr "Mueve esta carpeta a otro sitio"
-
-# src/file-manager/dfos-xfer.c:961
-#, fuzzy
-#~ msgid "Move %s to the right"
-#~ msgstr "Moviendo archivos a la Papelera"
-
-#, fuzzy
-#~ msgid "page"
-#~ msgstr "Página"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No puedo renombrar la carpeta:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Error reading data:\n"
-#~ "%s"
-#~ msgstr "Error cargando %s"
-
-#, fuzzy
-#~ msgid "Factory for the RDF summary."
-#~ msgstr "Factoría para el componente de Resumen de Correo."
-
-#, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "Resumen"
-
-#, fuzzy
-#~ msgid "Factory for the test bonobo component."
-#~ msgstr "Factoría para el compositor de correo de Evolution."
-
-#, fuzzy
-#~ msgid "Factory for the test component."
-#~ msgstr "Factoría para el componente de Resumen de Correo."
-
-# src/nautilus-window-toolbars.c:161
-#, fuzzy
-#~ msgid "Test service"
-#~ msgstr "Servicios web"
-
-#, fuzzy
-#~ msgid "Update now"
-#~ msgstr "Actualizar"
-
-#, fuzzy
-#~ msgid "Update every "
-#~ msgstr "_Actualizar Libre/Ocupado"
-
-#~ msgid "Enter folder URI"
-#~ msgstr "Escribir URI de la carpeta"
-
-#~ msgid "Mail storage folder (internal)"
-#~ msgstr "Carpeta para guardar correo (interno)"
-
-#~ msgid "Create vFolder from Search"
-#~ msgstr "Crear carpeta virtual de la búsqueda"
-
-#~ msgid "Filter on Mailing List"
-#~ msgstr "Filtrar según la lista de correo"
-
-#~ msgid "Indexing:"
-#~ msgstr "Indexando:"
-
-#~ msgid "Mailbox Format"
-#~ msgstr "Formato Mailbox"
-
-#~ msgid "%s: Inbox"
-#~ msgstr "%s: Entrada"
-
-#~ msgid "Always _encrypt to myself when sending encrypted mail"
-#~ msgstr "Siempre cifrarm_e a mí mismo cuando envíe correo cifrado"
-
-#~ msgid "Composer"
-#~ msgstr "Nuevo"
-
-#~ msgid "Default Forward style is: "
-#~ msgstr "El estilo predeterminado de Reenvío es: "
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:149
-#~ msgid "Display"
-#~ msgstr "Mostrar"
-
-#~ msgid "Edit..."
-#~ msgstr "Editar..."
-
-#~ msgid "News"
-#~ msgstr "Noticias"
-
-#~ msgid "Select Filter Log file..."
-#~ msgstr "Seleccione un archivo de actividad para los filtros..."
-
-#~ msgid "Sources"
-#~ msgstr "Fuentes"
-
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Registrar acciones de _los filtros en:"
-
-#~ msgid "_Organization:"
-#~ msgstr "_Organización:"
-
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
-
-#, fuzzy
-#~ msgid "_Server type: "
-#~ msgstr "Tipo de _servidor: "
-
-#~ msgid "placeholder"
-#~ msgstr "placeholder"
-
-#~ msgid "seconds."
-#~ msgstr "segundos."
-
-#~ msgid "Evolution does not recognize this type of signed message."
-#~ msgstr "Evolution no reconoce este tipo de mensajes firmados."
-
-#, fuzzy
-#~ msgid "Incomplete message written on pipe!"
-#~ msgstr "Mensaje cifrado no mostrado"
-
-#, fuzzy
-#~ msgid "Mail Summary"
-#~ msgstr "Resumen de correo"
-
-#~ msgid "Cannot initialize Evolution's Summary component."
-#~ msgstr "No puedo inicializar el componente de resumen de Evolution."
-
-#, fuzzy
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Factoría para el compositor de correo de Evolution."
-
-#, fuzzy
-#~ msgid "Factory for the Notes control"
-#~ msgstr "Factoría para el control de tareas de Evolution."
-
-#, fuzzy
-#~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#~ msgid "(No name)"
-#~ msgstr "(Sin nombre)"
-
-#~ msgid "Dump"
-#~ msgstr "Volcar"
-
-#~ msgid "Configure the calendar's settings"
-#~ msgstr "Configurar las opciones del calendario"
-
-#~ msgid "Create a New All Day _Event"
-#~ msgstr "Crear un nuevo _evento de todo el día"
-
-#~ msgid "Create a New _Task"
-#~ msgstr "Crear una nueva _tarea"
-
-#~ msgid "Create a _New Appointment"
-#~ msgstr "Crear una _nueva cita"
-
-#, fuzzy
-#~ msgid "Create a _New Meeting"
-#~ msgstr "Crear una _nueva cita"
-
-#~ msgid "Create an event for the whole day"
-#~ msgstr "Crear un evento para todo el día"
-
-#~ msgid "_Appointment..."
-#~ msgstr "Cit_a..."
-
-#~ msgid "_Calendar Settings..."
-#~ msgstr "_Configuración del calendario..."
-
-#, fuzzy
-#~ msgid "_Meeting..."
-#~ msgstr "Reunión"
-
-#~ msgid "_Task..."
-#~ msgstr "_Tarea..."
-
-#~ msgid "_Apply Filters"
-#~ msgstr "_Aplicar filtro"
-
-#~ msgid "Configure the task view's settings"
-#~ msgstr "Configurar la vista de las tareas"
-
-#~ msgid "Tasks Settings..."
-#~ msgstr "Configuración de las tareas..."
-
-#~ msgid "Change the settings for the summary"
-#~ msgstr "Cambiar las propiedades del resumen"
-
-#~ msgid "_Summary Settings..."
-#~ msgstr "_Configuración del resumen..."
-
-#~ msgid "Show All"
-#~ msgstr "Mostrar todo"
+msgstr "El Servidor de Calendarios Personales. FÃ¡brica de agendas"
 
-#~ msgid "Sear_ch"
-#~ msgstr "Bus_car"
author	Pablo Gonzalo del Campo <pablodc@bigfoot.com>	2003-01-07 00:18:01 +0800
committer	Pablo del Campo <pablodc@src.gnome.org>	2003-01-07 00:18:01 +0800
commit	7ab3a4fb2a3414f32b1087260246c062eba5fcaf (patch)
tree	e7e0ef964483e7fd82b46e8d39a7488969184344
parent	b4c4834eaa79edc11995f6b209e723d5ec6ecd56 (diff)
download	gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.tar.gz gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.tar.zst gsoc2013-evolution-7ab3a4fb2a3414f32b1087260246c062eba5fcaf.zip