remove dead file

2003-10-30 JP Rosevear <jpr@ximian.com> * POTFILES.in: remove dead file svn path=/trunk/; revision=23141
author: JP Rosevear <jpr@ximian.com> 2003-10-31 06:02:33 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2003-10-31 06:02:33 +0800
commit: fa2ae7d9e92893ce2b3ef0177619c53f05184d85 (patch)
tree: 13dfd0cad4b9e0a28d09fdfac60fb37d39f1d43b /po/es.po
parent: e2e312d4102fc8ce3c540d85b6a998d68f528cf6 (diff)
download: gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.tar.gz
gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.tar.zst
gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.zip
1 files changed, 12664 insertions, 14480 deletions
diff --git a/po/es.po b/po/es.po
index 4c7b2ccf1a..c067c919b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,461 +14,527 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch.es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 19:27+0200\n"
+"POT-Creation-Date: 2003-10-30 16:28-0500\n"
 "PO-Revision-Date: 2003-08-01 03:05+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Importador de LDIF de Evolution."
+#: addressbook/backend/ebook/e-book.c:214
+msgid "e_book_add_contact called on book before e_book_load_uri"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "Formato de intercambio de datos LDAP (.ldif)"
+#: addressbook/backend/ebook/e-book.c:221
+#: addressbook/backend/ebook/e-book.c:330
+#: addressbook/backend/ebook/e-book.c:412
+#: addressbook/backend/ebook/e-book.c:511
+#: addressbook/backend/ebook/e-book.c:620
+#: addressbook/backend/ebook/e-book.c:701
+#: addressbook/backend/ebook/e-book.c:801
+#: addressbook/backend/ebook/e-book.c:853
+#: addressbook/backend/ebook/e-book.c:946
+#: addressbook/backend/ebook/e-book.c:1075
+#: addressbook/backend/ebook/e-book.c:1173
+#: addressbook/backend/ebook/e-book.c:1397
+msgid "book busy"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Importador de VCard de Evolution."
+#: addressbook/backend/ebook/e-book.c:248
+msgid "Corba exception making Book::addContact call"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Importador de VCard de Evolution"
+#: addressbook/backend/ebook/e-book.c:323
+msgid "e_book_commit_contact called on book before e_book_load_uri"
+msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-book.c:357
+msgid "Corba exception making Book::modifyContact call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:405
+msgid "e_book_get_supported_fields on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:434
+msgid "Corba exception making Book::getSupportedFields call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:504
+msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:534
+msgid "Corba exception making Book::getSupportedAuthMethods call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:613
+msgid "e_book_authenticate_user on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:646
+msgid "Corba exception making Book::authenticateUser call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:694
+msgid "e_book_get_contact on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:724
+msgid "Corba exception making Book::getContact call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:794
+msgid "e_book_remove_contact on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:846
+msgid "e_book_remove_contacts on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:885
+msgid "Corba exception making Book::removeContacts call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:939
+msgid "e_book_get_book_view on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:990
+msgid "Corba exception making Book::getBookView call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1068
+msgid "e_book_get_contacts on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1103
+msgid "Corba exception making Book::getContactList call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1166
+msgid "e_book_get_changes on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1197
+msgid "Corba exception making Book::getChanges call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1308
+#, fuzzy
+msgid "e_book_cancel: there is no current operation"
+msgstr "Cancela la operación de correo actual"
+
+#: addressbook/backend/ebook/e-book.c:1327
+msgid "Corba exception making Book::cancelOperation call"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-book.c:1342
+msgid "e_book_cancel: couldn't cancel"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1390
+msgid "e_book_remove on book before e_book_load_uri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1419
+msgid "Corba exception making Book::remove call"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1642
+#: addressbook/backend/ebook/e-book.c:1736
+#, c-format
+msgid "e_book_load_uri: no factories available for uri `%s'"
+msgstr ""
+
+#: addressbook/backend/ebook/e-book.c:1656
+msgid "e_book_load_uri: Could not create EBookListener"
+msgstr ""
+
+#: addressbook/backend/ebook/e-contact.c:90
+msgid "Unique ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-contact.c:91
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#. Name fields
+#. FN isn't really a structured field - we use a getter/setter
+#. so we can set the N property (since evo 1.4 works fine with
+#. vcards that don't even have a N attribute.  *sigh*)
+#: addressbook/backend/ebook/e-contact.c:97
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#: addressbook/backend/ebook/e-contact.c:98
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: 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-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1347
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email"
-msgstr "Correo electrónico"
+#: addressbook/backend/ebook/e-contact.c:99
+#, fuzzy
+msgid "Given Name"
+msgstr "Nombre del campo"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Principal"
+#: addressbook/backend/ebook/e-contact.c:100
+msgid "Family Name"
+msgstr "Apellido"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Pral"
+#: addressbook/backend/ebook/e-contact.c:101
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Apodo"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Secretario"
+#. Address fields
+#: addressbook/backend/ebook/e-contact.c:104
+#, fuzzy
+msgid "Address List"
+msgstr "Dirección"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
-msgid "Business"
-msgstr "Trabajo"
+#: addressbook/backend/ebook/e-contact.c:105
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Domicilio"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-msgid "Bus"
-msgstr "Trab"
-
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Callback"
-msgstr "Devolución de llamada"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-msgid "Company"
-msgstr "Compañía"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-msgid "Comp"
-msgstr "Comp"
-
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
-msgid "Home"
+#: addressbook/backend/ebook/e-contact.c:106
+#: addressbook/gui/widgets/eab-contact-display.c:222
+#, fuzzy
+msgid "Work Address"
 msgstr "Domicilio"
 
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organización"
+#: addressbook/backend/ebook/e-contact.c:107
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Otra dirección"
 
-#: addressbook/backend/ebook/e-card-simple.c:69
-msgid "Org"
-msgstr "Org"
+#: addressbook/backend/ebook/e-contact.c:109
+#, fuzzy
+msgid "Home Address Label"
+msgstr "Etiqueta de dirección"
+
+#: addressbook/backend/ebook/e-contact.c:110
+#, fuzzy
+msgid "Work Address Label"
+msgstr "Etiqueta de dirección"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-msgid "Mobile"
-msgstr "Móvil"
+#: addressbook/backend/ebook/e-contact.c:111
+#, fuzzy
+msgid "Other Address Label"
+msgstr "Etiqueta de dirección"
+
+#: addressbook/backend/ebook/e-contact.c:113
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Teléfono del secretario"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-msgid "Car"
-msgstr "Coche"
+#: addressbook/backend/ebook/e-contact.c:114
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Teléfono del trabajo"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/backend/ebook/e-contact.c:115
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Teléfono del trabajo 2"
+
+#: addressbook/backend/ebook/e-contact.c:116
 #: 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"
+#: addressbook/backend/ebook/e-contact.c:117
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Teléfono para devolución de llamadas"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Fax"
-msgstr "Fax de casa"
+#: addressbook/backend/ebook/e-contact.c:118
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Teléfono del coche"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-msgid "Business 2"
-msgstr "Trabajo 2"
+#: addressbook/backend/ebook/e-contact.c:119
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Teléfono de la compañía"
+
+#: addressbook/backend/ebook/e-contact.c:120
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Teléfono de casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-msgid "Bus 2"
-msgstr "Trab 2"
+#: addressbook/backend/ebook/e-contact.c:121
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Teléfono de casa 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-msgid "Home 2"
-msgstr "Domicilio 2"
+#: addressbook/backend/ebook/e-contact.c:122
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Fax"
+msgstr "Fax de casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/backend/ebook/e-contact.c:123
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
-msgid "Other"
-msgstr "Otro"
+#: addressbook/backend/ebook/e-contact.c:124
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/backend/ebook/e-contact.c:125
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Otro teléfono"
+
+#. XXX
+#: addressbook/backend/ebook/e-contact.c:126
 #: 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:1751
+#. XXX
+#: addressbook/backend/ebook/e-contact.c:127
 #: 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:1753
+#: addressbook/backend/ebook/e-contact.c:128
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Teléfono principal"
+
+#: addressbook/backend/ebook/e-contact.c:129
 #: 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:1754
+#: addressbook/backend/ebook/e-contact.c:130
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Télex"
 
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-contact.c:131
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "Teletipo"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:488
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+#. Email fields
+#: addressbook/backend/ebook/e-contact.c:134
+#, fuzzy
+msgid "Email List"
+msgstr "Correo electrónico 2"
+
+#: addressbook/backend/ebook/e-contact.c:135
+#, fuzzy
+msgid "Email 1"
+msgstr "Correo electrónico 3"
+
+#: addressbook/backend/ebook/e-contact.c:136
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:498
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/backend/ebook/e-contact.c:137
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Web Site"
-msgstr "Sitio web"
+#: addressbook/backend/ebook/e-contact.c:138 mail/em-format-html.c:1381
+msgid "Mailer"
+msgstr "Transporte"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-msgid "Url"
-msgstr "Url"
+#: addressbook/backend/ebook/e-contact.c:139
+#, fuzzy
+msgid "Wants HTML Mail"
+msgstr "Desea HTML"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Departamento"
+#. Instant messaging fields
+#: addressbook/backend/ebook/e-contact.c:142
+msgid "AIM Screen Name List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-contact.c:143
+#, fuzzy
+msgid "Jabber Id List"
+msgstr "Lista de anónimos"
+
+#: addressbook/backend/ebook/e-contact.c:144
+msgid "Yahoo! Screen Name List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-contact.c:145
+msgid "MSN Screen Name List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-contact.c:146
+#, fuzzy
+msgid "ICQ Id List"
+msgstr "Es una lista nueva"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-msgid "Dep"
-msgstr "Dep"
+#. Organizational fields
+#: addressbook/backend/ebook/e-contact.c:149
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/backend/ebook/e-contact.c:150
+msgid "Organizational Unit"
+msgstr "Unidad de organización"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-contact.c:151
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-msgid "Off"
-msgstr "Ofic"
-
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-contact.c:153
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titulación"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesión"
-
-#: addressbook/backend/ebook/e-card-simple.c:92
-msgid "Prof"
-msgstr "Prof"
+#: addressbook/backend/ebook/e-contact.c:154
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-contact.c:155
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Jefe"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-msgid "Man"
-msgstr "Jefe"
-
-#: addressbook/backend/ebook/e-card-simple.c:94
-msgid "Ass"
-msgstr "Asist"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Apodo"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-msgid "Nick"
-msgstr "Apodo"
-
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Cónyuge"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "URI de calendario"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "CALUri"
-msgstr "CALUri"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL de disponibilidad"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-msgid "FBUrl"
-msgstr "DISUrl"
+#: addressbook/backend/ebook/e-contact.c:156
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Secretario"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Default server calendar"
-msgstr "Servidor predeterminado de calendario"
+#. Web fields
+#: addressbook/backend/ebook/e-contact.c:159
+msgid "Homepage URL"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "icsCalendar"
-msgstr "icsCalendar"
+#: addressbook/backend/ebook/e-contact.c:160
+msgid "Weblog URL"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Aniversario"
+#. Photo/Logo
+#: addressbook/backend/ebook/e-contact.c:163
+#, fuzzy
+msgid "Photo"
+msgstr "Porto"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniv"
-msgstr "Aniv"
+#: addressbook/backend/ebook/e-contact.c:164
+#, fuzzy
+msgid "Logo"
+msgstr "Togo"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
-msgid "Birth Date"
-msgstr "Fecha de nacimiento"
+#: addressbook/backend/ebook/e-contact.c:168
+msgid "Category List"
+msgstr "Lista de categorías"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-contact.c:169
+#: addressbook/backend/ebook/e-contact.c:171
+#: calendar/gui/e-cal-list-view.etspec.h:1
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorías"
 
-#: addressbook/backend/ebook/e-card-simple.c:106
-msgid "Family Name"
-msgstr "Apellido"
-
-#: addressbook/backend/ebook/e-card-simple.c:335
-msgid "ECard"
-msgstr "ECard"
-
-#: addressbook/backend/ebook/e-card-simple.c:842
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
-msgid "Unnamed List"
-msgstr "Lista de anónimos"
-
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Dirección"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Etiqueta de dirección"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Teléfono"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Cumpleaños"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Unidad de organización"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: 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:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Transporte"
+#. Collaboration fields
+#: addressbook/backend/ebook/e-contact.c:175
+msgid "Calendar URI"
+msgstr "URI de calendario"
 
-#: addressbook/backend/ebook/e-card.c:1450
+#: addressbook/backend/ebook/e-contact.c:176
 msgid "Free/Busy URL"
 msgstr "URL de disponibilidad:"
 
-#: addressbook/backend/ebook/e-card.c:1457
+#: addressbook/backend/ebook/e-contact.c:177
 msgid "ICS Calendar"
 msgstr "Calendario ICS"
 
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Contactos relacionados:"
+#. Misc fields
+#: addressbook/backend/ebook/e-contact.c:180
+#, fuzzy
+msgid "Spouse's Name"
+msgstr "Cónyuge"
 
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Lista de categorías"
+#: addressbook/backend/ebook/e-contact.c:181
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Nota"
 
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Desea HTML"
+#: addressbook/backend/ebook/e-contact.c:183
+msgid "Birth Date"
+msgstr "Fecha de nacimiento"
 
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Desea página de códigos HTML"
+#: addressbook/backend/ebook/e-contact.c:184
+msgid "Anniversary"
+msgstr "Aniversario"
 
-#: addressbook/backend/ebook/e-card.c:1506
+#: addressbook/backend/ebook/e-contact.c:186 ui/evolution-calendar.xml.h:21
 msgid "List"
 msgstr "Lista"
 
-#: addressbook/backend/ebook/e-card.c:1513
+#: addressbook/backend/ebook/e-contact.c:187
 msgid "List Show Addresses"
 msgstr "Mostrar direcciones de la lista"
 
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Arbitrario"
+#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/util/eab-destination.c:675
+msgid "Unnamed List"
+msgstr "Lista de anónimos"
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Importador de LDIF de Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Último uso"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution LDIF importer factory"
+msgstr "Importador de LDIF de Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Usar puntuación"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:3
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:172
-msgid "Could not initialize Bonobo"
-msgstr "No se pudo inicializar Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Importador de VCard de Evolution."
 
-#: addressbook/backend/pas/pas-backend-file.c:464
-#: addressbook/backend/pas/pas-backend-ldap.c:3050
-msgid "Searching..."
-msgstr "Buscando..."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Importador de VCard de Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/backend/pas/pas-backend-file.c:466
+#: addressbook/backend/pas/pas-backend-file.c:399
+#: addressbook/backend/pas/pas-backend-vcf.c:102
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:598
+#: addressbook/backend/pas/pas-backend-file.c:401
+#: addressbook/backend/pas/pas-backend-ldap.c:2766
+#: addressbook/backend/pas/pas-backend-vcf.c:104
+msgid "Searching..."
+msgstr "Buscando..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:599
 msgid "Using Distinguished Name (DN)"
 msgstr "Usando nombre distintivo (ND)"
 
@@ -476,184 +542,86 @@ msgstr "Usando nombre distintivo (ND)"
 msgid "Using Email Address"
 msgstr "Usando dirección de correo"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:748
+#: addressbook/backend/pas/pas-backend-ldap.c:746
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconectando al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1291
-msgid "Adding card to LDAP server..."
+#: addressbook/backend/pas/pas-backend-ldap.c:1248
+#, fuzzy
+msgid "Adding contact to LDAP server..."
 msgstr "Añadiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1402
-msgid "Removing card from LDAP server..."
+#: addressbook/backend/pas/pas-backend-ldap.c:1337
+#, fuzzy
+msgid "Removing contact from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1638
-#: addressbook/backend/pas/pas-backend-ldap.c:1641
-msgid "Modifying card from LDAP server..."
+#: addressbook/backend/pas/pas-backend-ldap.c:1537
+#: addressbook/backend/pas/pas-backend-ldap.c:1540
+#, fuzzy
+msgid "Modifying contact from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2961
+#: addressbook/backend/pas/pas-backend-ldap.c:2689
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la búsqueda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3070
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Error performing search"
 msgstr "Error efectuando búsqueda"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Dirección de sincronización predeterminada:"
 
-#: addressbook/conduit/address-conduit.c:537
-msgid "Cursor could not be loaded\n"
-msgstr "No se pudo cargar el cursor\n"
-
-#: addressbook/conduit/address-conduit.c:550
-msgid "EBook not loaded\n"
-msgstr "EBook no cargado\n"
-
-#: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
-msgid "Could not start wombat server"
-msgstr "No se ha podido iniciar el servidor wombat"
-
-#: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
-msgid "Could not start wombat"
-msgstr "No se pudo inicializar wombat"
+#: addressbook/conduit/address-conduit.c:1150
+#: addressbook/conduit/address-conduit.c:1151
+#, fuzzy
+msgid "Could not load addressbook"
+msgstr "No se pudo cargar %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1407
-#: addressbook/conduit/address-conduit.c:1410
+#: addressbook/conduit/address-conduit.c:1214
+#: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de la Agenda del Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-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:2
-msgid "Directory Servers"
-msgstr "Servidores de directorio"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Control de configuración de la libreta de direcciones LDAP de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarjetas de la libreta de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de carpetas de la libreta de Evolution"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:625
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-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:579
-msgid "New Contact"
-msgstr "Contacto nuevo"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Create a new contact"
-msgstr "Crea un contacto nuevo"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "New Contact List"
-msgstr "Lista de contactos nueva"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:584
-msgid "Create a new contact list"
-msgstr "Crea una lista de contactos nueva"
-
-#: addressbook/gui/component/addressbook-config.c:206
+#: 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:231
+#: addressbook/gui/component/addressbook-config.c:230
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falló al autenticarse con el servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:259
+#: 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:682
+#: addressbook/gui/component/addressbook-config.c:681
 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:1193
+#: addressbook/gui/component/addressbook-config.c:1192
 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:1215
+#: addressbook/gui/component/addressbook-config.c:1214
 msgid "Error retrieving schema information"
 msgstr "Error al obtener información del esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1223
+#: addressbook/gui/component/addressbook-config.c:1222
 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:1637
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "Account Name"
 msgstr "Nombre de la cuenta"
 
-#: addressbook/gui/component/addressbook-config.c:1639
+#: addressbook/gui/component/addressbook-config.c:1638
 msgid "Server Name"
 msgstr "Nombre del servidor"
 
-#: addressbook/gui/component/addressbook-config.c:1676
+#: addressbook/gui/component/addressbook-config.c:1675
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP no fue activado en la compilación de Evolution"
 
@@ -661,7 +629,7 @@ msgstr "LDAP no fue activado en la compilación de Evolution"
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:494
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -669,7 +637,7 @@ 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:512
+#: addressbook/gui/component/addressbook.c:504
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -679,7 +647,7 @@ msgstr ""
 "que ha introducido una URI errónea, o que el servidor LDAP está\n"
 "caído"
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:509
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -691,7 +659,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:527
+#: addressbook/gui/component/addressbook.c:519
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -701,48 +669,48 @@ msgstr ""
 "que ha introducido una URI errónea, o que el servidor LDAP está\n"
 "caído"
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:539
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:607
+#: addressbook/gui/component/addressbook.c:599
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:644
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook.c:660
-#: addressbook/gui/component/addressbook.c:663
+#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:655
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:794
+#: addressbook/gui/component/addressbook.c:780
 msgid "Name begins with"
 msgstr "Nombre empieza con"
 
-#: addressbook/gui/component/addressbook.c:795
+#: addressbook/gui/component/addressbook.c:781
 msgid "Email begins with"
 msgstr "La dirección de correo comienza con"
 
-#: addressbook/gui/component/addressbook.c:796
+#: addressbook/gui/component/addressbook.c:782
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoría es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:797
+#: addressbook/gui/component/addressbook.c:783
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:798
+#: addressbook/gui/component/addressbook.c:784
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:955
+#: addressbook/gui/component/addressbook.c:930
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -755,7 +723,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: addressbook/gui/component/addressbook.c:961
+#: addressbook/gui/component/addressbook.c:936
 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"
@@ -770,82 +738,92 @@ msgstr ""
 "para esta libreta de \n"
 "direcciones."
 
-#: addressbook/gui/component/addressbook.c:967
+#: addressbook/gui/component/addressbook.c:942
 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:970
+#: addressbook/gui/component/addressbook.c:945
 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:974
+#: addressbook/gui/component/addressbook.c:948
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
+#: addressbook/gui/component/addressbook.c:1021
 #: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: addressbook/gui/component/addressbook.c:1145
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI que mostrará el visor de carpetas"
+#: addressbook/gui/component/addressbook.c:1102
+#, fuzzy
+msgid "URI of the contacts that the control will display"
+msgstr "La URI que mostrará la agenda"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Certificates"
+msgstr "ID del _certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
-#. * 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
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:184
-msgid "(none)"
-msgstr "(ninguno)"
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:478
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
-msgid "Primary Email"
-msgstr "Correo electrónico principal"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Directory Servers"
+msgstr "Servidores de directorio"
 
-#: addressbook/gui/component/e-address-popup.c:614
-msgid "Select an Action"
-msgstr "Seleccione una acción"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:622
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear un contacto nuevo «%s»"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr ""
+"Control de configuración de la libreta de direcciones LDAP de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:638
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Añadir dirección al contacto existente «%s»"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:917
-msgid "Querying Addressbook..."
-msgstr "Consultando la libreta de direcciones..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:392
-msgid "Edit Contact Info"
-msgstr "Editar información del contacto"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarjetas de la libreta de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:324
-msgid "Add to Contacts"
-msgstr "Añadir a contactos"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:1056
-msgid "Merge E-Mail Address"
-msgstr "Combinar direcciones de correo"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de carpetas de la libreta de Evolution"
 
-#: addressbook/gui/component/e-address-widget.c:369
-msgid "Disable Queries"
-msgstr "Deshabilitar consultas"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Control de preferencias de Evolution"
 
-#: addressbook/gui/component/e-address-widget.c:369
-msgid "Enable Queries (Dangerous!)"
-msgstr "Habilitar consultas (¡Peligroso!)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
@@ -866,9 +844,10 @@ msgstr " Mo_strar bases soportadas "
 #: calendar/gui/dialogs/alarm-options.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
-#: mail/message-tags.glade.h:1
+#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
@@ -906,7 +885,7 @@ msgstr "Añadir servidor LDAP"
 msgid "Addressbook Sources"
 msgstr "Fuentes de la libreta de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Siempre"
@@ -947,18 +926,22 @@ msgstr "Dirección de correo:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr ""
+"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-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"
+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:25
 msgid "Finished"
 msgstr "Terminar"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: smime/gui/smime-ui.glade.h:20
 msgid "General"
 msgstr "General"
 
@@ -966,7 +949,7 @@ msgstr "General"
 msgid "LDAP Configuration Assistant"
 msgstr "Asistente de configuración LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:64
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:74
 msgid "Never"
 msgstr "Nunca"
@@ -994,10 +977,9 @@ msgstr "Uno"
 msgid "S_earch scope: "
 msgstr "Ámbito de bú_squeda: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1714
-#: calendar/gui/e-week-view.c:1344
+#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:708
+#: calendar/gui/gnome-cal.c:587
 msgid "Searching"
 msgstr "Búsqueda"
 
@@ -1207,7 +1189,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 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:79
 msgid "U_se SSL/TLS:"
@@ -1221,7 +1204,7 @@ msgstr "Usando Nombre Distintivo (ND)"
 msgid "Using email address"
 msgstr "Usando dirección de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
 #: mail/mail-config.glade.h:128
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
@@ -1236,11 +1219,11 @@ msgstr "Límite de _descarga:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1280,50 +1263,55 @@ msgstr "General"
 msgid "searching-tab"
 msgstr "búsqueda"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la agenda de Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:450
+#: addressbook/gui/component/select-names/e-select-names-popup.c:212
+#: addressbook/gui/component/select-names/e-select-names.c:691
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:219
 msgid "View Contact List"
 msgstr "Ver lista de contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:219
 msgid "View Contact Info"
 msgstr "Ver información del contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:225
-#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+#: addressbook/gui/component/select-names/e-select-names-popup.c:226
+#: addressbook/gui/component/select-names/e-select-names-popup.c:336
 msgid "Send HTML Mail?"
 msgstr "¿Enviar correo en HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:350
+#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/widgets/eab-popup-control.c:1002
+msgid "Add to Contacts"
+msgstr "Añadir a contactos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:354
 msgid "Unnamed Contact"
 msgstr "Contacto anónimo"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:352
 #: 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:509
+#: addressbook/gui/component/select-names/e-select-names.c:504
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la Agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/e-select-names.c:647
 msgid "Find contact in"
 msgstr "Buscar contacto en"
 
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaz de selección de nombre de la agenda de Evolution"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Buscar"
@@ -1377,41 +1365,46 @@ msgid "Birthda_y:"
 msgstr "C_umpleaños:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "Blog address:"
+msgstr "Dirección de correo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "Business fa_x:"
 msgstr "Fa_x del trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr "Colaboración"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/e-contact-editor.c:1334
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1343
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "D_epartment:"
 msgstr "D_epartamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:199
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
 msgstr "URL de _disponibilidad:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File a_s:"
 msgstr "Guardar c_omo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -1421,106 +1414,111 @@ msgstr ""
 "agenda en Internet, escribe\n"
 "aquí la dirección de esa información."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "New phone type"
 msgstr "Nuevo tipo de teléfono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Organi_zation:"
 msgstr "Organi_zación:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "P_rofession:"
 msgstr "_Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Primary _email:"
 msgstr "Correo _electrónico principal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "S_pouse:"
 msgstr "_Cónyuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Add"
 msgstr "_Añadir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Business:"
 msgstr "_Trabajo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Categories..."
 msgstr "_Categorías..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3725
-#: mail/folder-browser.c:1812 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1321 calendar/gui/e-calendar-table.c:1010
+#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:679
+#: mail/mail-component.c:2094 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Home:"
 msgstr "_Domicilio"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Puesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's name:"
 msgstr "Nombre del _encargado:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Mobile:"
 msgstr "_Móvil:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "_Apodo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Public Calendar URL:"
 msgstr "URL de Calendario _público:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "Ésta es la dirección de _correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Dirección de la página _web:"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Dirección"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
-#: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:474
+#: addressbook/gui/widgets/e-minicard.c:182
 msgid "Editable"
 msgstr "Editable"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Estados Unidos"
 
@@ -1529,12 +1527,10 @@ msgid "Afghanistan"
 msgstr "Afganistán"
 
 #: 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:138
-#: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Argelia"
 
@@ -1563,7 +1559,6 @@ msgid "Antigua And Barbuda"
 msgstr "Antigua y Barbuda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:145
-#: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -1576,12 +1571,10 @@ msgid "Aruba"
 msgstr "Aruba"
 
 #: 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:149
-#: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Austria"
 
@@ -1590,12 +1583,10 @@ msgid "Azerbaijan"
 msgstr "Azerbayán"
 
 #: 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:152
-#: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrein"
 
@@ -1612,12 +1603,10 @@ msgid "Belarus"
 msgstr "Bielorrusia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Bélgica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
@@ -1634,7 +1623,6 @@ msgid "Bhutan"
 msgstr "Bhután"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:161
-#: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
@@ -1651,7 +1639,6 @@ msgid "Bouvet Island"
 msgstr "Isla Bouvet"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
@@ -1664,7 +1651,6 @@ msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:168
-#: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
@@ -1685,7 +1671,6 @@ msgid "Cameroon"
 msgstr "Camerún"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:173
-#: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canadá"
 
@@ -1694,7 +1679,6 @@ msgid "Cape Verde"
 msgstr "Cabo Verde"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:175
-#: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Islas Caimán"
 
@@ -1707,7 +1691,6 @@ msgid "Chad"
 msgstr "Chad"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
@@ -1716,7 +1699,6 @@ msgid "China"
 msgstr "China"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:180
-#: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Isla Christmas"
 
@@ -1725,7 +1707,6 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Isla Cocos (Keeling)"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombia"
 
@@ -1743,7 +1724,6 @@ msgid "Cook Islands"
 msgstr "Islas Cook"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
@@ -1752,27 +1732,22 @@ msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
 #: 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:190
-#: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
 #: 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:192
-#: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "República Checa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:193
-#: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dinamarca"
 
@@ -1785,7 +1760,6 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:196
-#: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
@@ -1794,17 +1768,14 @@ msgid "East Timor"
 msgstr "Timor Oriental"
 
 #: 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:199
-#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
@@ -1817,7 +1788,6 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonia"
 
@@ -1838,12 +1808,10 @@ msgid "Fiji"
 msgstr "Fiji"
 
 #: 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:209
-#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francia"
 
@@ -1868,12 +1836,10 @@ msgid "Gambia"
 msgstr "Gambia"
 
 #: 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:216
-#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemania"
 
@@ -1882,12 +1848,10 @@ msgid "Ghana"
 msgstr "Ghana"
 
 #: 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:219
-#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grecia"
 
@@ -1908,7 +1872,6 @@ msgid "Guam"
 msgstr "Guam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:224
-#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
@@ -1925,7 +1888,6 @@ msgid "Guyana"
 msgstr "Guyana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haití"
 
@@ -1938,27 +1900,22 @@ msgid "Holy See"
 msgstr "Holy See"
 
 #: 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:232
-#: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:233
-#: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungría"
 
 #: 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:235
-#: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
@@ -1967,7 +1924,6 @@ msgid "Indonesia"
 msgstr "Indonesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
@@ -1976,22 +1932,18 @@ msgid "Israel"
 msgstr "Israel"
 
 #: 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:240
-#: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japón"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
@@ -2012,7 +1964,6 @@ msgid "Korea, Republic Of"
 msgstr "República de Corea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
@@ -2029,7 +1980,6 @@ msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Líbano"
 
@@ -2038,7 +1988,6 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2047,12 +1996,10 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: 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:256
-#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
@@ -2085,7 +2032,6 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2110,7 +2056,6 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "México"
 
@@ -2135,7 +2080,6 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marruecos"
 
@@ -2160,7 +2104,6 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -2173,12 +2116,10 @@ msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
 #: 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:286
-#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2195,7 +2136,6 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Islas Norfolk"
 
@@ -2204,17 +2144,14 @@ msgid "Northern Mariana Islands"
 msgstr "Islas al Noreste de Mariana"
 
 #: 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:293
-#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Omán"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistán"
 
@@ -2227,7 +2164,6 @@ msgid "Palestinian Territory"
 msgstr "Territorios palestinos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panamá"
 
@@ -2236,12 +2172,10 @@ msgid "Papua New Guinea"
 msgstr "Papúa Nueva Guinea"
 
 #: 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:300
-#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Perú"
 
@@ -2254,22 +2188,18 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: 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:304
-#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
 #: 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:306
-#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Quatar"
 
@@ -2278,7 +2208,6 @@ msgid "Reunion"
 msgstr "Reunión"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Rumanía"
 
@@ -2315,7 +2244,6 @@ msgid "Sao Tome And Principe"
 msgstr "Santo Tomé y Príncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
@@ -2332,17 +2260,14 @@ msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
 #: 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:322
-#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Eslovenia"
 
@@ -2355,7 +2280,6 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Sudáfrica"
 
@@ -2364,7 +2288,6 @@ 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:328
-#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "España"
 
@@ -2385,7 +2308,6 @@ msgid "Sudan"
 msgstr "Sudán"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinám"
 
@@ -2398,17 +2320,14 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #: 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:337
-#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Suiza"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwán"
 
@@ -2445,7 +2364,6 @@ msgid "Tunisia"
 msgstr "Túnez"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turquía"
 
@@ -2466,7 +2384,6 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ucrania"
 
@@ -2475,7 +2392,6 @@ msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -2484,7 +2400,6 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2497,12 +2412,10 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: 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:360
-#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2523,12 +2436,10 @@ msgid "Western Sahara"
 msgstr "Sáhara occidental"
 
 #: 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:366
-#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
@@ -2540,48 +2451,49 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:156
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
-#: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
-#: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "Libro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:163
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:190
-msgid "Card"
-msgstr "Tarjeta"
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:189
+msgid "Contact"
+msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:170
-msgid "Is New Card"
-msgstr "Es tarjeta nueva"
+#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#, fuzzy
+msgid "Is New Contact"
+msgstr "Contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#: addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:219
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:827
+#: addressbook/gui/contact-editor/e-contact-editor.c:855
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:835
+#: addressbook/gui/contact-editor/e-contact-editor.c:863
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1009
+#: addressbook/gui/contact-editor/e-contact-editor.c:1034
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1055
+#: addressbook/gui/contact-editor/e-contact-editor.c:1074
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2589,7 +2501,7 @@ msgstr ""
 "¿Está seguro de que quiere\n"
 "borrar estos contactos?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1058
+#: addressbook/gui/contact-editor/e-contact-editor.c:1077
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2597,58 +2509,39 @@ msgstr ""
 "¿Seguro que quiere\n"
 "borrar este contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+msgid "Business"
+msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1781
+msgid "Home"
+msgstr "Domicilio"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+msgid "Other"
+msgstr "Otro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2284
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No se pudo encontrar el widget para el campo: «%s»"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
 msgid "_Full Name:"
 msgstr "Nombre _completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-_mail:"
 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:103
-msgid "card.vcf"
-msgstr "tarjeta.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:175
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:208
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ya existe\n"
-"¿Quiere sobreescribirlo?"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:212
-msgid "Overwrite"
-msgstr "Sobreescribir"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Dirección _2:"
@@ -2759,43 +2652,40 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
 msgstr "Editor de lista de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:272
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-msgid "Contact"
-msgstr "Contactos"
-
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un contacto duplicado"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Contacto nuevo:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Contacto original:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2803,15 +2693,15 @@ msgstr ""
 "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
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Contacto en conflicto"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2820,297 +2710,151 @@ msgstr ""
 "ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:156
-msgid "No cards"
-msgstr "Sin tarjetas"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Mostrar contactos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:159
-msgid "1 card"
-msgstr "1 tarjeta"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy
+msgid "1 contact"
+msgstr "Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:162
-#, c-format
-msgid "%d cards"
-msgstr "%d tarjetas"
+#: addressbook/gui/widgets/e-addressbook-model.c:154
+#, fuzzy, c-format
+msgid "%d contacts"
+msgstr "Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
-#: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
-#: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:184
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "Consulta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:457
+#: addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
 msgid "Model"
 msgstr "Modelo"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:531
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1183
-msgid "Success"
-msgstr "Éxito"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
-#: camel/providers/pop3/camel-pop3-store.c:526
-#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:38
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-msgid "Card not found"
-msgstr "Tarjeta no encontrada"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Card ID already exists"
-msgstr "Ya existe el ID de la tarjeta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-msgid "Protocol not supported"
-msgstr "Protocolo no implementado"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
-#: camel/providers/pop3/camel-pop3-store.c:520
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:44
-msgid "Authentication Failed"
-msgstr "Falló en la autenticación"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:45
-msgid "Authentication Required"
-msgstr "Autenticación Requerida"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:46
-msgid "TLS not Available"
-msgstr "TLS no Disponible"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:47
-msgid "Addressbook does not exist"
-msgstr "La libreta de direcciones no existe"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:48
-msgid "Other error"
-msgstr "Otro error"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:75
-msgid "Do you want to save changes?"
-msgstr "¿Desea guardar los cambios?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:77
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-msgid "Error adding list"
-msgstr "Error añadiendo lista"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
-msgid "Error adding card"
-msgstr "Error añadiendo tarjeta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:105
-msgid "Error modifying list"
-msgstr "Error modificando lista"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-msgid "Error removing list"
-msgstr "Error eliminando lista"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
-msgid "Error removing card"
-msgstr "Error eliminando tarjeta"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:197
-#, 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?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:328
-msgid "Move card to"
-msgstr "Mover tarjeta a"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:330
-msgid "Copy card to"
-msgstr "Copiar tarjeta a"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:333
-msgid "Move cards to"
-msgstr "Mover tarjetas a"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:335
-msgid "Copy cards to"
-msgstr "Copiar tarjetas a"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:517
-msgid "Multiple VCards"
-msgstr "VCards múltiples"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:525
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: addressbook/gui/widgets/e-addressbook-view.c:191
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:399
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:1654
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "New Contact..."
 msgstr "Contacto nuevo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "New Contact List..."
 msgstr "Lista de contactos nueva..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Go to Folder..."
 msgstr "Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Search for Contacts..."
 msgstr "Buscar contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Addressbook Sources..."
 msgstr "Fuentes de la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Pilot Settings..."
 msgstr "Configuración del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
 #: 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/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Print Envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Copy to folder..."
 msgstr "Copiar a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Move to folder..."
 msgstr "Mover a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:907
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:234 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
+#: addressbook/gui/widgets/e-addressbook-view.c:910 filter/libfilter-i18n.h:10
+#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3690
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: calendar/gui/e-cal-view.c:1255
 msgid "Current View"
 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:953
-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"
-
-#. 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:958
-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"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3125,87 +2869,50 @@ msgstr ""
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Assistant Phone"
-msgstr "Teléfono del secretario"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Business Phone"
-msgstr "Teléfono del trabajo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Business Phone 2"
-msgstr "Teléfono del trabajo 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Callback Phone"
-msgstr "Teléfono para devolución de llamadas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Car Phone"
-msgstr "Teléfono del coche"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-msgid "Company Phone"
-msgstr "Teléfono de la compañía"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Address"
-msgstr "Domicilio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone"
-msgstr "Teléfono de casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Home Phone 2"
-msgstr "Teléfono de casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Address"
-msgstr "Otra dirección"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Department"
+msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Other Phone"
-msgstr "Otro teléfono"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-contact-display.c:216
+#: addressbook/gui/widgets/eab-contact-display.c:217
+#: addressbook/gui/widgets/eab-contact-display.c:218
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Email"
+msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-msgid "Primary Phone"
-msgstr "Teléfono principal"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Free-busy URL"
+msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "y otras %d tarjetas."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Profession"
+msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "y una tarjeta más."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Guardar en la agenda de direcciones"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Web Site"
+msgstr "Sitio web"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard.c:145
 msgid "Width"
 msgstr "Ancho:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Height"
 msgstr "Alto:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard.c:160
 msgid "Has Focus"
 msgstr "Tiene el foco"
 
@@ -3225,11 +2932,11 @@ msgstr "Modelo del texto"
 msgid "Max field name length"
 msgstr "Longitud máx. del campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Ancho de columna"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
 "\n"
@@ -3243,7 +2950,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: addressbook/gui/widgets/e-minicard-view.c:144
+#: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
 "\n"
 "\n"
@@ -3253,18 +2960,285 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: addressbook/gui/widgets/e-minicard-view.c:457
+#: addressbook/gui/widgets/e-minicard-view.c:453
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard.c:169
+#: addressbook/gui/widgets/e-minicard.c:168
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/widgets/e-minicard.c:175
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
+#: addressbook/gui/widgets/eab-contact-display.c:93
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#, fuzzy
+msgid "Map It"
+msgstr "Mayport"
+
+#: addressbook/gui/widgets/eab-contact-display.c:198
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "List Members"
+msgstr "Miembros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:214
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#, fuzzy
+msgid "Job Title"
+msgstr "_Puesto:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:227
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "Home page"
+msgstr "Fax de casa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:228
+#: addressbook/gui/widgets/eab-contact-display.c:383
+#, fuzzy
+msgid "Blog"
+msgstr "Boloña"
+
+#: addressbook/gui/widgets/eab-gui-util.c:45
+#: shell/evolution-shell-component.c:1183
+msgid "Success"
+msgstr "Éxito"
+
+#: addressbook/gui/widgets/eab-gui-util.c:46
+#: calendar/cal-client/cal-client.c:3817
+#: camel/providers/imap/camel-imap-command.c:306
+#: camel/providers/imap/camel-imap-command.c:403
+#: camel/providers/pop3/camel-pop3-store.c:536
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: addressbook/gui/widgets/eab-gui-util.c:47
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#: addressbook/gui/widgets/eab-gui-util.c:48
+#: calendar/cal-client/cal-client.c:3799 shell/e-storage.c:587
+#: shell/evolution-shell-component.c:1213
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: addressbook/gui/widgets/eab-gui-util.c:49
+#, fuzzy
+msgid "Contact not found"
+msgstr "Tarjeta no encontrada"
+
+#: addressbook/gui/widgets/eab-gui-util.c:50
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Ya existe el ID de la tarjeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:51
+#: calendar/cal-client/cal-client.c:3805
+msgid "Protocol not supported"
+msgstr "Protocolo no implementado"
+
+#: addressbook/gui/widgets/eab-gui-util.c:52
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
+#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: camel/camel-service.c:772 camel/camel-service.c:856
+#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
+#: camel/providers/pop3/camel-pop3-store.c:530
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Authentication Failed"
+msgstr "Falló en la autenticación"
+
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Authentication Required"
+msgstr "Autenticación Requerida"
+
+#: addressbook/gui/widgets/eab-gui-util.c:55
+msgid "TLS not Available"
+msgstr "TLS no Disponible"
+
+#: addressbook/gui/widgets/eab-gui-util.c:56
+msgid "Addressbook does not exist"
+msgstr "La libreta de direcciones no existe"
+
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Other error"
+msgstr "Otro error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:84
+msgid "Do you want to save changes?"
+msgstr "¿Desea guardar los cambios?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:86
+msgid "_Discard"
+msgstr "_Descartar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:105
+msgid "Error adding list"
+msgstr "Error añadiendo lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:459
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Error añadiendo tarjeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:114
+msgid "Error modifying list"
+msgstr "Error modificando lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:114
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Error modificando tarjeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+msgid "Error removing list"
+msgstr "Error eliminando lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:417
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Error eliminando tarjeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Abrir %d tarjetas abrirá %d ventanas nuevas también.\n"
+"¿Quiere realmente mostrar todas estas tarjetas?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:232
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s ya existe\n"
+"¿Quiere sobreescribirlo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:236
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: addressbook/gui/widgets/eab-gui-util.c:272
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Error guardando %s: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:309
+msgid "card.vcf"
+msgstr "tarjeta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:378
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:514
+#, fuzzy
+msgid "Move contact to"
+msgstr "Mover tarjeta a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:516
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Copiar tarjeta a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:519
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Mover tarjetas a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:521
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Copiar tarjetas a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:710
+msgid "Multiple VCards"
+msgstr "VCards múltiples"
+
+#: addressbook/gui/widgets/eab-gui-util.c:718
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
+
+#.
+#. * 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
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:188
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:450
+msgid "Primary Email"
+msgstr "Correo electrónico principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:586
+msgid "Select an Action"
+msgstr "Seleccione una acción"
+
+#: addressbook/gui/widgets/eab-popup-control.c:594
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un contacto nuevo «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:610
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Añadir dirección al contacto existente «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:888
+msgid "Querying Addressbook..."
+msgstr "Consultando la libreta de direcciones..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:972
+msgid "Edit Contact Info"
+msgstr "Editar información del contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1027
+msgid "Merge E-Mail Address"
+msgstr "Combinar direcciones de correo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:140
+#, fuzzy, c-format
+msgid "and %d other contacts."
+msgstr "y otras %d tarjetas."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:142
+#, fuzzy
+msgid "and one other contact."
+msgstr "y una tarjeta más."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:225
+#: addressbook/gui/widgets/eab-vcard-control.c:275
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Mostrar _cabeceras completas"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:229
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Guardar contacto como VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:280
+msgid "Save in addressbook"
+msgstr "Guardar en la agenda de direcciones"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vista de la tarjeta"
@@ -3273,19 +3247,35 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
+#: addressbook/gui/widgets/test-reflow.c:106
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr ""
+
+#: addressbook/gui/widgets/test-reflow.c:109
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
-msgstr "Imprimir tarjetas"
+#: addressbook/printing/e-contact-print.c:1003
+#, fuzzy
+msgid "Print contacts"
+msgstr "Imprime los contactos seleccionados"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
-msgstr "Imprimir tarjeta"
+#: addressbook/printing/e-contact-print.c:1069
+#: addressbook/printing/e-contact-print.c:1096
+#, fuzzy
+msgid "Print contact"
+msgstr "Imprime los contactos seleccionados"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3384,7 +3374,6 @@ msgid "Orientation"
 msgstr "Orientación"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Página"
 
@@ -3456,157 +3445,329 @@ msgstr "Ancho:"
 msgid "_Font..."
 msgstr "_Tipografía..."
 
+#: addressbook/printing/test-contact-print-style-editor.c:53
+#, fuzzy
+msgid "Contact Print Style Editor Test"
+msgstr "Editor de listas de contactos"
+
+#: addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
+
+#: addressbook/printing/test-print.c:52
+#, fuzzy
+msgid "Contact Print Test"
+msgstr "_Lista de contactos"
+
+#: addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#, fuzzy
+msgid "Can not open file"
+msgstr "No se pudo abrir el mensaje"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Tarjeta no encontrada"
+
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "con todas las carpetas locales y remotas activas"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "tarjetas"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Error interno"
+
+#: addressbook/tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Error cargando la libreta predeterminada."
+
+#: addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Archivo de entrada"
+
+#: addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr "No ha especificado un nombre de archivo."
+
+#: calendar/cal-client/cal-client.c:3783
+#: shell/evolution-shell-component.c:1191
+msgid "Invalid argument"
+msgstr "Argumento inválido"
+
+#: calendar/cal-client/cal-client.c:3785
+msgid "Backend is busy"
+msgstr ""
+
+#: calendar/cal-client/cal-client.c:3787
+#, fuzzy
+msgid "Repository is offline"
+msgstr "Repositorio desconectado"
+
+#: calendar/cal-client/cal-client.c:3789
+#, fuzzy
+msgid "No such calendar"
+msgstr "No existe la carpeta %s"
+
+#: calendar/cal-client/cal-client.c:3791 calendar/cal-client/cal-client.c:3801
+#, fuzzy
+msgid "Object not found"
+msgstr "El objeto no pudo encontrarse\n"
+
+#: calendar/cal-client/cal-client.c:3793
+#, fuzzy
+msgid "Invalid object"
+msgstr "Propósito inválido"
+
+#: calendar/cal-client/cal-client.c:3795
+#, fuzzy
+msgid "URI not loaded"
+msgstr "EBook no cargado\n"
+
+#: calendar/cal-client/cal-client.c:3797
+msgid "URI already loaded"
+msgstr ""
+
+#: calendar/cal-client/cal-client.c:3803
+#, fuzzy
+msgid "Object ID already exists"
+msgstr "Ya existe el ID de la tarjeta"
+
+#: calendar/cal-client/cal-client.c:3807
+#, fuzzy
+msgid "Operation has been cancelled"
+msgstr "Operación cancelada"
+
+#: calendar/cal-client/cal-client.c:3809
+#, fuzzy
+msgid "Could not cancel operation"
+msgstr "Cancelar operación"
+
+#: calendar/cal-client/cal-client.c:3811
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Falló en la autenticación."
+
+#: calendar/cal-client/cal-client.c:3813
+#: camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Authentication required"
+msgstr "Autenticación requerida"
+
+#: calendar/cal-client/cal-client.c:3815
+msgid "A CORBA esception has occurred"
+msgstr ""
+
+#: calendar/cal-client/cal-client.c:3819 shell/e-storage.c:569
+msgid "No error"
+msgstr "Sin errores"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Cita sin título"
 
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
 msgid "1st"
 msgstr "1"
 
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:477
 msgid "2nd"
 msgstr "2"
 
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:477
 msgid "3rd"
 msgstr "3"
 
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:477
 msgid "4th"
 msgstr "4"
 
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:477
 msgid "5th"
 msgstr "5"
 
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
 msgid "6th"
 msgstr "6"
 
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:478
 msgid "7th"
 msgstr "7"
 
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:478
 msgid "8th"
 msgstr "8"
 
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:478
 msgid "9th"
 msgstr "9"
 
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:478
 msgid "10th"
 msgstr "10"
 
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
 msgid "11th"
 msgstr "11"
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:479
 msgid "12th"
 msgstr "12"
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:479
 msgid "13th"
 msgstr "13"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:479
 msgid "14th"
 msgstr "14"
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:479
 msgid "15th"
 msgstr "15"
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
 msgid "16th"
 msgstr "16"
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:480
 msgid "17th"
 msgstr "17"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:480
 msgid "18th"
 msgstr "18"
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:480
 msgid "19th"
 msgstr "19"
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:480
 msgid "20th"
 msgstr "20"
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
 msgid "21st"
 msgstr "21"
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:481
 msgid "22nd"
 msgstr "22"
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:481
 msgid "23rd"
 msgstr "23"
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:481
 msgid "24th"
 msgstr "24"
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:481
 msgid "25th"
 msgstr "25"
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
 msgid "26th"
 msgstr "26"
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:482
 msgid "27th"
 msgstr "27"
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4016 calendar/gui/print.c:482
 msgid "28th"
 msgstr "28"
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4017 calendar/gui/print.c:482
 msgid "29th"
 msgstr "29"
 
-#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4018 calendar/gui/print.c:482
 msgid "30th"
 msgstr "30"
 
-#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4019 calendar/gui/print.c:483
 msgid "31st"
 msgstr "31"
 
-#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/cal-util/cal-util.c:551 calendar/cal-util/cal-util.c:573
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/cal-util/cal-util.c:553 calendar/cal-util/cal-util.c:575
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/cal-util/cal-util.c:555 calendar/cal-util/cal-util.c:577
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/cal-util/cal-util.c:571
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -3614,13 +3775,18 @@ msgstr "Sin definir"
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
-msgid "Error while communicating with calendar server"
-msgstr "Error mientras me comunicaba con el servidor de agenda"
+#: calendar/conduits/calendar/calendar-conduit.c:1349
+#: calendar/conduits/todo/todo-conduit.c:887
+msgid "Could not start wombat server"
+msgstr "No se ha podido iniciar el servidor wombat"
+
+#: calendar/conduits/calendar/calendar-conduit.c:1350
+#: calendar/conduits/todo/todo-conduit.c:888
+msgid "Could not start wombat"
+msgstr "No se pudo inicializar wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1465
+#: calendar/conduits/calendar/calendar-conduit.c:1468
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
@@ -3628,74 +3794,32 @@ msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:975
+#: calendar/conduits/todo/todo-conduit.c:978
 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.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-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:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Componente calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración del Calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de menajes de horario del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visor del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de calendario/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visor de tareas de Evolution"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servicio de notificación por alarma del Calendario de Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Comenzando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Finalizando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "tiempo no válido"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Alarma de Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:366
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas en %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Cerrar"
 
@@ -3711,16 +3835,25 @@ msgstr "Tiempo de alarma zumbadora (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3732,7 +3865,7 @@ msgstr ""
 "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:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3749,10 +3882,18 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servicio de notificación por alarma del Calendario de Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:172
+msgid "Could not initialize Bonobo"
+msgstr "No se pudo inicializar Bonobo"
+
 #: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not initialize gnome-vfs"
 msgstr "No se pudo inicializar gnome-vfs"
@@ -3761,6 +3902,10 @@ msgstr "No se pudo inicializar gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+msgid "invalid time"
+msgstr "tiempo no válido"
+
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resumen contiene"
@@ -3773,231 +3918,93 @@ msgstr "La descripción contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:422
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Esta operación borrará permanentemente todos las tareas marcados como "
+"terminadas. Si continúa, no podrá recuperar esas tareas.\n"
+"\n"
+"¿Borrar realmente esas tareas?"
+
+#: calendar/gui/calendar-commands.c:428
+#, fuzzy
+msgid "Purge events older than"
+msgstr "devuelve menor que"
+
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "días"
+
+#: calendar/gui/calendar-commands.c:531
 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:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1440 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1363 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
+#: calendar/gui/calendar-commands.c:543
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
+#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
 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:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:564
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:834
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "No se pudo mostrar el agenda.  Por favor compruebe su ORBit y su OAF."
-
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1543
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1085
-msgid "Calendar"
-msgstr "Calendario"
-
-#: calendar/gui/calendar-component.c:71
-msgid "Folder containing appointments and events"
-msgstr "Carpeta conteniendo citas y eventos"
-
-#: calendar/gui/calendar-component.c:75
-msgid "Public Calendar"
-msgstr "Calendario público:"
-
-#: calendar/gui/calendar-component.c:76
-msgid "Public folder containing appointments and events"
-msgstr "Carpeta pública conteniendo citas y eventos"
-
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:644
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
-#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tareas"
-
-#: calendar/gui/calendar-component.c:81
-msgid "Folder containing to-do items"
-msgstr "Carpeta que contiene elementos por hacer"
-
-#: calendar/gui/calendar-component.c:85
-msgid "Public Tasks"
-msgstr "Tareas públicas"
-
-#: calendar/gui/calendar-component.c:86
-msgid "Public folder containing to-do items"
-msgstr "Carpeta pública conteniendo elementos por hacer"
-
-#: calendar/gui/calendar-component.c:732
-msgid "New appointment"
-msgstr "Nueva cita"
-
-#: calendar/gui/calendar-component.c:732
-msgid "_Appointment"
-msgstr "Cit_a"
-
-#: calendar/gui/calendar-component.c:733
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
-#: calendar/gui/calendar-component.c:737
-msgid "New meeting"
-msgstr "Reunión nueva"
-
-#: calendar/gui/calendar-component.c:737
-msgid "M_eeting"
-msgstr "R_eunión"
-
-#: calendar/gui/calendar-component.c:738
-msgid "Create a new meeting request"
-msgstr "Crear una nueva petición de reunión"
-
-#: calendar/gui/calendar-component.c:742
-msgid "New task"
-msgstr "Nueva tarea"
-
-#: calendar/gui/calendar-component.c:742
-msgid "_Task"
-msgstr "_Tarea"
-
-#: calendar/gui/calendar-component.c:743
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: calendar/gui/calendar-component.c:747
-msgid "New All Day Appointment"
-msgstr "Cita para todo el día"
-
-#: calendar/gui/calendar-component.c:747
-msgid "All _Day Appointment"
-msgstr "Cita de todo el _día"
+#: calendar/gui/calendar-component.c:160
+#, fuzzy
+msgid "New Calendar"
+msgstr "Nueva Caledonia"
 
-#: calendar/gui/calendar-component.c:748
-msgid "Create a new all-day appointment"
-msgstr "Crear una nueva cita para todo el día"
+#: calendar/gui/calendar-component.c:362
+msgid "On This Computer"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
+#. orange
+#: calendar/gui/calendar-component.c:370 calendar/gui/migration.c:122
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Sin comenzar"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "En proceso"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Terminado"
+#. red
+#: calendar/gui/calendar-component.c:377 filter/filter-label.c:122
+#: mail/mail-config.c:66 mail/mail-config.glade.h:129
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Trabajo"
 
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-offline-handler.c:190
+#, c-format
+msgid "backend_go_offline(): %s"
 msgstr ""
-"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:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2065
-#: mail/folder-browser.c:1774 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Repetición"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Asignado"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Sí"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "No"
+#: calendar/gui/calendar-offline-handler.c:212
+#, c-format
+msgid "backend_go_online(): %s"
+msgstr ""
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
@@ -4015,28 +4022,38 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Vista personalizada"
+
+#: calendar/gui/comp-editor-factory.c:451
 msgid "Error while opening the calendar"
 msgstr "Error al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Method not supported when opening the calendar"
 msgstr "Método no soportado al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:468
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir el calendario"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/comp-editor-factory.c:516
+#, c-format
+msgid "open_client(): %s"
+msgstr ""
+
+#: calendar/gui/control-factory.c:133
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:179
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará la agenda"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:186
 msgid "The type of view to show"
 msgstr "El tipo de vista a mostrar"
 
@@ -4092,11 +4109,7 @@ msgstr "Enviar a:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "días"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
 msgid "dialog1"
 msgstr "diálogo1"
 
@@ -4122,11 +4135,11 @@ msgstr "Bases"
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
@@ -4134,7 +4147,7 @@ msgstr "Reproducir un sonido"
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
@@ -4144,7 +4157,8 @@ msgstr "Envía un correo"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:166
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4226,8 +4240,8 @@ msgid "Days"
 msgstr "días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/e-itip-control.c:609
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4240,8 +4254,8 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/e-itip-control.c:605
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4250,8 +4264,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/e-itip-control.c:610
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4264,8 +4278,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/e-itip-control.c:604
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4282,8 +4296,8 @@ msgid "Task List"
 msgstr "Lista de tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/e-itip-control.c:608
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4300,8 +4314,8 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/e-itip-control.c:606
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4310,13 +4324,13 @@ msgid "W_eek starts:"
 msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/e-itip-control.c:607
 msgid "Wednesday"
 msgstr "Miércoles"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:41
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -4375,7 +4389,8 @@ msgstr "_Sáb"
 
 #: 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:"
@@ -4478,85 +4493,73 @@ msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
 msgid " (Due "
 msgstr " (Vence "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
 msgid "Due "
 msgstr "Vence "
 
-#: calendar/gui/dialogs/comp-editor.c:334
-msgid "Could not update invalid object"
-msgstr "No se pudo actualizar el objeto inválido"
-
-#: calendar/gui/dialogs/comp-editor.c:337
-msgid "Object not found, not updated"
-msgstr "Objeto no encontrado, no actualizado"
-
-#: calendar/gui/dialogs/comp-editor.c:340
-msgid "You don't have permissions to update this object"
-msgstr "No tiene permisos para actualizar este objeto"
-
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:336
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:793
-#: calendar/gui/dialogs/comp-editor.c:830
+#: calendar/gui/dialogs/comp-editor.c:787
+#: calendar/gui/dialogs/comp-editor.c:824
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:792
+#: calendar/gui/dialogs/comp-editor.c:829
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:801
-#: calendar/gui/dialogs/comp-editor.c:838
+#: calendar/gui/dialogs/comp-editor.c:795
+#: calendar/gui/dialogs/comp-editor.c:832
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:804
-#: calendar/gui/dialogs/comp-editor.c:841
+#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:835
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:815
-#: calendar/gui/dialogs/comp-editor.c:851
+#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:845
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3995
-#: calendar/gui/e-week-view.c:3934 composer/e-msg-composer.c:1169
+#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1033
+#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1171
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1383
-#: calendar/gui/dialogs/comp-editor.c:1407
-#: calendar/gui/dialogs/comp-editor.c:1433
+#: calendar/gui/dialogs/comp-editor.c:1378
+#: calendar/gui/dialogs/comp-editor.c:1402
+#: calendar/gui/dialogs/comp-editor.c:1428
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: calendar/gui/dialogs/comp-editor.c:1460
+#: calendar/gui/dialogs/comp-editor.c:1456
+#: calendar/gui/dialogs/comp-editor.c:1465
 msgid "Unable to obtain current version!"
 msgstr "Imposible obtener versión actual."
 
@@ -4602,53 +4605,58 @@ msgstr "¿Seguro que quiere borrar %d tareas?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Seguro que quiere borrar %d entradas del diario?"
 
-#: calendar/gui/dialogs/delete-error.c:50
+#: calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "El evento no pudo ser borrado debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "La tarea no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:59
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "La entrada del diario no pudo ser borrada debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "El elemento no pudo ser borrado debido a un error de corba"
 
-#: calendar/gui/dialogs/delete-error.c:66
+#: calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "El evento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:75
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "El elemento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:82
-msgid "The event could not be deleted because it was invalid"
-msgstr "El evento no pudo ser borrado  a causa de un estado inválido"
-
 #: calendar/gui/dialogs/delete-error.c:85
-msgid "The task could not be deleted because it was invalid"
-msgstr "La tarea no pudo ser borrada porque era inválida"
+#, fuzzy
+msgid "The event could not be deleted due to an error"
+msgstr "El evento no pudo ser borrado debido a un error de corba"
 
 #: calendar/gui/dialogs/delete-error.c:88
-msgid "The journal entry could not be deleted because it was invalid"
-msgstr "La entrada del diario no pudo ser borrada porque era inválida"
+#, fuzzy
+msgid "The task could not be deleted due to an error"
+msgstr "La tarea no pudo ser borrada debido a un error de corba"
 
 #: calendar/gui/dialogs/delete-error.c:91
-msgid "The item could not be deleted because it was invalid"
-msgstr "El elemento no pudo ser borrado porque era inválido"
+#, fuzzy
+msgid "The journal entry could not be deleted due to an error"
+msgstr "La entrada del diario no pudo ser borrada debido a un error de corba"
+
+#: calendar/gui/dialogs/delete-error.c:94
+#, fuzzy
+msgid "The item could not be deleted due to an error"
+msgstr "El elemento no pudo ser borrado debido a un error de corba"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4662,43 +4670,43 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunión"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:613
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:636
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:643
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
@@ -4717,14 +4725,15 @@ msgstr "Ca_tegorías..."
 
 #: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificación"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4750,7 +4759,6 @@ msgid "Pu_blic"
 msgstr "Pú_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Mostrar hora como"
 
@@ -4767,27 +4775,37 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2073
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:688
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1680
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Ninguno"
+
+#: calendar/gui/dialogs/meeting-page.c:417
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta por más tiempo."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:423
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "¡Esa persona ya está participando en la reunión!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:631
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participantes"
@@ -4823,14 +4841,15 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: 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-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4845,10 +4864,45 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:417
 msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
+#: calendar/gui/dialogs/new-calendar.c:47
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:58
+#, fuzzy
+msgid "Could not create directory for new calendar"
+msgstr "No se pudo crear el directorio %s: %s"
+
+#: calendar/gui/dialogs/new-calendar.c:134
+#, fuzzy
+msgid "A group must be selected"
+msgstr "Debe especificar un organizador."
+
+#: calendar/gui/dialogs/new-calendar.glade.h:2
+#, fuzzy
+msgid "<b>Calendar options</b>"
+msgstr "Información de calendario"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:3
+#, fuzzy
+msgid "Add New Calendar"
+msgstr "Nueva Caledonia"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "Error de iCalendar"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:5
+#, fuzzy
+msgid "Calendar Name"
+msgstr "Calendario"
+
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Está modificando un evento que se repite, ¿qué quiere modificar?"
@@ -4858,8 +4912,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -4873,51 +4929,51 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: calendar/gui/dialogs/recurrence-page.c:535
+#: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:809
+#: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición está equivocada"
 
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:927
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Otra fecha"
 
-#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1172
+#: calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1357
+#: calendar/gui/dialogs/recurrence-page.c:1365
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -4995,7 +5051,7 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1566
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1579
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
@@ -5013,62 +5069,91 @@ msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizad
 
 #: calendar/gui/dialogs/send-comp.c:68
 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:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 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"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Terminado"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Fecha de terminación:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
+#: calendar/gui/print.c:2318
+msgid "Completed"
+msgstr "Terminado"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+msgid "In Progress"
+msgstr "En proceso"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
+#: calendar/gui/print.c:2312
+msgid "Not Started"
+msgstr "Sin comenzar"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Fecha de terminación:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:192
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Dirección de la página _web:"
+
+#: calendar/gui/dialogs/task-editor.c:194
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:206
-#: calendar/gui/dialogs/task-editor.c:269
-#: calendar/gui/dialogs/task-editor.c:406
+#: calendar/gui/dialogs/task-editor.c:208
+#: calendar/gui/dialogs/task-editor.c:271
+#: calendar/gui/dialogs/task-editor.c:408
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:477
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:542
+#: calendar/gui/dialogs/task-page.c:537
 msgid "Due date is before start date!"
 msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Con_fidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripción:"
@@ -5081,223 +5166,405 @@ msgstr "Fecha de ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha de _vencimiento:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 día"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Acción a realizar desconocida"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes de comenzar la cita"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tras el comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s al comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de terminar a cita"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tras finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s al finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+msgid "Public"
+msgstr "Público"
+
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:382
+msgid "Private"
+msgstr "Privado"
+
+#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:383
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "Description"
+msgstr "Descripción:"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:13
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+msgid "Summary"
+msgstr "Resumen"
+
+#: calendar/gui/e-cal-list-view.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr " "
+
+#: calendar/gui/e-cal-list-view.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Cita"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-meeting-time-sel.c:399
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+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"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
+#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Sí"
+
+#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
+#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
+#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
+#: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1597 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: calendar/gui/e-cal-model.c:837
+msgid "Recurring"
+msgstr "Repetición"
+
+#: calendar/gui/e-cal-model.c:839
+msgid "Assigned"
+msgstr "Asignado"
+
+#: calendar/gui/e-cal-view.c:383 calendar/gui/e-calendar-table.c:1348
+msgid "Updating objects"
+msgstr "Actualizando objetos"
+
+#: calendar/gui/e-cal-view.c:729 calendar/gui/e-calendar-table.c:724
+msgid "Deleting selected objects"
+msgstr "Borrando los objetos seleccionados"
+
+#: calendar/gui/e-cal-view.c:1240 calendar/gui/e-cal-view.c:1329
+msgid "New _Appointment..."
+msgstr "Nueva cit_a..."
+
+#: calendar/gui/e-cal-view.c:1241 calendar/gui/e-cal-view.c:1331
+#: ui/evolution-calendar.xml.h:23
+msgid "New All Day _Event"
+msgstr "Nuevo _evento para todo el día"
+
+#: calendar/gui/e-cal-view.c:1242 calendar/gui/e-cal-view.c:1333
+msgid "New Meeting"
+msgstr "Nueva reunión"
+
+#: calendar/gui/e-cal-view.c:1243 calendar/gui/e-cal-view.c:1335
+msgid "New Task"
+msgstr "Tarea nueva"
+
+#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1274
+#: calendar/gui/e-cal-view.c:1341 calendar/gui/e-calendar-table.c:993
+#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "Im_primir..."
+
+#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1339 calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1325
+#: ui/evolution-calendar.xml.h:18
+msgid "Go to _Today"
+msgstr "Ir a _hoy"
+
+#: calendar/gui/e-cal-view.c:1258 calendar/gui/e-cal-view.c:1327
+msgid "_Go to Date..."
+msgstr "_Ir a una fecha..."
+
+#: calendar/gui/e-cal-view.c:1262 ui/evolution-calendar.xml.h:48
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicar la información de disponibilidad"
+
+#: calendar/gui/e-cal-view.c:1266 calendar/gui/e-cal-view.c:1345
+#: ui/evolution.xml.h:28
+msgid "_Settings..."
+msgstr "_Configuración..."
+
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
+#: mail/em-folder-view.c:656 shell/e-shortcuts-view.c:422
+#: ui/evolution-addressbook.xml.h:36
+msgid "_Open"
+msgstr "_Abrir"
+
+#: calendar/gui/e-cal-view.c:1273 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
+#: mail/em-folder-view.c:658 mail/em-popup.c:584 mail/em-popup.c:640
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Guardar _como..."
+
+#: calendar/gui/e-cal-view.c:1279 calendar/gui/e-cal-view.c:1319
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: 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-cal-view.c:1280 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
+#: mail/mail-component.c:2089 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: calendar/gui/e-cal-view.c:1285
+msgid "_Schedule Meeting..."
+msgstr "Concertar una _reunión"
+
+#: calendar/gui/e-cal-view.c:1286
+msgid "_Forward as iCalendar..."
+msgstr "Reenviar como i_Calendar"
+
+#: calendar/gui/e-cal-view.c:1291 calendar/gui/e-cal-view.c:1322
+msgid "Delete this _Occurrence"
+msgstr "Borrar esta _ocurrencia"
+
+#: calendar/gui/e-cal-view.c:1292 calendar/gui/e-cal-view.c:1323
+msgid "Delete _All Occurrences"
+msgstr "Borrar tod_as las ocurrencias"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2869
-#: calendar/gui/e-week-view.c:2021
-msgid "Deleting selected objects"
-msgstr "Borrando los objetos seleccionados"
-
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3707 mail/folder-browser.c:1785
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
-msgid "_Open"
-msgstr "_Abrir"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
-msgstr "_Guardar como..."
-
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3741
-#: calendar/gui/e-week-view.c:3682 calendar/gui/e-week-view.c:3709
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
-msgid "_Print..."
-msgstr "Im_primir..."
-
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3746
-#: calendar/gui/e-week-view.c:3714 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:965 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3715 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:16
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-day-view.c:3748 calendar/gui/e-week-view.c:3686
-#: calendar/gui/e-week-view.c:3716 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
-msgid "_Paste"
-msgstr "_Pegar"
+#: calendar/gui/e-calendar-table.c:991
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "_Abrir mensaje"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1006
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:8018
-#: calendar/gui/e-week-view.c:4431
-msgid "Updating objects"
-msgstr "Actualizando objetos"
-
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1431
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Terminado"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
 msgid "Complete"
 msgstr "Completo"
 
@@ -5305,14 +5572,10 @@ msgstr "Completo"
 msgid "Completion Date"
 msgstr "Fecha de terminación"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Fecha final"
-
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posición geográfica"
@@ -5321,29 +5584,23 @@ msgstr "Posición geográfica"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:750
-#: shell/e-shortcuts.c:1082
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
+#: calendar/gui/e-calendar-table.etspec.h:18
+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:180
+#: e-util/e-time-utils.c:393
 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:175
+#: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -5365,198 +5622,139 @@ msgstr "%02i divisiones por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1423
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1346
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
 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:269 calendar/gui/e-day-view.c:1456
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1379
 #: calendar/gui/e-week-view-main-item.c:339
 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:638 calendar/gui/e-week-view.c:359
-#: calendar/gui/print.c:809
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:325
+#: calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:362
-#: calendar/gui/print.c:811
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:328
+#: calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3696
-msgid "New _Appointment"
-msgstr "Nueva cit_a"
-
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3676
-msgid "New All Day _Event"
-msgstr "Nuevo _evento para todo el día"
-
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3677
-msgid "New Meeting"
-msgstr "Nueva reunión"
-
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3678
-msgid "New Task"
-msgstr "Tarea nueva"
-
-#: calendar/gui/e-day-view.c:3707 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3692
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
-
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3693
-msgid "_Go to Date..."
-msgstr "_Ir a una fecha..."
-
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3697
-#: ui/evolution-calendar.xml.h:34
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar la información de disponibilidad"
-
-#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3701
-#: ui/evolution.xml.h:60
-msgid "_Settings..."
-msgstr "_Configuración..."
-
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3708
-#: mail/folder-browser.c:1787 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: calendar/gui/e-day-view.c:3752 calendar/gui/e-week-view.c:3720
-msgid "_Schedule Meeting..."
-msgstr "Concertar una _reunión"
-
-#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3721
-msgid "_Forward as iCalendar..."
-msgstr "Reenviar como i_Calendar"
-
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3726
-msgid "Make this Occurrence _Movable"
-msgstr "Hacer esta ocurrencia _movible"
-
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3727
-msgid "Delete this _Occurrence"
-msgstr "Borrar esta _ocurrencia"
-
-#: calendar/gui/e-day-view.c:3760 calendar/gui/e-week-view.c:3728
-msgid "Delete _All Occurrences"
-msgstr "Borrar tod_as las ocurrencias"
+#: calendar/gui/e-itip-control.c:142
+#, c-format
+msgid "start_calendar_server(): %s"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:638
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:650
 msgid "Every day"
 msgstr "Cada día"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:652
 #, c-format
 msgid "Every %d days"
 msgstr "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:658
 msgid "Every week"
 msgstr "Cada semana"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:660
 #, c-format
 msgid "Every %d weeks"
 msgstr "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:663
 msgid "Every week on "
 msgstr "Cada semana en"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:665
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:673
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:680
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:693
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:698
 msgid "every month"
 msgstr "cada mes"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "every %d months"
 msgstr "Cada %d meses"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:709
 msgid "Every year"
 msgstr "Cada año"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:711
 #, c-format
 msgid "Every %d years"
 msgstr "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:723
 #, c-format
 msgid " a total of %d times"
 msgstr " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:732
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:756
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza con:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:766
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina: </b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:786
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:796
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
 msgid "iCalendar Information"
 msgstr "Información del agenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:848
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:968
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5564,338 +5762,329 @@ msgstr ""
 "<br> Por favor revise la siguiente información, y seleccione una acción del "
 "menú de abajo."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:983
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:994
 msgid "Location:"
 msgstr "Lugar:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:419
+#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:425 calendar/gui/itip-utils.c:451
+#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
+#: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
+#: calendar/gui/itip-utils.c:451
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:347
-#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1081
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
-#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
+#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
+#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1109
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1110
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1111
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1135
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1161
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
+#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1263
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1264
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1272
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1276
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1277
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1281
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1282
 msgid "Meeting Update Request"
 msgstr "Petición de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1289
 #, 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."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1290
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1297
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1298
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1407
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1306
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1331
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1336
 #, 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:1397
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1339
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1344
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1349
 msgid "Task Update Request"
 msgstr "Petición de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1357
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1364
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1365
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1373
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1393
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1398
 msgid "Free/Busy Request"
 msgstr "Petición de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1402
 #, 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."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1403
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1408
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1484
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1552
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1614
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
-msgid "Object is invalid and cannot be updated\n"
-msgstr "El objeto es inválido y no puede ser actualizado\n"
-
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
-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:1915 calendar/gui/e-itip-control.c:2007
-msgid "Object could not be found\n"
-msgstr "El objeto no pudo encontrarse\n"
-
-#: calendar/gui/e-itip-control.c:1918
-msgid "You do not have the right permissions to update the calendar\n"
-msgstr "No tiene permiso para actualizar el calendario\n"
+#: calendar/gui/e-itip-control.c:1853
+msgid "Calendar file could not be updated!\n"
+msgstr "El archivo del calendario no pudo ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1855
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1924
-msgid "Calendar file could not be updated!\n"
-msgstr "El archivo del calendario no pudo ser actualizado\n"
-
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
 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:1974
+#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+msgid "Object is invalid and cannot be updated\n"
+msgstr "El objeto es inválido y no puede ser actualizado\n"
+
+#: calendar/gui/e-itip-control.c:1911
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1923
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1942
+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:1945
+msgid "Object could not be found\n"
+msgstr "El objeto no pudo encontrarse\n"
+
+#: calendar/gui/e-itip-control.c:1948
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1951
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:1992
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2170
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta de Calendario"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2176
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta de Tareas"
 
@@ -5936,185 +6125,224 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-model.c:79
+#: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+#: calendar/gui/e-meeting-list-view.c:63
+#: calendar/gui/e-meeting-list-view.c:456 calendar/gui/e-meeting-model.c:78
+#: calendar/gui/e-meeting-model.c:1635
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-list-view.c:64 calendar/gui/e-meeting-model.c:79
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: calendar/gui/e-meeting-model.c:82
+#: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-model.c:192
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:525
+#: calendar/gui/e-meeting-model.c:750 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-model.c:194
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:751
+#: calendar/gui/e-meeting-store.c:92 calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-model.c:196
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:752
+#: calendar/gui/e-meeting-store.c:94 calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-model.c:198
+#: calendar/gui/e-meeting-model.c:215 calendar/gui/e-meeting-model.c:753
+#: calendar/gui/e-meeting-store.c:96 calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:766
+#: calendar/gui/e-meeting-store.c:125 calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Presidente"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:527
+#: calendar/gui/e-meeting-model.c:767 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:768
+#: calendar/gui/e-meeting-store.c:129 calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-model.c:233
+#: calendar/gui/e-meeting-model.c:250 calendar/gui/e-meeting-model.c:769
+#: calendar/gui/e-meeting-store.c:131 calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-model.c:279
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:795 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/e-meeting-store.c:183 calendar/gui/e-meeting-store.c:206
+#: calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/e-meeting-store.c:185 calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:291 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2060
 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:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 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:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Sin información"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:457
 msgid "Show _Only Working Hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Zoomed Out"
 msgstr "Mostrar quitando _ampliación"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
 msgstr "_Autoseleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:547
 msgid "_All People and Resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "Required People and _One Resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "Meeting _start time:"
 msgstr "Hora de _inicio de la reunión:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reunión:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2196
-#: calendar/gui/gnome-cal.c:2207
+#: calendar/gui/e-tasks.c:179
+#, fuzzy
+msgid "Start Date:"
+msgstr "Fecha de ini_cio:"
+
+#: calendar/gui/e-tasks.c:195
+#, fuzzy
+msgid "Due Date:"
+msgstr "Fecha de _vencimiento:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:223
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioridad:"
+
+#. URL
+#: calendar/gui/e-tasks.c:279
+#, fuzzy
+msgid "Web Page:"
+msgstr "Página"
+
+#: calendar/gui/e-tasks.c:715
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No se pudo cargar las tareas en «%s»"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:779
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar «%s» no está implementado"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1699
+#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "No tiene permiso para abrir la carpeta en «%s»"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1918
+#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6123,67 +6351,120 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:904
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:927
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:967
 msgid "Expunging"
 msgstr "Purgando"
 
-#: calendar/gui/e-week-view.c:3675
-msgid "New _Appointment..."
-msgstr "Nueva cit_a..."
+#: calendar/gui/e-tasks.c:1032
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
+#: calendar/importers/icalendar-importer.c:710
+#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Tareas"
 
-#: calendar/gui/gnome-cal.c:1671
+#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Calendario"
+
+#: calendar/gui/gnome-cal.c:1738
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/gnome-cal.c:1685
+#: calendar/gui/gnome-cal.c:1752
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir «%s» no está implementado"
 
-#: calendar/gui/gnome-cal.c:1746
+#: calendar/gui/gnome-cal.c:1809
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Añadir alarmas para %s"
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:2002
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"El soporte de calendario para\n"
+"El soporte de tareas para \n"
 "%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo."
+"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo otra vez."
 
-#: calendar/gui/gnome-cal.c:1947
+#: calendar/gui/gnome-cal.c:2010
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"El soporte de tareas para \n"
+"El soporte de calendario para\n"
 "%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo otra vez."
+"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo."
 
-#: calendar/gui/gnome-cal.c:2178
-#, c-format
-msgid "Opening calendar at %s"
-msgstr "Abriendo calendario en %s"
+#: calendar/gui/gnome-cal.c:2902
+#, fuzzy
+msgid "Purging"
+msgstr "Turín"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendario"
 
-#: calendar/gui/gnome-cal.c:2218
-msgid "Opening default tasks folder"
-msgstr "Abriendo carpeta de tareas predeterminada"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración del Calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de menajes de horario del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visor del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de calendario/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visor de tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componente calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Componente de Prueba de Evolution"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -6291,119 +6572,118 @@ msgstr "Información de disponibilidad (de %s a %s)"
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del evento."
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:557
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:557
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:557
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:557
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:558
 msgid "Th"
 msgstr "Ju"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:558
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:558
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1892
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1918
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
+#: calendar/gui/print.c:1925
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1929
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1937
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1944
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2269
 msgid "Task"
 msgstr "Tarea"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2328
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2345
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2383
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2394
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
+#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2566
 msgid "Print Item"
 msgstr "Imprimir elemento"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2639
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-control.c:152
+#: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
@@ -6451,15 +6731,15 @@ msgstr "Archivos iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Archivos vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:403
+#: calendar/importers/icalendar-importer.c:463
 msgid "Reminder!!"
 msgstr "¡¡Recuerde!!"
 
-#: calendar/importers/icalendar-importer.c:637
+#: calendar/importers/icalendar-importer.c:703
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:662
+#: calendar/importers/icalendar-importer.c:728
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6467,97 +6747,109 @@ msgstr ""
 "Evolution ha encontrado archivos de GNOME Calendar.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:669
+#: calendar/importers/icalendar-importer.c:735
 msgid "Gnome Calendar"
 msgstr "Calendario Gnome"
 
-#: calendar/pcs/cal-backend-file.c:316
+#: calendar/pcs/cal-backend-file.c:175
 msgid "Can't save calendar data: Malformed URI."
 msgstr "No se pudo guardar los datos del calendario. URL malformada."
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/cal-backend-object-sexp.c:50
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/cal-backend-object-sexp.c:74
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:318
+#: calendar/pcs/cal-backend-object-sexp.c:79
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/cal-backend-object-sexp.c:87
 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
+#: calendar/pcs/cal-backend-object-sexp.c:116
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/cal-backend-object-sexp.c:121
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:367
+#: calendar/pcs/cal-backend-object-sexp.c:128
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que el argumento 2 sea un entero"
 
-#: calendar/pcs/query.c:394
+#: calendar/pcs/cal-backend-object-sexp.c:155
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:399
+#: calendar/pcs/cal-backend-object-sexp.c:160
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/cal-backend-object-sexp.c:187
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:431
+#: calendar/pcs/cal-backend-object-sexp.c:192
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:467
+#: calendar/pcs/cal-backend-object-sexp.c:220
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:563
+#: calendar/pcs/cal-backend-object-sexp.c:280
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:568
+#: calendar/pcs/cal-backend-object-sexp.c:285
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:575
+#: calendar/pcs/cal-backend-object-sexp.c:292
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 2 sea time_t"
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/cal-backend-object-sexp.c:436
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:710
+#: calendar/pcs/cal-backend-object-sexp.c:441
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/cal-backend-object-sexp.c:448
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/cal-backend-object-sexp.c:465
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
-msgstr "contains? espera que el argumento 1 sea «any», «summary» ó «description»"
+msgstr ""
+"contains? espera que el argumento 1 sea «any», «summary» ó «description»"
+
+#: calendar/pcs/cal-backend-object-sexp.c:492
+#, fuzzy
+msgid "has-alarms? expects at least 1 argument"
+msgstr "has-categories? espera al menos 1 argumento"
+
+#: calendar/pcs/cal-backend-object-sexp.c:497
+#, fuzzy
+msgid "has-alarms? excepts argument to be a boolean"
+msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:776
+#: calendar/pcs/cal-backend-object-sexp.c:537
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: calendar/pcs/query.c:788
+#: calendar/pcs/cal-backend-object-sexp.c:549
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6565,26 +6857,18 @@ msgstr ""
 "has-categories ? espera que todos los argumentos sean cadenas o que uno y "
 "sólo uno de los argumentos sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:876
+#: calendar/pcs/cal-backend-object-sexp.c:629
 msgid "is-completed? expects 0 arguments"
 msgstr "¿esta terminado? espera 0 argumentos"
 
-#: calendar/pcs/query.c:921
+#: calendar/pcs/cal-backend-object-sexp.c:666
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? espera 1 argumento"
 
-#: calendar/pcs/query.c:926
+#: calendar/pcs/cal-backend-object-sexp.c:671
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? espera que el argumento 1 sea un 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"
-
-#: calendar/pcs/query.c:1483
-msgid "Parse error"
-msgstr "Error de análisis"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8114,27 +8398,27 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:92
 msgid "Signing is not supported by this cipher"
 msgstr "Este método de encriptación no soporta firmas"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:131
 msgid "Verifying is not supported by this cipher"
 msgstr "Este método de encriptación no soporta verificación"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:173
 msgid "Encryption is not supported by this cipher"
 msgstr "Este método de encriptación no soporta cifrado"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:212
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este método de cifrado"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:248
 msgid "You may not import keys with this cipher"
 msgstr "No puede importar claves con este método de cifrado"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:278
 msgid "You may not export keys with this cipher"
 msgstr "No puede exportar claves con este método de cifrado"
 
@@ -8173,7 +8457,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resincronizando con el servidor"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando carpeta «%s» para desconexión"
@@ -8194,57 +8482,57 @@ msgstr "Falló al crear pipe a «%s»: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Error al crear proceso hijo «%s»: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flujo de mensaje inválido recibido desde %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "No se pudo abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "No se pudo procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "No se pudo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falló en el mensaje %d de %d"
@@ -8284,39 +8572,44 @@ msgstr ""
 "Error ejecutando la búsqueda según la expresión %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:575 camel/camel-folder-search.c:603
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(coincidir con todas) requiere un único resultado booleano"
 
-#: camel/camel-folder-search.c:655
+#: 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
+#: camel/camel-folder.c:585
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operación no implementada: añadir mensaje: para %s"
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder.c:1163
 #, 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
+#: camel/camel-folder.c:1203
 #, 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
+#: camel/camel-folder.c:1321
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1321
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: camel/camel-gpg-context.c:762
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Obteniendo %d mensajes(s)"
+
+#: camel/camel-gpg-context.c:686
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8327,15 +8620,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:701
 msgid "Failed to parse gpg userid hint."
 msgstr "Falló al analizar el id del usuario gpg"
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:726
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falló al analizar la petición de contraseña gpg"
 
-#: camel/camel-gpg-context.c:810
+#: camel/camel-gpg-context.c:734
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8344,30 +8637,30 @@ msgstr ""
 "Necesita una contraseña para desbloquear la clave para \n"
 "el usuario «%s»"
 
-#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:745 camel/camel-gpg-context.c:1223
+#: camel/camel-gpg-context.c:1342 camel/camel-gpg-context.c:1427
+#: camel/camel-gpg-context.c:1497 mail/mail-send-recv.c:575
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: camel/camel-gpg-context.c:839
+#: camel/camel-gpg-context.c:763
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
 
-#: camel/camel-gpg-context.c:845
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del GNUPG: %s"
 
-#: camel/camel-gpg-context.c:857
+#: camel/camel-gpg-context.c:781
 msgid "No data provided"
 msgstr "No se proporcionaron datos"
 
-#: camel/camel-gpg-context.c:895
+#: camel/camel-gpg-context.c:819
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No se pudo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-gpg-context.c:1172
+#: camel/camel-gpg-context.c:1096
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8378,47 +8671,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1177
+#: camel/camel-gpg-context.c:1101
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Error al  GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1573
-#: camel/camel-gpg-context.c:1624
+#: camel/camel-gpg-context.c:1216 camel/camel-gpg-context.c:1545
+#: camel/camel-gpg-context.c:1596
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Error al ejecutar gpg: %s"
 
-#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1395
-#: camel/camel-gpg-context.c:1464 camel/camel-gpg-context.c:1494
-#: camel/camel-gpg-context.c:1520 camel/camel-gpg-context.c:1550
-#: camel/camel-gpg-context.c:1595 camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1334
+#: camel/camel-gpg-context.c:1420 camel/camel-gpg-context.c:1443
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1514
+#: camel/camel-gpg-context.c:1567 camel/camel-gpg-context.c:1618
 msgid "Failed to execute gpg."
 msgstr "Falló al ejecutar gpg."
 
-#: camel/camel-gpg-context.c:1380
+#: camel/camel-gpg-context.c:1257
+msgid "This is a digitally signed message part"
+msgstr "Esta parte del mensaje está firmada digitalmente"
+
+#: camel/camel-gpg-context.c:1319
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "No se pudo verificar la firma del mensaje: no pude crear un archivo "
 "temporal: %s"
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-gpg-context.c:1522
+#, fuzzy
+msgid "Unable to parse message content"
+msgstr "No se pudo obtener los mensajes del editor"
+
+#: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "No se pudo crear un conducto(pipe) para la ayuda: %s"
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock-client.c:113
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "No se pudo hacer un bifurcar del ayudante de bloqueo: %s"
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "No se pudo bloquear «%s»"
@@ -8431,7 +8733,8 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8497,23 +8800,15 @@ msgstr "Error escribiendo en el archivo temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:224 camel/camel-multipart-encrypted.c:239
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Falló al descifrar la parte MIME: error del protocolo"
 
-#: camel/camel-multipart-encrypted.c:287
+#: camel/camel-multipart-encrypted.c:252
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Falló al descifrar la parte MIME: estructura inválida"
 
-#: camel/camel-multipart-encrypted.c:327
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Falló al descifrar la parte MIME: error de análisis"
-
-#: camel/camel-multipart-signed.c:644
-msgid "This is a digitally signed message part"
-msgstr "Esta parte del mensaje está firmada digitalmente"
-
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:685
 msgid "parse error"
 msgstr "error de análisis"
 
@@ -8534,19 +8829,19 @@ msgstr "No se pudo cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "No se pudo cagar %s: No hay código de inicialización en el módulo."
 
-#: camel/camel-sasl-anonymous.c:33
+#: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: camel/camel-sasl-anonymous.c:35
+#: camel/camel-sasl-anonymous.c:37
 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."
 
-#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Falló en la autenticación."
 
-#: camel/camel-sasl-anonymous.c:119
+#: camel/camel-sasl-anonymous.c:121
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -8555,7 +8850,7 @@ msgstr ""
 "Dirección de correo errónea información de ayuda:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:131
+#: camel/camel-sasl-anonymous.c:133
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -8564,7 +8859,7 @@ msgstr ""
 "Información opaca de seguimiento inválida:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:143
+#: camel/camel-sasl-anonymous.c:145
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -8607,7 +8902,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8615,7 +8911,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -8676,7 +8973,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -8693,7 +8991,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1217
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -8751,23 +9049,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Esta opción autorizará conexiones POP antes de intentar SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "URI de la fuente POP"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
 
@@ -8776,55 +9074,55 @@ msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falló la compilación de la expresión regular: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:278
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL «%s» necesita un componente de nombre de usuario"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:286
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL «%s» necesita un componente hospedador"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:294
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL «%s» necesita un componente de ruta"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:739
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:770 camel/camel-service.c:894
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:791 camel/camel-service.c:915
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "La resolución del host ha fallado: no se puede crear el thread: %s"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:804
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:807
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: razón desconocida"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:861
 msgid "Resolving address"
 msgstr "Resolviendo dirección"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:930
 msgid "Host lookup failed: host not found"
 msgstr "Error al resolver: servidor no encontrado"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:933
 msgid "Host lookup failed: unknown reason"
 msgstr "Error al resolver: razón desconocida"
 
@@ -8836,12 +9134,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo «%s»"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8850,168 +9148,189 @@ msgstr ""
 "No se pudo crear el directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:171
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Por favor introduzca su contraseña para %s"
+#: camel/camel-smime-context.c:158
+#, fuzzy, c-format
+msgid "Enter security pass-phrase for `%s'"
+msgstr "Introduzca su contraseña para %s"
 
-#: 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:431
+#, fuzzy
+msgid "Unverified"
+msgstr "Sin definir"
 
-#: 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."
+#: camel/camel-smime-context.c:433
+#, fuzzy
+msgid "Good signature"
+msgstr "Editar firma"
 
-#: 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»."
+#: camel/camel-smime-context.c:435
+#, fuzzy
+msgid "Bad signature"
+msgstr "Editar firma"
 
-#: 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»."
+#: camel/camel-smime-context.c:437
+msgid "Content tampered with or altered in transit"
+msgstr ""
 
-#: camel/camel-smime-context.c:554
-msgid "Failed to find a common bulk algorithm."
-msgstr "Error al buscar un algoritmo de volumen común."
+#: camel/camel-smime-context.c:439
+#, fuzzy
+msgid "Signing certificate not found"
+msgstr "Certificado autofirmado en cadena"
 
-#: camel/camel-smime-context.c:808
-msgid "Failed to decode message."
-msgstr "Error al decodificar el mensaje."
+#: camel/camel-smime-context.c:441
+#, fuzzy
+msgid "Signing certificate not trusted"
+msgstr "Certificado sin confianza"
 
-#: camel/camel-smime-context.c:853
-msgid "Failed to verify certificates."
-msgstr "Error al verificar el certificado."
+#: camel/camel-smime-context.c:443
+msgid "Signature algorithm unknown"
+msgstr ""
+
+#: camel/camel-smime-context.c:445
+msgid "Siganture algorithm unsupported"
+msgstr ""
+
+#: camel/camel-smime-context.c:447
+#, fuzzy
+msgid "Malformed signature"
+msgstr "Guardar firma"
 
-#: camel/camel-store.c:215
+#: camel/camel-smime-context.c:449
+#, fuzzy
+msgid "Processing error"
+msgstr "Error de análisis"
+
+#: camel/camel-smime-context.c:578
+#, fuzzy, c-format
+msgid "Signer: %s <%s>: %s\n"
+msgstr "Servidor: %s, Tipo: %s"
+
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "No se pudo obtener el certificado del emisor."
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "No se pudo obtener la Lista de Revocación de Certificados"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "No se pudo descifrar la firma del certificado"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "No se pudo decodificar la clave pública del emisor"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Falló en la firma del certificado"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Fallo en la firma de la lista de revocación de certificados"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Certificado aún no válido"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "El certificado ha caducado"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL todavía no válido"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "La CRL ha caducado"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Error en CRL"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Fuera de memoria"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Certificado de profundidad cero autofirmado"
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Certificado autofirmado en cadena"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "No se pudo obtener el certificado del emisor localmente"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "No se pudo verificar la hoja de la firma."
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Cadena de certificados demasiado larga"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Certificado revocado"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Autoridad certificadora inválida (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Longitud de ruta excedida"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Propósito inválido"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Incoherencia Asunto/Emisor"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "No coincide AKID/SKID "
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "Las series AKID/Issuer no coinciden"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "El uso de la clave no soporta firmado de certificados"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Error en la verificación de la aplicación"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9024,15 +9343,15 @@ msgstr ""
 "Huella:        %s\n"
 "Firma:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "BAD"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9052,7 +9371,7 @@ msgstr ""
 "¿Quiere aceptarlo de todos modos?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9067,7 +9386,7 @@ msgstr ""
 "\n"
 "¿Quiere aceptar?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9076,7 +9395,7 @@ msgstr ""
 "Problema del certificado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9085,7 +9404,7 @@ msgstr ""
 "Dominio del certificado erróneo: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9094,7 +9413,7 @@ msgstr ""
 "Certificado caducado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9103,22 +9422,22 @@ msgstr ""
 "Lista de revocación de certificados caducada: %s\n"
 "Emisor: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:290 mail/mail-tools.c:146
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "No se pudo analizar la URL «%s»"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error guardando «%s»: %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
@@ -9145,12 +9464,12 @@ msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2816
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2819
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -9189,38 +9508,38 @@ msgstr "La respuesta del servidor IMAP no contenía información de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No se pudo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No se pudo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 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:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1885
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: 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:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9229,24 +9548,24 @@ msgstr ""
 "No se pudo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:1945
-#: camel/providers/imap/camel-imap-folder.c:2541
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2205
-#: camel/providers/imap/camel-imap-folder.c:2275
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2579
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -9294,87 +9613,115 @@ 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"
+msgstr ""
+"Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Comprobar el correo _automáticamente cada"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Contraseña"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 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
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:184
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:582
+#: camel/providers/imap/camel-imap-store.c:602
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS no Disponible"
+
+#: camel/providers/imap/camel-imap-store.c:599
+#: camel/providers/imap/camel-imap-store.c:831
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:194
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:696
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
-#: camel/providers/pop3/camel-pop3-store.c:220
+#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/pop3/camel-pop3-store.c:230
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada"
 
-#: camel/providers/imap/camel-imap-store.c:681
-#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/pop3/camel-pop3-store.c:271
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:834
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "No se pudo conectar con %s (puerto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1247
 #, 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:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:495
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticación %s no está implementado"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s Por favor escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1294
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1323
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9385,43 +9732,72 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1670
+#: camel/providers/imap/camel-imap-store.c:1812
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2013
 #, 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»."
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2025
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2061
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Almacenamiento del mensaje"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "No se pudo conectar con el servidor POP: %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Envía un mensaje al contacto"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:382
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "buzón: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:393
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9477,50 +9853,54 @@ msgid ""
 "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."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La dirección %s no es absoluta"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 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:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No se pudo acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 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:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No se pudo renombrar: «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No se pudo borrar el resumen la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No se pudo borrar el índice de la carpeta «%s»: %s"
@@ -9534,18 +9914,18 @@ msgstr "No se pudo guardar el resumen: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No se pudo añadir mensajes al resumen: razón desconocida"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Mensaje añadido al Maildir cancelado"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
@@ -9561,7 +9941,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9624,29 +10004,29 @@ msgstr "Comprobando si hay mensajes nuevos"
 msgid "Storing folder"
 msgstr "Guardando carpeta"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No se pudo crear un bloqueo de carpetas en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No se pudo abrir el buzón: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Adición de mensaje cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9655,15 +10035,15 @@ msgstr ""
 "No se pudo obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falló la construcción del mensaje: ¿Buzón corrompido?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9672,7 +10052,16 @@ msgstr ""
 "No se pudo abrir el archivo «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"No se pudo crear el directorio %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9681,14 +10070,15 @@ msgstr ""
 "No se pudo crear el archivo «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "«%s» no es un archivo normal."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9697,11 +10087,36 @@ msgstr ""
 "No se pudo borrar la carpeta «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta «%s» no esta vacía. No fue borrada."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "No se pudo crear una carpeta con ese nombre"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "No se pudo crear el directorio %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "No se pudo acceder a la carpeta: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "El nombre de carpeta especificado no es valido: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9731,7 +10146,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "No se pudo abrir el archivo de correo temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No se pudo cerrar la carpeta origen %s: %s"
@@ -9741,46 +10156,46 @@ msgstr "No se pudo cerrar la carpeta origen %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "No se pudo cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1891
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No se pudo cambiar el nombre a la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "No se pudo almacenar carpeta:: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, 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:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
 
 #
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Adición de mensaje en el MH cancelada"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta mh: %s: %s"
@@ -9860,6 +10275,67 @@ msgstr ""
 "No se pudo sincronizar la carpeta de correo %s: %s\n"
 "La carpeta puede estar corrupta, copia guardada en «%s»"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%s Por favor escriba la contraseña SMTP para %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Falló al conectarse al servidor LDAP."
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "No se pudo obtener mensaje %s: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Usuario cancelado"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "No se pudo obtener grupo: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Noticias USENET"
@@ -9868,22 +10344,22 @@ msgstr "Noticias USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No se pudo leer saludo desde %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "El servidor NNTP %s devolvió un código de error %d %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9891,37 +10367,37 @@ msgstr ""
 "Esta opción es para autenticarse con el servidor NNTP usando una contraseña "
 "de texto."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "No se pudo obtener grupo: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "El comando NNTP ha fallado: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Buscando mensajes nuevos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Respuesta del servidor desconocida: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Usar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operación falló: %s"
@@ -9930,13 +10406,6 @@ msgstr "Operación falló: %s"
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: 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:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9946,34 +10415,22 @@ msgstr "No se pudo obtener el sumario POP: %s"
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, 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:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: 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 se pudo obtener mensaje %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Almacenamiento del mensaje"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Dejar mensajes en el servidor"
@@ -10013,25 +10470,25 @@ msgstr ""
 "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:187
+#: camel/providers/pop3/camel-pop3-store.c:197
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "No se pudo conectar al servidor POP %s (puerto %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:219
-#: camel/providers/pop3/camel-pop3-store.c:248
-#: camel/providers/pop3/camel-pop3-store.c:260
+#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:258
+#: camel/providers/pop3/camel-pop3-store.c:270
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "No se pudo conectar al servidor POP %s en modo seguro: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:368
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "No se pudo conectar con el servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:399
-#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:519
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10040,28 +10497,29 @@ msgstr ""
 "No se pudo conectar con el servidor POP %s: \n"
 "No hay soporte para el sistema de autenticación pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:425
 #, 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"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "No se pudo autenticarme en el servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:468
+#: camel/providers/pop3/camel-pop3-store.c:478
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s Por favor escriba la contraseña POP para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:523
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:540
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10070,7 +10528,7 @@ msgstr ""
 "No se pudo conectar con el servidor POP %s.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:629
+#: camel/providers/pop3/camel-pop3-store.c:639
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
@@ -10084,7 +10542,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10136,140 +10595,139 @@ msgstr "SMTP"
 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parámetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: 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>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: 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:199
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Acción solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: 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>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: 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:207
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Falló en la transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Es necesaria una transición de contraseña"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Falló temporal en la autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
-msgid "Authentication required"
-msgstr "Autenticación requerida"
-
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:308
 msgid "Welcome response error"
 msgstr "Error en la respuesta de bienvenida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:391
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor SMTP %s en modo seguro: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:353
 msgid "server does not appear to support SSL"
 msgstr "el servidor no parece soportar SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Petición STARTTLS expiró: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:382
 msgid "STARTTLS response error"
 msgstr "Error de respuesta en STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s"
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:523
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s Por favor escriba la contraseña SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:542
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10280,87 +10738,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:675
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:695
 msgid "Cannot send message: sender address not valid."
 msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:700 mail/mail-ops.c:635
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Cannot send message: no recipients defined."
 msgstr "No se pudo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No se pudo enviar el mensaje: uno o más destinatarios inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:889
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:938
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Expiró el tiempo para la petición HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:960
 msgid "HELO response error"
 msgstr "Error en la respuesta a HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 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
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1061
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para la petición AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 msgid "AUTH request failed."
 msgstr "Error en la petición de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1131
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1156
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para la petición MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1176
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1200
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para la petición RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1222
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falló RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1261
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
@@ -10368,37 +10826,37 @@ 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:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1281
 msgid "DATA response error"
 msgstr "DATA respondió con un error"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: camel/providers/smtp/camel-smtp-transport.c:1345
 #, 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1365
 msgid "DATA termination response error"
 msgstr "Error de respuesta en la terminación DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1388
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para la petición RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1408
 msgid "RSET response error"
 msgstr "Error en respuesta RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1431
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Expiró el tiempo para la petición QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1451
 msgid "QUIT response error"
 msgstr "Respuesta de error a QUIT"
 
@@ -10417,20 +10875,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:313 mail/mail-display.c:226
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:445
 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:481
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:482
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -10462,11 +10919,14 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr "Necesita una cuenta para enviar correo."
+#: composer/e-msg-composer-hdrs.c:289
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Necesita configurar una cuenta para\n"
+"antes de poder escribir mensajes de correo."
 
-#: composer/e-msg-composer-hdrs.c:483
+#: composer/e-msg-composer-hdrs.c:482
 msgid "Click here for the address book"
 msgstr "Pulse aquí para acceder a la agenda"
 
@@ -10477,45 +10937,45 @@ msgstr "Pulse aquí para acceder a la agenda"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:514
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:520
+#: composer/e-msg-composer-hdrs.c:519
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:526
+#: composer/e-msg-composer-hdrs.c:525
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:534
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:538
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:539
 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:543
+#: composer/e-msg-composer-hdrs.c:542
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:543
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10526,24 +10986,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:551
+#: composer/e-msg-composer-hdrs.c:550
 msgid "Post To:"
 msgstr "Publicar A:"
 
-#: composer/e-msg-composer-hdrs.c:553
+#: composer/e-msg-composer-hdrs.c:552
 msgid "Posting destination"
 msgstr "Publicar destino"
 
-#: composer/e-msg-composer-select-file.c:102
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/e-msg-composer.c:540
-msgid "Could not create a PGP signature context"
-msgstr "No se pudo crear un contexto de firma PGP."
-
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10552,30 +11007,30 @@ msgstr ""
 "Error leyendo el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1182
+#: composer/e-msg-composer.c:1186
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿quiere sobreescribirlo?"
 
-#: composer/e-msg-composer.c:1200
+#: composer/e-msg-composer.c:1197 composer/e-msg-composer.c:1213
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1223
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1261
+#: composer/e-msg-composer.c:1274
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1269
+#: composer/e-msg-composer.c:1282
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1289
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10584,7 +11039,7 @@ msgstr ""
 "No se pudo buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10593,7 +11048,7 @@ msgstr ""
 "No se pudo truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1305
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10602,7 +11057,7 @@ msgstr ""
 "No se pudo copiar el descriptor de archivo:  %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1301
+#: composer/e-msg-composer.c:1314
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10611,7 +11066,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1398
+#: composer/e-msg-composer.c:1411
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10619,7 +11074,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1574
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10630,28 +11085,28 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1570
+#: composer/e-msg-composer.c:1583
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1615
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:2026
+#: composer/e-msg-composer.c:2034
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2066 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2074 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: composer/e-msg-composer.c:2242 composer/e-msg-composer.c:2911
-#: composer/e-msg-composer.c:2912
+#: composer/e-msg-composer.c:2254 composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2951
 msgid "Compose a message"
 msgstr "Redactar un mensaje"
 
-#: composer/e-msg-composer.c:2943
+#: composer/e-msg-composer.c:2982
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10659,7 +11114,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:3010
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10671,7 +11126,7 @@ msgstr ""
 "Por favor, asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:3038
+#: composer/e-msg-composer.c:3080
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10679,17 +11134,18 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4064
+#: composer/e-msg-composer.c:4090
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "La herramienta de trabajo en grupo Evolution"
 
-#: data/evolution.desktop.in.h:2
+#: data/evolution.desktop.in.in.h:2
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
@@ -10854,7 +11310,7 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
@@ -10876,87 +11332,87 @@ 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:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. 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:195
 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:200
 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:211
 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:215
 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:220
 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:225
 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:230
 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:235
 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:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 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:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 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:356
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -11066,12 +11522,12 @@ msgstr "Elija un archivo"
 msgid "Then"
 msgstr "Entonces"
 
-#: filter/filter-folder.c:155
+#: filter/filter-folder.c:153
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1510 mail/mail-account-gui.c:1524
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -11084,32 +11540,20 @@ msgstr ""
 "Error en la expresión regular «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Importante"
 
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "Trabajo"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Privado"
-
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
 #: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
+#: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Más tarde"
 
@@ -11276,217 +11720,217 @@ 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"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 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/em-folder-view.c:687
+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 "acaba en"
+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 "Reproducir un sonido:"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Seguimiento"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+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 "Respondió 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"
+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:1822
-msgid "Label"
-msgstr "Etiquetar"
+msgid "Source Account"
+msgstr "Cuenta origen"
 
-#: 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/em-format-html.c:1369 mail/em-format.c:678
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+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 "Reproducir un sonido:"
+msgid "does not contain"
+msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-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 "Respondió 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 "acaba en"
 
 #: 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:184 filter/score-rule.c:186
-#: 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:1820
-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 "Cuenta origen"
+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:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-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-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:921
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "El nombre de la regla «%s» no es único, elija otro"
@@ -11503,7 +11947,7 @@ msgstr "Añadir regla"
 msgid "Edit Rule"
 msgstr "Editar regla"
 
-#: filter/rule-editor.c:691
+#: filter/rule-editor.c:692
 msgid "Rule name"
 msgstr "Nombre de la regla:"
 
@@ -11511,515 +11955,666 @@ msgstr "Nombre de la regla:"
 msgid "Score Rules"
 msgstr "Reglas de puntuación"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:207
 msgid "You must name this vfolder."
 msgstr "Debes dar un nombre a esta carpeta virtual."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:221
 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:531
+#: filter/vfolder-rule.c:534
 msgid "VFolder source"
 msgstr "Origen de la carpeta virtual"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution está importando su correo antiguo de Elm"
+#: mail/em-account-prefs.c:233
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Seguro que quiere borrar esta cuenta?"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Importando..."
+#: mail/em-account-prefs.c:241
+msgid "Don't delete"
+msgstr "No borrar"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Por favor espere"
+#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
+#: mail/em-account-prefs.c:397 mail/em-composer-prefs.c:675
+#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
+msgid "Disable"
+msgstr "Desactivar"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importando %s como %s"
+#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
+#: mail/em-account-prefs.c:399 mail/em-composer-prefs.c:675
+#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
+msgid "Enable"
+msgstr "Habilitar"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Guardando %s"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:439
+msgid "[Default]"
+msgstr "[Predeterminada]"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
-msgid "Mail"
-msgstr "Correo"
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: mail/em-account-prefs.c:487 mail/em-composer-prefs.c:708
+#: mail/em-composer-prefs.c:854
+msgid "Enabled"
+msgstr "Habilitada"
+
+#: mail/em-account-prefs.c:493
+msgid "Account name"
+msgstr "Nombre de la cuenta"
+
+#: mail/em-account-prefs.c:495
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
+#: mail/mail-config.c:1246
+msgid "Unnamed"
+msgstr "Sin nombre"
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
+#: mail/em-composer-prefs.c:334
+msgid "You must specify a valid script name."
+msgstr "Por favor especifique un nombre válido de guión"
+
+#: mail/em-composer-prefs.c:392 mail/em-composer-prefs.c:454
+msgid "[script]"
+msgstr " [guión]"
+
+#: mail/em-composer-prefs.c:858
+msgid "Language(s)"
+msgstr "Idioma(s)"
+
+#: mail/em-composer-prefs.c:900
+msgid "Add script signature"
+msgstr "Añadir script de firma"
+
+#: mail/em-composer-prefs.c:920
+msgid "Signature(s)"
+msgstr "Firma(s)"
+
+#. FIXME: this wording sucks
+#: mail/em-composer-utils.c:117
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"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 ""
-"Evolution ha encontrado archivos de correo de Elm\n"
-"¿Quiere importarlos a Evolution?"
+"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"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/em-composer-utils.c:129
+msgid "Send anyway?"
+msgstr "¿Enviar de todos modos?"
 
-#: importers/evolution-gnomecard-importer.c:246
+#: mail/em-composer-utils.c:150
 msgid ""
-"Evolution has found GnomeCard files.\n"
-"Would you like them to be imported into Evolution?"
+"This message has no subject.\n"
+"Really send?"
 msgstr ""
-"Evolution ha encontrado archivos de GnomeCard.\n"
-"¿Quiere importarlos a Evolution?"
-
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Filtro de prioridad: «%s»"
+"Este mensaje no tiene asunto.\n"
+"¿Quiere enviarlo?"
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
+#: mail/em-composer-utils.c:176
 msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Algunos de sus filtros de correo de Netscape se basan\n"
-"en prioridades de correo, las cuales no se se usan en Evolution.\n"
-"En su lugar Evolution proporciona puntuaciones en el rango de\n"
-"-3 a 3 que pueden ser asignadas a los mensajes 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"
-"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."
+"Dado que la lista de contactos a la que estas enviado está configurada para "
+"esconder la lista de direcciones, este mensaje sólo contendrá destinatarios "
+"Cco."
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
+#: mail/em-composer-utils.c:180
+msgid "This message contains only Bcc recipients."
+msgstr "Este mensaje solo contiene destinatarios Cco."
+
+#: mail/em-composer-utils.c:185
 msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
 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."
+"Es posible que el servidor de correo revele los destinatarios añadiendo una "
+"cabecera Apparently-To.\n"
+"¿Enviar de todos modos?"
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
+#: mail/em-composer-utils.c:329
+msgid "You must specify recipients in order to send this message."
+msgstr "Debes especificar destinatarios para poder enviar el mensaje."
+
+#: mail/em-composer-utils.c:566
 msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 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."
+"No se pudo abrir la carpeta de borradores para esta cuenta.\n"
+"¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution está importando su información antigua de Netscape"
+#: mail/em-folder-browser.c:128
+msgid "Create _Virtual Folder From Search..."
+msgstr "Crear una carpeta _virtual de la búsqueda..."
 
-#. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Papelera"
+#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Correo"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Examinando filtros de correo"
+#: mail/em-folder-selection-button.c:66
+#: shell/evolution-folder-selector-button.c:100
+msgid "<click here to select a folder>"
+msgstr "<pinche aquí para seleccionar una carpeta>"
 
-#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Analizando el directorio"
+#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "«%s» en «%s»..."
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
-msgid "Starting import"
-msgstr "Comenzando a importar"
+#: mail/em-folder-selector.c:267
+#, fuzzy
+msgid "Folder _name"
+msgstr "_Nombre de la carpeta:"
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
-msgid "Settings"
-msgstr "Configuración"
+#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
+#: mail/mail-component.c:1638 mail/mail-component.c:1649
+#: shell/e-shell-importer.c:1061
+msgid "Select folder"
+msgstr "Seleccionar carpeta"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
-msgid "Mail Filters"
-msgstr "Filtros de correo"
+#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
+#: mail/em-folder-view.c:657 mail/em-popup.c:583
+msgid "_Edit as New Message..."
+msgstr "_Editar como un mensaje nuevo..."
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution ha encontrado archivos de correo de Netscape.\n"
-"¿Quiere importarlos a Evolution?"
+#: mail/em-folder-view.c:659
+msgid "_Print"
+msgstr "Im_primir"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
-msgid "Evolution is importing your old Pine data"
-msgstr "Evolution está importando su información antigua de Pine"
+#: mail/em-folder-view.c:662 ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Responder al _remitente"
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution ha encontrado archivos de correo de Pine.\n"
-"¿Quiere importarlos a Evolution?"
+#: mail/em-folder-view.c:663 mail/em-popup.c:644
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Responder a la _lista"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
-msgid "Pine"
-msgstr "Pine"
+#: mail/em-folder-view.c:664 mail/em-popup.c:645
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Responder a _todos"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
+#: mail/em-folder-view.c:665 mail/em-popup.c:647
+msgid "_Forward"
+msgstr "Reen_viar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-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/em-folder-view.c:668
+msgid "Follo_w Up..."
+msgstr "_Seguimiento..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
+#: mail/em-folder-view.c:669
+msgid "Fla_g Completed"
+msgstr "Ma_rcar como terminado"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
+#: mail/em-folder-view.c:670
+msgid "Cl_ear Flag"
+msgstr "_Quitar marca"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
+#: mail/em-folder-view.c:673 ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Mar_car como leído"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuración de cuentas de correo de Evolution"
+#: mail/em-folder-view.c:674
+msgid "Mark as _Unread"
+msgstr "Marcar como _no leído"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution."
+#: mail/em-folder-view.c:675
+msgid "Mark as _Important"
+msgstr "Marcar como _importante"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution."
+#: mail/em-folder-view.c:676
+msgid "_Mark as Unimportant"
+msgstr "Marcar como no im_portante"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuración del redactor de correo de Evolution."
+#: mail/em-folder-view.c:680
+msgid "U_ndelete"
+msgstr "_Recuperar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Interfaz de configuración del correo de Evolution"
+#: mail/em-folder-view.c:683
+msgid "Mo_ve to Folder..."
+msgstr "Mo_ver a la carpeta..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Componente del visor de carpetas de correo de Evolution"
+#: mail/em-folder-view.c:684 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Copiar a la carpeta..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
+#: mail/em-folder-view.c:692
+msgid "Add Sender to Address_book"
+msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
+#: mail/em-folder-view.c:695
+msgid "Appl_y Filters"
+msgstr "Aplicar _filtros"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
+#: mail/em-folder-view.c:698
+msgid "Crea_te Rule From Message"
+msgstr "Crear re_gla desde el mensaje"
 
-#: mail/component-factory.c:117
-msgid "Folder containing mail"
-msgstr "Carpeta conteniendo correo"
+#: mail/em-folder-view.c:699
+msgid "VFolder on _Subject"
+msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/component-factory.c:118
-msgid "Public Mail"
-msgstr "Correo público"
+#: mail/em-folder-view.c:700
+msgid "VFolder on Se_nder"
+msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/component-factory.c:118
-msgid "Public folder containing mail"
-msgstr "Carpeta pública conteniendo correo"
+#: mail/em-folder-view.c:701
+msgid "VFolder on _Recipients"
+msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash"
-msgstr "Papelera virtual"
+#: mail/em-folder-view.c:702
+msgid "VFolder on Mailing _List"
+msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash folder"
-msgstr "Carpetas de papelera virtuales"
+#: mail/em-folder-view.c:706
+msgid "Filter on Sub_ject"
+msgstr "Filtro según el _asunto"
 
-#: mail/component-factory.c:147
-msgid "This folder cannot contain messages."
-msgstr "Esta carpeta no contiene mensajes."
+#: mail/em-folder-view.c:707
+msgid "Filter on Sen_der"
+msgstr "Filtro según el _remitente"
 
-#: mail/component-factory.c:441
-msgid "Properties..."
-msgstr "Propiedades..."
+#: mail/em-folder-view.c:708
+msgid "Filter on Re_cipients"
+msgstr "Filtro según los _destinatarios"
 
-#: mail/component-factory.c:441
-msgid "Change this folder's properties"
-msgstr "Cambiar las propiedades de esta carpeta"
+#: mail/em-folder-view.c:709
+msgid "Filter on _Mailing List"
+msgstr "Filtro según la lista de _correo"
 
-#: mail/component-factory.c:823
-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."
+#. default charset used in mail view
+#: mail/em-folder-view.c:1473 mail/em-folder-view.c:1511
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Predeterminado"
 
-#: mail/component-factory.c:1004
-msgid "You have not set a mail transport method"
-msgstr "No ha definido un sistema para enviar el correo"
+#: mail/em-folder-view.c:1545
+msgid "Print Message"
+msgstr "Imprimir mensaje"
 
-#: mail/component-factory.c:1027
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
+#: mail/em-folder-view.c:1786
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "Copiar dirección del enlace"
 
-#: mail/component-factory.c:1067
-msgid "New Mail Message"
-msgstr "Mensaje de correo nuevo"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:343
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Coincide:"
 
-#: mail/component-factory.c:1067
-msgid "_Mail Message"
-msgstr "_Mensaje de correo"
+#: mail/em-format-html-display.c:638
+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."
 
-#: mail/component-factory.c:1068
-msgid "Compose a new mail message"
-msgstr "Redactar mensaje nuevo"
+#: mail/em-format-html-display.c:728
+#, fuzzy
+msgid "_View Inline"
+msgstr "Ver incluido"
 
-#: mail/component-factory.c:1076
-msgid "New Message Post"
-msgstr "Publicar anuncio nuevo"
+#: mail/em-format-html-display.c:729
+#, fuzzy
+msgid "_Hide"
+msgstr "Ocultar"
 
-#: mail/component-factory.c:1076
-msgid "_Post Message"
-msgstr "_Publicar mensaje"
+#: mail/em-format-html-print.c:99
+#, c-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
 
-#: mail/component-factory.c:1077
-msgid "Post a new mail message"
-msgstr "Publicar un mensaje nuevo"
+#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Obteniendo mensaje %s"
 
-#: mail/component-factory.c:1369
-msgid "Connecting..."
-msgstr "Conectando..."
+#: mail/em-format-html.c:708
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/component-factory.c:1380
-msgid "Cannot register storage with shell"
-msgstr "No se pudo registrar un sistema de guardado con la shell"
+#: mail/em-format-html.c:738
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/folder-browser-ui.c:486
+#: mail/em-format-html.c:749
 #, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para «%s»"
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Puntero a archivo local (%s) valido en «%s»"
 
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Propiedades"
+#: mail/em-format-html.c:751
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Puntero a archivo local (%s)"
 
-#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
+#: mail/em-format-html.c:772
 #, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No se pudo crear el directorio temporal: %s"
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/folder-browser.c:804
+#: mail/em-format-html.c:783
 #, c-format
-msgid "%d new"
-msgstr "%d nuevos"
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+
+#: mail/em-format-html.c:905 mail/em-format.c:1219
+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 "
+"autenticidad."
 
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
+#: mail/em-format-html.c:906 mail/em-format.c:1217
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Este mensaje está firmado digitalmente y es auténtico."
 
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d ocultos"
+#: mail/em-format-html.c:930 mail/em-format.c:1190
+msgid "No signature present"
+msgstr ""
 
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d visibles"
+#: mail/em-format-html.c:932 mail/em-format.c:1192
+#, fuzzy
+msgid "Session not initialised"
+msgstr "No se pudo inicializar Bonobo"
 
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d seleccionado"
+#: mail/em-format-html.c:943 mail/em-format.c:1203
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schema no soportado"
 
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr "%d sin enviar"
+#: mail/em-format-html.c:992
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/folder-browser.c:823
+#: mail/em-format-html.c:1079
+#, fuzzy
+msgid "Formatting message"
+msgstr "Moviendo mensajes"
+
+#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1356 mail/em-format.c:674
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "A"
+
+#: mail/em-format-html.c:1360 mail/em-format.c:676
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1362 mail/em-format.c:677
+msgid "Bcc"
+msgstr "Cco"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1408
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1411
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Fecha"
+
+#: mail/em-format.c:893
 #, c-format
-msgid "%d sent"
-msgstr "%d enviar"
+msgid "%s attachment"
+msgstr "%s adjunto"
+
+#: mail/em-format.c:1259
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#: mail/em-popup.c:593
+msgid "Save As..."
+msgstr "Guardar como..."
+
+#: mail/em-popup.c:641
+msgid "Set as _Background"
+msgstr ""
+
+#: mail/em-popup.c:643
+#, fuzzy
+msgid "_Reply to sender"
+msgstr "Responder al _remitente"
+
+#: mail/em-popup.c:680
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "Abrir enlace en el Navegador"
+
+#: mail/em-popup.c:681
+#, fuzzy
+msgid "Se_nd message to..."
+msgstr "Enviar un _mensaje a la lista..."
 
-#: mail/folder-browser.c:825
+#: mail/em-popup.c:682
+#, fuzzy
+msgid "_Add to Addressbook"
+msgstr "Añadir remitente a la agenda"
+
+#: mail/em-popup.c:788
 #, c-format
-msgid "%d total"
-msgstr "%d total"
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
 
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr "Crear una carpeta _virtual de la búsqueda..."
+#: mail/em-subscribe-editor.c:579
+#, fuzzy
+msgid "This store does not support subscriptions, or the are not enabled."
+msgstr "Este servidor no soporta el esquema de información LDAPv3"
 
-#: mail/folder-browser.c:1758
-msgid "VFolder on _Subject"
-msgstr "Carpeta virtual según el a_sunto"
+#: mail/em-subscribe-editor.c:608
+#, fuzzy
+msgid "Subscribed"
+msgstr "Suscribir"
 
-#: mail/folder-browser.c:1759
-msgid "VFolder on Se_nder"
-msgstr "Carpeta virtual según el re_mitente"
+#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Carpeta"
 
-#: mail/folder-browser.c:1760
-msgid "VFolder on _Recipients"
-msgstr "Carpeta virtual según los des_tinatarios"
+#. FIXME: This is just to get the shadow, is there a better way?
+#: mail/em-subscribe-editor.c:799
+msgid "Please select a server."
+msgstr "Por favor seleccione un servidor."
 
-#: mail/folder-browser.c:1761
-msgid "VFolder on Mailing _List"
-msgstr "Carpeta virtual según la li_sta de correo"
+#: mail/em-subscribe-editor.c:820
+msgid "No server has been selected"
+msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/folder-browser.c:1765
-msgid "Filter on Sub_ject"
-msgstr "Filtro según el _asunto"
+#: mail/em-utils.c:88
+msgid "Don't show this message again."
+msgstr "No mostrar otra vez este mensaje."
 
-#: mail/folder-browser.c:1766
-msgid "Filter on Sen_der"
-msgstr "Filtro según el _remitente"
+#: mail/em-utils.c:270
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Error cargando la información del filtro:\n"
+"%s"
 
-#: mail/folder-browser.c:1767
-msgid "Filter on Re_cipients"
-msgstr "Filtro según los _destinatarios"
+#: mail/em-utils.c:279
+msgid "Filters"
+msgstr "Filtros"
 
-#: mail/folder-browser.c:1768 mail/folder-browser.c:2092
-msgid "Filter on _Mailing List"
-msgstr "Filtro según la lista de _correo"
+#: mail/em-utils.c:486
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Mensaje reenviado"
 
-#: mail/folder-browser.c:1786
-msgid "_Edit as New Message..."
-msgstr "_Editar como un mensaje nuevo..."
+#: mail/em-utils.c:1039
+msgid "an unknown sender"
+msgstr "un remitente desconocido"
 
-#: mail/folder-browser.c:1788
-msgid "_Print"
-msgstr "Im_primir"
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-utils.c:1049
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
 
-#: mail/folder-browser.c:1792 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "Responder al _remitente"
+#: mail/em-utils.c:1325
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"No se pudo obtener el mensaje; «%s»\n"
+"  %s"
 
-#: mail/folder-browser.c:1793 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Responder a la _lista"
+#: mail/em-utils.c:1330
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"«%s» ya existe\n"
+"¿Quiere sobreescribirlo?"
 
-#: mail/folder-browser.c:1794 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Responder a _todos"
+#: mail/em-utils.c:1373
+#, fuzzy
+msgid "message"
+msgstr "Mensaje"
 
-#: mail/folder-browser.c:1795
-msgid "_Forward"
-msgstr "Reen_viar"
+#: mail/em-utils.c:1430
+#, fuzzy
+msgid "Save Message..."
+msgstr "Guardar mensaje como..."
 
-#: mail/folder-browser.c:1799
-msgid "Follo_w Up..."
-msgstr "_Seguimiento..."
+#: mail/em-utils.c:1893 mail/mail-component.c:495
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No se pudo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:1800
-msgid "Fla_g Completed"
-msgstr "Ma_rcar como terminado"
+#: mail/em-utils.c:2211
+msgid ""
+"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"
+"\n"
+"¿Borrar realmente esos mensajes?"
 
-#: mail/folder-browser.c:1801
-msgid "Cl_ear Flag"
-msgstr "_Quitar marca"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
 
-#. separator here?
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Mar_car como leído"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+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/folder-browser.c:1806
-msgid "Mark as _Unread"
-msgstr "Marcar como _no leído"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
 
-#: mail/folder-browser.c:1807
-msgid "Mark as _Important"
-msgstr "Marcar como _importante"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquí"
 
-#: mail/folder-browser.c:1808
-msgid "_Mark as Unimportant"
-msgstr "Marcar como no im_portante"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correo de Evolution"
 
-#: mail/folder-browser.c:1813
-msgid "U_ndelete"
-msgstr "_Recuperar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentas de correo de Evolution"
 
-#: mail/folder-browser.c:1817
-msgid "Mo_ve to Folder..."
-msgstr "Mo_ver a la carpeta..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente de correo de Evolution."
 
-#: mail/folder-browser.c:1818 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Redactor de correo de Evolution."
 
-#: mail/folder-browser.c:1826
-msgid "Add Sender to Address_book"
-msgstr "Añadir remitente a la li_breta de direcciones"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de correo de Evolution."
 
-#: mail/folder-browser.c:1830
-msgid "Appl_y Filters"
-msgstr "Aplicar _filtros"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Componente del visor de carpetas de correo de Evolution"
 
-#: mail/folder-browser.c:1834
-msgid "Crea_te Rule From Message"
-msgstr "Crear re_gla desde el mensaje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
 
-#: mail/folder-browser.c:2093
-msgid "VFolder on M_ailing List"
-msgstr "Carpeta virtual según la _lista de correo"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
 
-#: mail/folder-browser.c:2095
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution está importando su correo antiguo de Elm"
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr "Importando..."
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Por favor espere"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
 #, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filtrar según la _lista de correo (%s)"
+msgid "Importing %s as %s"
+msgstr "Importando %s como %s"
 
-#: mail/folder-browser.c:2096
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
 #, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Carpeta virtual según la li_sta de correo (%s)"
+msgid "Scanning %s"
+msgstr "Guardando %s"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Predeterminado"
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Elm\n"
+"¿Quiere importarlos a Evolution?"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Obteniendo información de la carpeta"
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12049,6 +12644,117 @@ msgstr "Outlook Express 4 (.mbx)"
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution."
 
+#: mail/importers/netscape-importer.c:75
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Filtro de prioridad: «%s»"
+
+#: mail/importers/netscape-importer.c:663
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+"Algunos de sus filtros de correo de Netscape se basan\n"
+"en prioridades de correo, las cuales no se se usan en Evolution.\n"
+"En su lugar Evolution proporciona puntuaciones en el rango de\n"
+"-3 a 3 que pueden ser asignadas a los mensajes 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"
+"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."
+
+#: mail/importers/netscape-importer.c:687
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"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."
+
+#: mail/importers/netscape-importer.c:704
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+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."
+
+#: mail/importers/netscape-importer.c:1237
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution está importando su información antigua de Netscape"
+
+#. Fill in the new fields
+#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
+#: shell/e-local-storage.c:184
+msgid "Trash"
+msgstr "Papelera"
+
+#: mail/importers/netscape-importer.c:1995
+msgid "Scanning mail filters"
+msgstr "Examinando filtros de correo"
+
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
+msgid "Scanning directory"
+msgstr "Analizando el directorio"
+
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+msgid "Starting import"
+msgstr "Comenzando a importar"
+
+#: mail/importers/netscape-importer.c:2090
+msgid "Settings"
+msgstr "Configuración"
+
+#: mail/importers/netscape-importer.c:2095
+msgid "Mail Filters"
+msgstr "Filtros de correo"
+
+#: mail/importers/netscape-importer.c:2119
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Netscape.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: mail/importers/pine-importer.c:114
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution está importando su información antigua de Pine"
+
+#: mail/importers/pine-importer.c:599
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Pine.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: mail/importers/pine-importer.c:618
+msgid "Pine"
+msgstr "Pine"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamiento actual:"
@@ -12093,78 +12799,38 @@ msgstr "No ha rellenado toda la información requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1877
 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:231
-msgid "Are you sure you want to delete this account?"
-msgstr "¿Seguro que quiere borrar esta cuenta?"
-
-#: mail/mail-accounts.c:239
-msgid "Don't delete"
-msgstr "No borrar"
-
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Disable"
-msgstr "Desactivar"
-
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Enable"
-msgstr "Habilitar"
-
-#. translators: default account indicator
-#: mail/mail-accounts.c:433
-msgid "[Default]"
-msgstr "[Predeterminada]"
-
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
-msgid "Enabled"
-msgstr "Habilitada"
-
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
-msgid "Account name"
-msgstr "Nombre de la cuenta"
-
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: mail/mail-autofilter.c:74
+#: mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:238
+#: mail/mail-autofilter.c:237
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:254
+#: mail/mail-autofilter.c:253
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:271
+#: mail/mail-autofilter.c:270
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
@@ -12188,249 +12854,149 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "No mostrar otra vez este mensaje."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"No ha configurado el cliente de correo.\n"
-"Necesita hacerlo para poder enviar,\n"
-"recibir o escribir mensajes.\n"
-"¿Querría configurarlo ahora?"
-
-#: mail/mail-callbacks.c:212
-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:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar una identidad para\n"
-"poder escribir mensajes de correo."
+#: mail/mail-component.c:188
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
+#: mail/mail-component.c:345
+msgid "On this Computer"
 msgstr ""
-"Necesita configurar un transporte de\n"
-"correo para poder enviarlo."
 
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-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 capaces de recibir  mensajes "
-"formateados en HTML:\n"
+#: mail/mail-component.c:367
+msgid "This folder cannot contain messages."
+msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "¿Enviar de todos modos?"
+#: mail/mail-component.c:481
+#, fuzzy, c-format
+msgid "Could not open source folder: %s"
+msgstr "No se pudo abrir la carpeta compartida: %s."
 
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Este mensaje no tiene asunto.\n"
-"¿Quiere enviarlo?"
+#: mail/mail-component.c:510
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "No se pudo crear el directorio temporal: %s"
 
-#: mail/mail-callbacks.c:314
-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 sólo contendrá destinatarios "
-"Cco."
+#: mail/mail-component.c:526
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "No se pudo crear el archivo temporal: «%s»: %s"
 
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Este mensaje solo contiene destinatarios Cco."
+#: mail/mail-component.c:547
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "No se pudo cerrar la carpeta temporal: %s"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-component.c:1026
 msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
 msgstr ""
-"Es posible que el servidor de correo revele los destinatarios añadiendo una "
-"cabecera Apparently-To.\n"
-"¿Enviar de todos modos?"
+"Algunas de tus opciones de correo parece que están corruptas, por favor "
+"comprueba que todo está en orden."
 
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Debes especificar destinatarios para poder enviar el mensaje."
+#: mail/mail-component.c:1638
+#, fuzzy
+msgid "Select destination to copy folder into"
+msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"No se pudo abrir la carpeta de borradores para esta cuenta.\n"
-"¿Quiere usar la carpeta de borradores predeterminada?"
+#: mail/mail-component.c:1649
+#, fuzzy
+msgid "Select destination to move folder into"
+msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "un remitente desconocido"
+#: mail/mail-component.c:1713
+#, fuzzy
+msgid "Create folder"
+msgstr "Crear una nueva carpeta"
 
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
+#: mail/mail-component.c:1713
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Especifique donde crear la carpeta:"
 
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Mover mensaje(s) a"
+#: mail/mail-component.c:1794
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "No se pudo borrar la carpeta «%s»: %s"
 
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Copiar mensaje(s) a"
+#: mail/mail-component.c:1818
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "¿Seguro que quiere borrar «%s»?"
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-component.c:1827 shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "¿Seguro que quiere editar los %d mensajes?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Solo puede editar mensajes guardados\n"
-"en la carpeta Borradores."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Sólo puede reenviar mensajes\n"
-"de la carpeta Enviados."
+msgid "Delete \"%s\""
+msgstr "Borrar «%s»"
 
-#: mail/mail-callbacks.c:2403
+#: mail/mail-component.c:1848 shell/e-shell-folder-commands.c:534
 #, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Se hay mensajes seleccionados"
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renombrar carpeta «%s» a:"
 
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"No se pudo obtener el mensaje; «%s»\n"
-"  %s"
+#: mail/mail-component.c:1850 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Renombrar carpeta"
 
-#: mail/mail-callbacks.c:2470
+#: mail/mail-component.c:1855 shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"«%s» ya existe\n"
-"¿Quiere sobreescribirlo?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Guardar mensaje como..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Guardar mensajes como..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"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"
-"\n"
-"¿Borrar realmente esos mensajes?"
+msgid "The specified folder name is not valid: %s"
+msgstr "El nombre de carpeta especificado no es valido: %s"
 
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
+#: mail/mail-component.c:1866
+#, fuzzy, c-format
+msgid "A folder named \"%s\" already exists.  Please use a different name."
 msgstr ""
-"Error cargando la información del filtro:\n"
-"%s"
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
 
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtros"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Página %d de %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Imprimir mensaje"
+#: mail/mail-component.c:1973
+#, fuzzy
+msgid "Folder properties"
+msgstr "Propiedades de tipografías"
 
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Ha fallado la impresión del mensaje"
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/mail-component.c:1981
+msgid "Properties"
+msgstr "Propiedades"
 
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
+#: mail/mail-component.c:1985
+#, fuzzy
+msgid "Folder Name"
+msgstr "Nombre de la _carpeta:"
 
-#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
-#: mail/mail-config.c:1376
-msgid "Unnamed"
-msgstr "Sin nombre"
+#: mail/mail-component.c:2084 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
+msgid "_View"
+msgstr "_Ver"
 
-#: mail/mail-composer-prefs.c:334
-msgid "You must specify a valid script name."
-msgstr "Por favor especifique un nombre válido de guión"
+#: mail/mail-component.c:2085
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Abrir en una ventana nueva"
 
-#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
-msgid "[script]"
-msgstr " [guión]"
+#: mail/mail-component.c:2090
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
 
-#: mail/mail-composer-prefs.c:858
-msgid "Language(s)"
-msgstr "Idioma(s)"
+#: mail/mail-component.c:2093
+msgid "_New Folder..."
+msgstr "_Carpeta nueva"
 
-#: mail/mail-composer-prefs.c:900
-msgid "Add script signature"
-msgstr "Añadir script de firma"
+#: mail/mail-component.c:2095 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Renombrar"
 
-#: mail/mail-composer-prefs.c:920
-msgid "Signature(s)"
-msgstr "Firma(s)"
+#: mail/mail-component.c:2098 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 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 "
@@ -12440,11 +13006,11 @@ msgstr ""
 "«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:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Recibiendo correo"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12453,15 +13019,15 @@ msgstr ""
 "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:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12470,11 +13036,11 @@ msgstr ""
 "no está seguro, pregúntele\n"
 "a su administrador de sistemas o a su Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12488,11 +13054,11 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo.Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.c:1080
+#: mail/mail-config.c:1086
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
+#: mail/mail-config.c:1164 mail/mail-config.c:1168
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -12996,7 +13562,7 @@ msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
+#: mail/mail-config.glade.h:154
 msgid "_Name:"
 msgstr "_Nombre:"
 
@@ -13060,253 +13626,15 @@ msgstr "U_sar conexiones seguras (SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr " "
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "No se pudo crear un contexto de firma S/MIME."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "No se pudo crear un contexto de certificado S/MIME."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "No se pudo crear un contexto de cifrado S/MIME."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "No se pudo crear un contexto sobre tipo S/MIME."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "No se pudo crear un contexto de decodificación S/MIME."
-
-#: mail/mail-display.c:196
-#, 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:335
-msgid "Save Attachment"
-msgstr "Guardar adjunto"
-
-#: mail/mail-display.c:408
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "No se pudo crear el archivo temporal: «%s»: %s"
-
-#: mail/mail-display.c:476
-msgid "Save Attachment..."
-msgstr "Guardar adjunto"
-
-#: mail/mail-display.c:477
-msgid "View Inline"
-msgstr "Ver incluido"
-
-#: mail/mail-display.c:478
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:538
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Ver incluido (vía %s)"
-
-#: mail/mail-display.c:542
-msgid "Hide"
-msgstr "Ocultar"
-
-#: mail/mail-display.c:562
-msgid "External Viewer"
-msgstr "Visores externos"
-
-#: mail/mail-display.c:1348
-msgid "Downloading images"
-msgstr "Descargando imágenes"
-
-#: mail/mail-display.c:1525
-msgid "Loading message content"
-msgstr "Cargando el contenido del mensaje"
-
-#: mail/mail-display.c:1867
-msgid "Overdue:"
-msgstr "Retrasadas:"
-
-#: mail/mail-display.c:1871
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "por %B %d, %Y, %l:%M %P"
-
-#: mail/mail-display.c:2235
-msgid "Open Link in Browser"
-msgstr "Abrir enlace en el Navegador"
-
-#: mail/mail-display.c:2236
-msgid "Copy Link Location"
-msgstr "Copiar dirección del enlace"
-
-#: mail/mail-display.c:2238
-msgid "Save Link as (FIXME)"
-msgstr "Guardar enlace como (ARRÉGLAME)"
-
-#: mail/mail-display.c:2240
-msgid "Save Image as..."
-msgstr "Guardar imagen como..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:830
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Dirección errónea"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "De"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "A"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Cco"
-
-#: mail/mail-format.c:1482
-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."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "No se pudo crear un contexto de verificación PGP."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Este mensaje está firmado digitalmente y es auténtico."
-
-#: mail/mail-format.c:1525
-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 "
-"autenticidad."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntero a archivo local (%s) valido en «%s»"
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
-#: mail/mail-local.c:541 mail/mail-local.c:543
-#, c-format
-msgid "Local folders/%s"
-msgstr "Carpetas locales/%s"
-
-#: mail/mail-local.c:671
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando carpeta"
-
-#: mail/mail-local.c:752
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you may find you can't\n"
-"open this folder anymore: %s: %s"
-msgstr ""
-"No se pudo guardar la meta información de la carpeta: probablemente\n"
-"no puedas volver a abrir esta carpeta: %s: %s"
-
-#: mail/mail-local.c:808
-#, c-format
-msgid "Cannot save folder metainfo to %s: %s"
-msgstr "No se pudo guardar la meta información de la carpeta en %s: %s"
-
-#: mail/mail-local.c:860
-#, c-format
-msgid "Cannot delete folder metadata %s: %s"
-msgstr "No se pudo borrar la metainformación de la carpeta %s: %s"
-
-#: mail/mail-local.c:1323
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Cambiando la carpeta «%s» al formato «%s»"
-
-#: 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"
-"puede que tenga que arreglarlo a mano."
-
-#: mail/mail-local.c:1448
-#, c-format
-msgid "Reconfigure /%s"
-msgstr "Reconfigurar /%s"
-
-#: mail/mail-local.c:1512
-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
 #, c-format
 msgid ""
@@ -13325,11 +13653,11 @@ msgstr ""
 "Error al efectuar operación:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:911
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
@@ -13337,106 +13665,118 @@ msgstr "Filtrando carpeta"
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: 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."
+#: mail/mail-ops.c:561
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
+
+#: mail/mail-ops.c:582
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:591
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:633
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:770
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:772
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:866
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1248
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1291
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1363
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1441
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1586
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
 msgid "Expunging folder"
 msgstr "Purgando carpeta"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1670
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
-#: shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1902
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1950
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13445,7 +13785,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1978
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13454,11 +13794,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2049
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2066
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13467,106 +13807,90 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2096
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Mensaje sin título)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Mensaje sin título"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Mensaje vacío"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Buscar en mensaje"
-
-#: mail/mail-search.c:320
+#: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Sensible a mayúsculas"
 
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Buscar hacia adelante"
+#: mail/mail-search.glade.h:3
+msgid "Find in Message"
+msgstr "Buscar en mensaje"
 
-#: mail/mail-search.c:342
+#: mail/mail-search.glade.h:4
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Coincide:"
+#: mail/mail-search.glade.h:5
+msgid "Search"
+msgstr "Buscar"
 
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:148
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:309
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:310
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:391
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:230
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:263
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:265
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:288
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:289
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -13605,30 +13929,26 @@ msgstr "Introduzca un nombre para esta firma."
 msgid "Name:"
 msgstr "Nombre:"
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:279
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:281
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:459 mail/mail-tools.c:466
-msgid "Forwarded Message"
-msgstr "Mensaje reenviado"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13641,97 +13961,88 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:780
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:839
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:878
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:898
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual «%s» que no existe."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:970
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Sin asunto)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Mensaje"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13779,7 +14090,7 @@ msgstr "Seguimiento"
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -13787,11 +14098,11 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -13823,39 +14134,6 @@ msgstr "_Vence el:"
 msgid "_Flag:"
 msgstr "_Marca"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Analizando carpetas bajo %s en «%s»"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Analizando carpetas de nivel superior en «%s»"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Suscribiendo a carpeta «%s»"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Desuscribiendo la carpeta «%s»"
-
-#: 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:1499
-msgid "No server has been selected"
-msgstr "No se ha seleccionado ningún servidor"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Por favor seleccione un servidor."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
@@ -13869,14101 +14147,12014 @@ msgid "S_erver:"
 msgstr "S_ervidor:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Analizando carpetas..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Configure la apariencia del Resumen de Evolution aquí"
+#: shell/e-folder-dnd-bridge.c:55
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"No se pudo transferir la carpeta:\n"
+"%s"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
-msgid "Evolution Summary"
-msgstr "Resumen de Evolution"
+#: shell/e-folder-list.c:338
+msgid "Add a Folder"
+msgstr "Añadir una carpeta"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component"
-msgstr "Componente del resumen de Evolution"
+#: shell/e-local-storage.c:179
+msgid "Drafts"
+msgstr "Borradores"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
-msgid "Evolution Summary configuration control"
-msgstr "Componente de configuración del Resumen de Evolution"
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
+#: shell/e-shortcuts.c:1084
+msgid "Inbox"
+msgstr "Correo recibido"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
-msgid "Summary Preferences"
-msgstr "Configuración del resumen"
+#: shell/e-local-storage.c:181
+msgid "Outbox"
+msgstr "Correo para enviar"
 
-#: my-evolution/Locations.h:1
-msgid "Aarhus"
-msgstr "Aarhus"
+#: shell/e-local-storage.c:182
+msgid "Sent"
+msgstr "Enviado"
 
-#: my-evolution/Locations.h:2
-msgid "Abakan"
-msgstr "Abakan"
+#: shell/e-setup.c:145
+msgid "Could not update files correctly"
+msgstr "No se pudieron actualizar correctamente los archivos"
 
-#: my-evolution/Locations.h:3
-msgid "Abbotsford"
-msgstr "Abbotsford"
+#: shell/e-setup.c:166
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+"No se pudo crear el directorio\n"
+"%s\n"
+"Error: %s"
 
-#: my-evolution/Locations.h:4
-msgid "Aberdeen"
-msgstr "Aberdeen"
+#: shell/e-setup.c:177
+#, c-format
+msgid ""
+"An error occurred in copying files into\n"
+"`%s'."
+msgstr ""
+"Ha ocurrido un error mientras se copiaban archivos a\n"
+"«%s»."
 
-#: my-evolution/Locations.h:5
-msgid "Abha"
-msgstr "Abha"
+#: shell/e-setup.c:243
+#, 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, muévalo para permitir la instalación\n"
+"de los archivos de usuario de Evolution."
 
-#: my-evolution/Locations.h:6
-msgid "Abilene"
-msgstr "Abilene"
+#: shell/e-setup.c:252
+#, 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"
+"de Evolution. Por favor, muévalo para permitir la\n"
+"instalación de los archivos de usuario de Evolution."
 
-#: my-evolution/Locations.h:7
-msgid "Abingdon"
-msgstr "Abingdon"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
+msgstr "Producido por"
 
-#: my-evolution/Locations.h:8
-msgid "Abu Dhabi"
-msgstr "Abu Dhabi"
+#: shell/e-shell-config-autocompletion.c:110
+msgid "Extra Completion folders"
+msgstr "Carpetas adicionales para autocompletar direcciones"
 
-#: my-evolution/Locations.h:9
-msgid "Abu Dhabi - Bateen"
-msgstr "Abu Dhabi - Bateen"
+#: shell/e-shell-config-default-folders.c:149
+msgid "Select Default Folder"
+msgstr "Seleccionar carpeta predeterminada"
 
-#: my-evolution/Locations.h:10
-msgid "Acajutla"
-msgstr "Acajutla"
+#: shell/e-shell-config-folder-settings.c:70
+msgid "Default Folders"
+msgstr "Carpetas predefinidas"
 
-#: my-evolution/Locations.h:11
-msgid "Acapulco"
-msgstr "Acapulco"
+#: shell/e-shell-config-folder-settings.c:73
+msgid "Offline Folders"
+msgstr "Carpetas sin conexión"
 
-#: my-evolution/Locations.h:12
-msgid "Acarigua"
-msgstr "Acarigua"
+#: shell/e-shell-config-folder-settings.c:76
+msgid "Autocompletion Folders"
+msgstr "Carpetas para autocompletar"
 
-#: my-evolution/Locations.h:13
-msgid "Adak"
-msgstr "Adak"
+#: shell/e-shell-folder-commands.c:140
+#, c-format
+msgid "Cannot copy folder: %s"
+msgstr "No se pudo copiar la carpeta: %s"
 
-#: my-evolution/Locations.h:14
-msgid "Adana"
-msgstr "Adana"
+#: shell/e-shell-folder-commands.c:142
+#, c-format
+msgid "Cannot move folder: %s"
+msgstr "No se pudo mover la carpeta: %s"
 
-#: my-evolution/Locations.h:15
-msgid "Adana/Incirlik"
-msgstr "Adana/Incirlik"
+#: shell/e-shell-folder-commands.c:188
+msgid "Cannot move a folder over itself."
+msgstr "No se pudo mover una carpeta sobre sí misma."
 
-#: my-evolution/Locations.h:16
-msgid "Adelaide"
-msgstr "Adelaide"
+#: shell/e-shell-folder-commands.c:190
+msgid "Cannot copy a folder over itself."
+msgstr "No se pudo copiar una carpeta sobre sí misma."
 
-#: my-evolution/Locations.h:17
-msgid "Aden"
-msgstr "Aden"
+#: shell/e-shell-folder-commands.c:204
+msgid "Cannot move a folder into one of its descendants."
+msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes."
 
-#: my-evolution/Locations.h:18
-msgid "Adrar"
-msgstr "Adrar"
+#: shell/e-shell-folder-commands.c:319
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "Especificar una carpeta en la que copiar la carpeta «%s»:"
 
-#: my-evolution/Locations.h:19
-msgid "Aeroparque"
-msgstr "Aeroparque"
+#: shell/e-shell-folder-commands.c:323
+msgid "Copy Folder"
+msgstr "Copiar carpeta"
 
-#: my-evolution/Locations.h:20
-msgid "Aeropuerto del Norte"
-msgstr "Aeropuerto del Norte"
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "Especificar una carpeta a la que mover la carpeta «%s»:"
 
-#: my-evolution/Locations.h:21
-msgid "Afonsos"
-msgstr "Afonsos"
+#: shell/e-shell-folder-commands.c:367
+msgid "Move Folder"
+msgstr "Mover carpeta"
 
-#: my-evolution/Locations.h:22
-msgid "Africa"
-msgstr "África"
+#: shell/e-shell-folder-commands.c:391
+#, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"No se pudo borrar la carpeta:\n"
+"%s"
 
-#: my-evolution/Locations.h:23
-msgid "Afyon"
-msgstr "Afyon"
+#: shell/e-shell-folder-commands.c:405
+#, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "¿Seguro que quiere borrar «%s»?"
 
-#: my-evolution/Locations.h:24
-msgid "Agen"
-msgstr "Agen"
+#: shell/e-shell-folder-commands.c:489
+#, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"No se pudo renombrar la carpeta:\n"
+"%s"
 
-#: my-evolution/Locations.h:25
-msgid "Aguascaliantes"
-msgstr "Aguascalientes"
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
 
-#: my-evolution/Locations.h:26
-msgid "Ahmadabad"
-msgstr "Ahmadabad"
+#: shell/e-shell-folder-commands.c:584
+msgid "Selected folder does not belong to another user"
+msgstr "La carpeta seleccionada no pertenece a otro usuario"
 
-#: my-evolution/Locations.h:27
-msgid "Ahwaz"
-msgstr "Ahwaz"
+#: shell/e-shell-folder-commands.c:587
+#, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"No se pudo borrar la carpeta:\n"
+"%s"
 
-#: my-evolution/Locations.h:28
-msgid "Ainsworth"
-msgstr "Ainsworth"
+#: shell/e-shell-folder-creation-dialog.c:137
+#, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"No se pudo crear la carpeta especificada:\n"
+"%s"
 
-#: my-evolution/Locations.h:29
-msgid "Air Force"
-msgstr "Fuerzas aéreas"
+#: shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Crear carpeta nueva"
 
-#: my-evolution/Locations.h:30
-msgid "Ajaccio/Campo dell'Oro"
-msgstr "Ajaccio/Campo dell'Oro"
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+msgid "(Untitled)"
+msgstr "(Sin título)"
 
-#: my-evolution/Locations.h:31
-msgid "Akeno Ab"
-msgstr "Akeno Ab"
+#: shell/e-shell-importer.c:139
+msgid "Choose the type of importer to run:"
+msgstr "Elija el tipo de importador a ejecutar:"
 
-#: my-evolution/Locations.h:32
-msgid "Akita Airport"
-msgstr "Aeropuerto de Akita"
+#: shell/e-shell-importer.c:142
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+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."
 
-#: my-evolution/Locations.h:33
-msgid "Akron"
-msgstr "Akron"
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+msgid "Please select the information that you would like to import:"
+msgstr "Por favor seleccione la información que quiera importar:"
 
-#: my-evolution/Locations.h:34
-msgid "Akrotiri"
-msgstr "Akrotiri"
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+"Evolution comprobó la configuración de las siguientes aplicaciones:\n"
+"Pine, Netscape, Elm, iCalendar. No se encontraron ajustes que\n"
+"pudieran ser importados. Si quiere intentarlo de nuevo, pulse\n"
+"el botón «Atrás».\n"
 
-#: my-evolution/Locations.h:35
-msgid "Alabama"
-msgstr "Alabama"
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importando %s\n"
+"Importando elemento %d."
 
-#: my-evolution/Locations.h:36
-msgid "Al Ahsa"
-msgstr "Al Ahsa"
+#: shell/e-shell-importer.c:323
+msgid "Select importer"
+msgstr "Seleccionar importador"
 
-#: my-evolution/Locations.h:37
-msgid "Al Ain"
-msgstr "Al Ain"
+#: shell/e-shell-importer.c:464
+#, c-format
+msgid "File %s does not exist"
+msgstr "El archivo %s no existe"
 
-#: my-evolution/Locations.h:38
-msgid "Alamogordo"
-msgstr "Alamogordo"
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
+msgid "Evolution Error"
+msgstr "Error de Evolution"
 
-#: my-evolution/Locations.h:39
-msgid "Alamosa"
-msgstr "Alamosa"
+#: shell/e-shell-importer.c:481
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
+"%s"
 
-#: my-evolution/Locations.h:40
-msgid "Alaska"
-msgstr "Alaska"
+#: shell/e-shell-importer.c:490
+msgid "Importing"
+msgstr "Importando"
 
-#: my-evolution/Locations.h:41
-msgid "Al Baha"
-msgstr "Al Baha"
+#: shell/e-shell-importer.c:497
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importando %s.\n"
+"Comenzando %s"
 
-#: my-evolution/Locations.h:43
-msgid "Albany"
-msgstr "Albania"
+#: shell/e-shell-importer.c:509
+#, c-format
+msgid "Error starting %s"
+msgstr "Error cargando %s"
 
-#: my-evolution/Locations.h:44
-msgid "Albenga"
-msgstr "Albenga"
+#: shell/e-shell-importer.c:523
+#, c-format
+msgid "Error loading %s"
+msgstr "Error cargando %s"
 
-#: my-evolution/Locations.h:45
-msgid "Alberta"
-msgstr "Alberta"
+#: shell/e-shell-importer.c:540
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importando %s\n"
+"Importando elemento 1."
 
-#: my-evolution/Locations.h:46
-msgid "Alborg"
-msgstr "Alborg"
+#: shell/e-shell-importer.c:594
+msgid "Automatic"
+msgstr "Automático"
 
-#: my-evolution/Locations.h:47
-msgid "Albuquerque"
-msgstr "Albuquerque"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nombre de archivo:"
 
-#: my-evolution/Locations.h:48
-msgid "Alderney"
-msgstr "Alderney"
+#: shell/e-shell-importer.c:648
+msgid "Select a file"
+msgstr "Elija un archivo"
 
-#: my-evolution/Locations.h:49
-msgid "Alesund"
-msgstr "Alesund"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
+msgstr "Tipo de archivo:"
 
-#: my-evolution/Locations.h:50
-msgid "Alexandria"
-msgstr "Alexandria"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
+msgstr "Importar datos y configuración de programas antiguos"
 
-#: my-evolution/Locations.h:51
-msgid "Alexandria-Esler"
-msgstr "Alexandria-Esler"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
+msgstr "Importar un único archivo"
 
-#: my-evolution/Locations.h:52
-msgid "Alexandria/Nouzha"
-msgstr "Alexandria/Nouzha"
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Por favor espere...\n"
+"Buscando configuraciones existentes"
 
-#: my-evolution/Locations.h:53
-msgid "Alexandroupolis"
-msgstr "Alexandroupolis"
+#: shell/e-shell-importer.c:758
+msgid "Starting Intelligent Importers"
+msgstr "Comenzando importadores inteligentes"
 
-#: my-evolution/Locations.h:55
-msgid "Alghero"
-msgstr "Alghero"
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
 
-#: my-evolution/Locations.h:56
-msgid "Algona"
-msgstr "Algona"
+#: shell/e-shell-importer.c:1062
+msgid "Select a destination folder for importing this data"
+msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: my-evolution/Locations.h:57
-msgid "Alicante"
-msgstr "Alicante"
+#: shell/e-shell-importer.c:1191
+#, fuzzy
+msgid "_Import"
+msgstr "Importar"
 
-#: my-evolution/Locations.h:58
-msgid "Alice"
-msgstr "Alice"
+#: shell/e-shell-offline-handler.c:592
+msgid "Closing connections..."
+msgstr "Cerrando conexiones..."
 
-#: my-evolution/Locations.h:59
-msgid "Alice Springs"
-msgstr "Alice Springs"
+#: shell/e-shell-offline-sync.c:163
+#, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Error mientras se sincronizaba «%s»:\n"
+"%s"
 
-#: my-evolution/Locations.h:60
-msgid "Al-Jouf"
-msgstr "Al-Jouf"
+#: shell/e-shell-offline-sync.c:232
+msgid "Syncing Folder"
+msgstr "Sincronizando carpeta"
 
-#: my-evolution/Locations.h:61
-msgid "Allentown"
-msgstr "Allentown"
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:311
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sincronizando «%s» (%d de %d)..."
 
-#: my-evolution/Locations.h:62
-msgid "Alliance"
-msgstr "Alliance"
+#: shell/e-shell-settings-dialog.c:346
+msgid "Evolution Settings"
+msgstr "Preferencias de Evolution"
 
-#: my-evolution/Locations.h:63
-msgid "Alma"
-msgstr "Alma"
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr "Por favor seleccione un usuario."
 
-#: my-evolution/Locations.h:64
-msgid "Almeria"
-msgstr "Almería"
+#: shell/e-shell-shared-folder-picker-dialog.c:387
+msgid "Opening Folder"
+msgstr "Abriendo carpeta"
 
-#: my-evolution/Locations.h:65
-msgid "Alpena"
-msgstr "Alpena"
+#: shell/e-shell-shared-folder-picker-dialog.c:393
+#, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abriendo carpeta «%s»"
 
-#: my-evolution/Locations.h:66
-msgid "Al Qaysumah"
-msgstr "Al Qaysumah"
+#: shell/e-shell-shared-folder-picker-dialog.c:398
+#, c-format
+msgid "in \"%s\" ..."
+msgstr "en «%s» ..."
 
-#: my-evolution/Locations.h:67
-msgid "Alta"
-msgstr "Alta"
+#: shell/e-shell-shared-folder-picker-dialog.c:482
+#, c-format
+msgid "Could not open shared folder: %s."
+msgstr "No se pudo abrir la carpeta compartida: %s."
 
-#: my-evolution/Locations.h:68
-msgid "Altamira"
-msgstr "Altamira"
+#: shell/e-shell-shared-folder-picker-dialog.c:535
+msgid "Cannot find the specified shared folder."
+msgstr "No se pudo encontrar la carpeta compartida especificada"
 
-#: my-evolution/Locations.h:69
-msgid "Alton"
-msgstr "Alton"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
 
-#: my-evolution/Locations.h:70
-msgid "Altoona"
-msgstr "Altoona"
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Secretario"
 
-#: my-evolution/Locations.h:71
-msgid "Alturas"
-msgstr "Alturas"
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nuevo"
 
-#: my-evolution/Locations.h:72
-msgid "Altus"
-msgstr "Altus"
+#: shell/e-shell-utils.c:116
+msgid "No folder name specified."
+msgstr "No ha especificado un nombre de carpeta."
 
-#: my-evolution/Locations.h:73
-msgid "Amami Airport"
-msgstr "Aeropuerto de Amami"
+#: 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."
 
-#: my-evolution/Locations.h:74
-msgid "Amapala"
-msgstr "Amapala"
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "El nombre de la carpeta no puede contener el carácter «/»."
 
-#: my-evolution/Locations.h:75
-msgid "Amarillo"
-msgstr "Amarillo"
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 
-#: my-evolution/Locations.h:76
-msgid "Amasya"
-msgstr "Amasya"
+#: shell/e-shell-utils.c:141
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: my-evolution/Locations.h:77
-msgid "Ambler"
-msgstr "Ambler"
+#: shell/e-shell-view-menu.c:89 shell/e-shell-window-commands.c:58
+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."
 
-#: my-evolution/Locations.h:78
-msgid "Amelia"
-msgstr "Amelia"
+#: shell/e-shell-view-menu.c:97 shell/e-shell-window-commands.c:66
+#, c-format
+msgid "Error executing %s."
+msgstr "Error ejecutando %s."
 
-#: my-evolution/Locations.h:79
-msgid "Amendola"
-msgstr "Amendola"
+#: shell/e-shell-view-menu.c:193 shell/e-shell-window-commands.c:120
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy no está instalado"
 
-#: my-evolution/Locations.h:80
-msgid "Ames"
-msgstr "Ames"
+#: shell/e-shell-view-menu.c:201 shell/e-shell-window-commands.c:128
+msgid "Bug buddy could not be run."
+msgstr "No se ha podido ejecutar bug buddy"
 
-#: my-evolution/Locations.h:81
-msgid "Amritsar"
-msgstr "Amritsar"
+#: shell/e-shell-view-menu.c:247 shell/e-shell-window-commands.c:170
+msgid "About Ximian Evolution"
+msgstr "Acerca de Ximian Evolution"
 
-#: my-evolution/Locations.h:82
-msgid "Amsterdam"
-msgstr "Amsterdam"
+#: shell/e-shell-view-menu.c:502
+msgid "Go to folder..."
+msgstr "Ir a la carpeta..."
 
-#: my-evolution/Locations.h:83
-msgid "Anadyr"
-msgstr "Anadyr"
+#: shell/e-shell-view-menu.c:503
+msgid "Select the folder that you want to open"
+msgstr "Seleccione la carpeta que quiere abrir"
 
-#: my-evolution/Locations.h:84
-msgid "Anaktuvuk"
-msgstr "Anaktuvuk"
+#: shell/e-shell-view-menu.c:617
+msgid "Create New Shortcut"
+msgstr "Crear atajo"
 
-#: my-evolution/Locations.h:85
-msgid "Anapa"
-msgstr "Anapa"
+#: 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:"
 
-#: my-evolution/Locations.h:86
-msgid "Anchorage"
-msgstr "Anchorage"
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+msgid "_Work Online"
+msgstr "_Trabajar conectado"
 
-#: my-evolution/Locations.h:87
-msgid "Anchorage - Elmendorf AFB"
-msgstr "Anchorage - Elmendorf AFB"
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
+#: ui/evolution.xml.h:31
+msgid "_Work Offline"
+msgstr "_Trabajar desconectado"
 
-#: my-evolution/Locations.h:88
-msgid "Ancona"
-msgstr "Ancona"
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
+#: ui/evolution.xml.h:19
+msgid "Work Offline"
+msgstr "Trabajar desconectado"
 
-#: my-evolution/Locations.h:89
-msgid "Andahuayla"
-msgstr "Andahuayla"
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(No hay carpetas mostrándose)"
 
-#: my-evolution/Locations.h:90
-msgid "Anderson"
-msgstr "Anderson"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: my-evolution/Locations.h:91
-msgid "Andoya"
-msgstr "Andoya"
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(nada)"
 
-#: my-evolution/Locations.h:92
-msgid "Andravida"
-msgstr "Andravida"
+#: shell/e-shell-view.c:2083
+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."
 
-#: my-evolution/Locations.h:93
-msgid "Andrews AFB"
-msgstr "Andrews AFB"
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution está en proceso de desconectarse."
 
-#: my-evolution/Locations.h:94
-msgid "Angleton"
-msgstr "Angleton"
+#: shell/e-shell-view.c:2096
+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."
 
-#: my-evolution/Locations.h:95
-msgid "Aniak"
-msgstr "Aniak"
+#: shell/e-shell.c:906
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
 
-#: my-evolution/Locations.h:96
-msgid "Ankara/Esenboga"
-msgstr "Ankara/Esenboga"
+#: shell/e-shell.c:908
+msgid "Cannot register on OAF"
+msgstr "No se pudo registrar en OAF"
 
-#: my-evolution/Locations.h:97
-msgid "Ankara/Etimesgut"
-msgstr "Ankara/Etimesgut"
+#: shell/e-shell.c:910
+msgid "Configuration Database not found"
+msgstr "No se encontró la base de datos de configuración"
 
-#: my-evolution/Locations.h:98
-msgid "Annaba"
-msgstr "Annaba"
+#: shell/e-shell.c:912 shell/e-storage.c:571
+msgid "Generic error"
+msgstr "Error genérico"
 
-#: my-evolution/Locations.h:99
-msgid "Ann Arbor"
-msgstr "Ann Arbor"
+#: shell/e-shortcuts-view.c:80
+msgid "Create New Shortcut Group"
+msgstr "Crear un nuevo grupo de atajos"
 
-#: my-evolution/Locations.h:100
-msgid "Annette"
-msgstr "Annette"
+#: shell/e-shortcuts-view.c:81
+msgid "Group name:"
+msgstr "Nombre del grupo:"
 
-#: my-evolution/Locations.h:101
-msgid "Anniston"
-msgstr "Anniston"
+#: shell/e-shortcuts-view.c:179
+#, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "¿Realmente quiere quitar el grupo «%s» de la barra de atajos?"
 
-#: my-evolution/Locations.h:102
-msgid "Antalya"
-msgstr "Antalya"
+#: shell/e-shortcuts-view.c:222
+msgid "Rename Shortcut Group"
+msgstr "Renombrar grupo de atajos"
 
-#: my-evolution/Locations.h:103
-msgid "Antartica"
-msgstr "Antártida"
+#: shell/e-shortcuts-view.c:223
+msgid "Rename selected shortcut group to:"
+msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: my-evolution/Locations.h:104
-msgid "Antigo"
-msgstr "Antigo"
+#: shell/e-shortcuts-view.c:255
+msgid "_Small Icons"
+msgstr "Icono_s pequeños"
 
-#: my-evolution/Locations.h:105
-msgid "Antigua"
-msgstr "Antigua"
+#: shell/e-shortcuts-view.c:256
+msgid "Show the shortcuts as small icons"
+msgstr "Mostrar los atajos como iconos pequeños"
 
-#: my-evolution/Locations.h:106
-msgid "Antigua and Barbuda"
-msgstr "Antigua y Barbuda"
+#: shell/e-shortcuts-view.c:258
+msgid "_Large Icons"
+msgstr "Iconos _grandes"
 
-#: my-evolution/Locations.h:107
-msgid "Antofagasta"
-msgstr "Antofagasta"
+#: shell/e-shortcuts-view.c:259
+msgid "Show the shortcuts as large icons"
+msgstr "Mostrar los atajos como iconos grandes"
 
-#: my-evolution/Locations.h:108
-msgid "Antwerpen/Deurne"
-msgstr "Antwerpen/Deurne"
+#: shell/e-shortcuts-view.c:270
+msgid "_Add Group..."
+msgstr "_Añadir grupo..."
 
-#: my-evolution/Locations.h:109
-msgid "Aomori Airport"
-msgstr "Aeropuerto de Aomori"
+#: shell/e-shortcuts-view.c:271
+msgid "Create a new shortcut group"
+msgstr "Crear un nuevo grupo de atajos"
 
-#: my-evolution/Locations.h:110
-msgid "Apalachicola"
-msgstr "Apalachicola"
+#: shell/e-shortcuts-view.c:273
+msgid "_Remove this Group..."
+msgstr "_Quitar este grupo..."
 
-#: my-evolution/Locations.h:111
-msgid "Appleton"
-msgstr "Appleton"
+#: shell/e-shortcuts-view.c:274
+msgid "Remove this shortcut group"
+msgstr "Quitar este grupo de atajos"
 
-#: my-evolution/Locations.h:112
-msgid "Aquadilla"
-msgstr "Aquadilla"
+#: shell/e-shortcuts-view.c:276
+msgid "Re_name this Group..."
+msgstr "Re_nombrar este grupo..."
 
-#: my-evolution/Locations.h:113
-msgid "Aracaju"
-msgstr "Aracaju"
+#: shell/e-shortcuts-view.c:277
+msgid "Rename this shortcut group"
+msgstr "Renombrar este grupo de atajos"
 
-#: my-evolution/Locations.h:114
-msgid "Arad"
-msgstr "Arad"
+#: shell/e-shortcuts-view.c:282
+msgid "_Hide the Shortcut Bar"
+msgstr "_Ocultar la barra de atajos"
 
-#: my-evolution/Locations.h:115
-msgid "Arar"
-msgstr "Arar"
+#: shell/e-shortcuts-view.c:283
+msgid "Hide the shortcut bar"
+msgstr "Ocultar la barra de atajos"
 
-#: my-evolution/Locations.h:116
-msgid "Araxos"
-msgstr "Araxos"
+#: shell/e-shortcuts-view.c:288
+msgid "Create _Default Shortcuts"
+msgstr "Crear atajos pre_determinados"
 
-#: my-evolution/Locations.h:117
-msgid "Arcata"
-msgstr "Arcata"
+#: shell/e-shortcuts-view.c:289
+msgid "Create Default Shortcuts"
+msgstr "Crear atajos predeterminados"
 
-#: my-evolution/Locations.h:118
-msgid "Ardmore"
-msgstr "Ardmore"
+#: shell/e-shortcuts-view.c:408
+msgid "Rename Shortcut"
+msgstr "Renombrar atajo"
 
-#: my-evolution/Locations.h:119
-msgid "Arequipa"
-msgstr "Arequipa"
+#: shell/e-shortcuts-view.c:409
+msgid "Rename selected shortcut to:"
+msgstr "Renombrar atajos seleccionados a:"
 
-#: my-evolution/Locations.h:121
-msgid "Arica"
-msgstr "Arica"
+#: shell/e-shortcuts-view.c:422
+msgid "Open the folder linked to this shortcut"
+msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: my-evolution/Locations.h:122
-msgid "Arizona"
-msgstr "Arizona"
+#: shell/e-shortcuts-view.c:424
+msgid "Open in New _Window"
+msgstr "Abrir en una _ventana nueva"
 
-#: my-evolution/Locations.h:123
-msgid "Arkansas"
-msgstr "Arkansas"
+#: shell/e-shortcuts-view.c:424
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
-#: my-evolution/Locations.h:124
-msgid "Arkhangelsk"
-msgstr "Arkhangelsk"
+#: shell/e-shortcuts-view.c:427
+msgid "Rename this shortcut"
+msgstr "Renombrar este atajo"
 
-#: my-evolution/Locations.h:125
-msgid "Arlington"
-msgstr "Arlington"
+#: shell/e-shortcuts-view.c:429
+msgid "Re_move"
+msgstr "Qui_tar"
 
-#: my-evolution/Locations.h:126
-msgid "Artigas"
-msgstr "Artigas"
+#: shell/e-shortcuts-view.c:429
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Quitar este atajo de la lista de atajos"
 
-#: my-evolution/Locations.h:127
-msgid "Asahikawa Ab"
-msgstr "Asahikawa Ab"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Error guardando atajos."
 
-#: my-evolution/Locations.h:128
-msgid "Asahikawa Airport"
-msgstr "Aeropuerto de Asahikawa"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Atajos"
 
-#: my-evolution/Locations.h:129
-msgid "Ashburnam"
-msgstr "Ashburnam"
+#: shell/e-storage.c:573
+msgid "A folder with the same name already exists"
+msgstr "Ya existe una carpeta con ese nombre"
 
-#: my-evolution/Locations.h:130
-msgid "Asheville"
-msgstr "Asheville"
+#: shell/e-storage.c:575
+msgid "The specified folder type is not valid"
+msgstr "Es tipo de archivo especificado no es válido"
 
-#: my-evolution/Locations.h:131
-msgid "Ashfield"
-msgstr "Ashfield"
+#: shell/e-storage.c:577
+msgid "I/O error"
+msgstr "Error de E/S"
 
-#: my-evolution/Locations.h:132
-msgid "Ashiya Ab"
-msgstr "Ashiya Ab"
+#: shell/e-storage.c:579
+msgid "Not enough space to create the folder"
+msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: my-evolution/Locations.h:133
-msgid "Ashland"
-msgstr "Ashland"
+#: shell/e-storage.c:581
+msgid "The folder is not empty"
+msgstr "Esta carpeta no está vacía"
 
-#: my-evolution/Locations.h:134
-msgid "Asia"
-msgstr "Asia"
+#: shell/e-storage.c:583
+msgid "The specified folder was not found"
+msgstr "No se encontró la carpeta especificada"
 
-#: my-evolution/Locations.h:135
-msgid "Aspen"
-msgstr "Aspen"
+#: shell/e-storage.c:585
+msgid "Function not implemented in this storage"
+msgstr "Función sin implementar en este almacenamiento"
 
-#: my-evolution/Locations.h:136
-msgid "Asswan"
-msgstr "Asswan"
+#: shell/e-storage.c:589
+msgid "Operation not supported"
+msgstr "Operación no implementada"
 
-#: my-evolution/Locations.h:137
-msgid "Astoria"
-msgstr "Astoria"
+#: shell/e-storage.c:591
+msgid "The specified type is not supported in this storage"
+msgstr "El tipo especificado no está implementado por este manejador"
 
-#: my-evolution/Locations.h:138
-msgid "Astrakhan"
-msgstr "Astrakhan"
+#: shell/e-storage.c:593
+msgid "The specified folder cannot be modified or removed"
+msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: my-evolution/Locations.h:139
-msgid "Asturias"
-msgstr "Asturias"
+#: shell/e-storage.c:595
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes"
 
-#: my-evolution/Locations.h:140
-msgid "Asuncion"
-msgstr "Asunción"
+#: shell/e-storage.c:597
+msgid "Cannot create a folder with that name"
+msgstr "No se pudo crear una carpeta con ese nombre"
 
-#: my-evolution/Locations.h:141
-msgid "Athens"
-msgstr "Atenas"
+#: shell/e-storage.c:599
+msgid "This operation cannot be performed in off-line mode"
+msgstr "Esta operación no puede efectuarse en modo desconectado"
 
-#: my-evolution/Locations.h:142
-msgid "Athinai"
-msgstr "Athinai"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Activar"
 
-#: my-evolution/Locations.h:143
-msgid "Atlanta"
-msgstr "Atlanta"
+#: shell/e-task-widget.c:211
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
 
-#: my-evolution/Locations.h:144
-msgid "Atlantic"
-msgstr "Atlántico"
+#: shell/e-task-widget.c:216
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% completado)"
 
-#: my-evolution/Locations.h:145
-msgid "Atlantic City"
-msgstr "Atlantic City"
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Error desconocido."
 
-#: my-evolution/Locations.h:146
-msgid "Atsugi US NAS"
-msgstr "Atsugi US NAS"
+#: 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"
 
-#: my-evolution/Locations.h:147
-msgid "Auburn"
-msgstr "Auburn"
+#: 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"
 
-#: my-evolution/Locations.h:148
-msgid "Auckland"
-msgstr "Auckland"
+#: shell/evolution-shell-component.c:1187
+msgid "CORBA error"
+msgstr "Error CORBA"
 
-#: my-evolution/Locations.h:149
-msgid "Augsburg"
-msgstr "Augsburg"
+#: shell/evolution-shell-component.c:1189
+msgid "Interrupted"
+msgstr "Interrumpido"
 
-#: my-evolution/Locations.h:150
-msgid "Augusta"
-msgstr "Augusta"
+#: shell/evolution-shell-component.c:1193
+msgid "Already has an owner"
+msgstr "Ya tiene un dueño"
 
-#: my-evolution/Locations.h:151
-msgid "Aurora"
-msgstr "Aurora"
+#: shell/evolution-shell-component.c:1195
+msgid "No owner"
+msgstr "Sin dueño"
 
-#: my-evolution/Locations.h:152
-msgid "Austin"
-msgstr "Austin"
+#: shell/evolution-shell-component.c:1197
+msgid "Not found"
+msgstr "No encontrado"
 
-#: my-evolution/Locations.h:153
-msgid "Australasia"
-msgstr "Asia austral"
+#: shell/evolution-shell-component.c:1199
+msgid "Unsupported type"
+msgstr "Tipo no soportado"
 
-#: my-evolution/Locations.h:156
-msgid "Avalon"
-msgstr "Avalon"
+#: shell/evolution-shell-component.c:1201
+msgid "Unsupported schema"
+msgstr "Schema no soportado"
 
-#: my-evolution/Locations.h:157
-msgid "Aviano"
-msgstr "Aviano"
+#: shell/evolution-shell-component.c:1203
+msgid "Unsupported operation"
+msgstr "Operación no soportada"
 
-#: my-evolution/Locations.h:158
-msgid "Ayacucho"
-msgstr "Ayacucho"
+#: shell/evolution-shell-component.c:1205
+msgid "Internal error"
+msgstr "Error interno"
 
-#: my-evolution/Locations.h:159
-msgid "Bage"
-msgstr "Bage"
+#: shell/evolution-shell-component.c:1209
+msgid "Exists"
+msgstr "Salir"
 
-#: my-evolution/Locations.h:160
-msgid "Bagotville"
-msgstr "Bagotville"
+#: shell/evolution-shell-component.c:1211
+msgid "Invalid URI"
+msgstr "URI no válida"
 
-#: my-evolution/Locations.h:162
-msgid "Bahia Blanca"
-msgstr "Bahía Blanca"
+#: shell/evolution-shell-component.c:1215
+msgid "Has subfolders"
+msgstr "Tiene subcarpetas"
 
-#: my-evolution/Locations.h:163
-msgid "Bahias de Huatulco"
-msgstr "Bahías de Huatulco"
+#: shell/evolution-shell-component.c:1217
+msgid "No space left"
+msgstr "No queda sitio"
 
-#: my-evolution/Locations.h:165
-msgid "Baker City"
-msgstr "Baker City"
+#: shell/evolution-shell-component.c:1219
+msgid "Old owner has died"
+msgstr "El antiguo dueño a muerto"
 
-#: my-evolution/Locations.h:166
-msgid "Bakersfield"
-msgstr "Bakersfield"
+#: shell/evolution-test-component.c:63
+msgid "Test type"
+msgstr "Tipo de pruebas"
 
-#: my-evolution/Locations.h:167
-msgid "Bale-Mulhouse"
-msgstr "Bale-Mulhouse"
+#: shell/evolution-test-component.c:703
+msgid "Evolution Test Component"
+msgstr "Componente de Prueba de Evolution"
 
-#: my-evolution/Locations.h:168
-msgid "Balikesir"
-msgstr "Balikesir"
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active Connections"
+msgstr "Conexiones activas"
 
-#: my-evolution/Locations.h:169
-msgid "Balikesir/Bandirma"
-msgstr "Balikesir/Bandirma"
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
-#: my-evolution/Locations.h:170
-msgid "Ball Mountain"
-msgstr "Ball Mountain"
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "The following connections are currently active:"
+msgstr "Las siguientes conexiones están actualmente activas:"
 
-#: my-evolution/Locations.h:171
-msgid "Baltimore"
-msgstr "Baltimore"
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "C_alendario:"
 
-#: my-evolution/Locations.h:172
-msgid "Baltimore-Glen Burnie"
-msgstr "Baltimore-Glen Burnie"
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Contactos:"
 
-#: my-evolution/Locations.h:173
-msgid "Banak"
-msgstr "Banak"
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "Co_rreo:"
 
-#: my-evolution/Locations.h:174
-msgid "Bandarabbass"
-msgstr "Bandarabbass"
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tareas"
 
-#: my-evolution/Locations.h:175
-msgid "Bangor"
-msgstr "Bangor"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "_Nombre de la carpeta:"
 
-#: my-evolution/Locations.h:176
-msgid "Baracoa"
-msgstr "Baracoa"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Tipo de carpeta:"
 
-#: my-evolution/Locations.h:177
-msgid "Barbers Point"
-msgstr "Barbers Point"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Abrir carpeta de otro usuario"
 
-#: my-evolution/Locations.h:178
-msgid "Barcelona"
-msgstr "Barcelona"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Cuent_a:"
 
-#: my-evolution/Locations.h:179
-msgid "Bardufoss"
-msgstr "Bardufoss"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Nombre de la _carpeta:"
 
-#: my-evolution/Locations.h:180
-msgid "Bar Harbor"
-msgstr "Bar Harbor"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Usuario:"
 
-#: my-evolution/Locations.h:181
-msgid "Bari"
-msgstr "Bari"
+#: shell/glade/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Asistente de configuración de Evolution"
 
-#: my-evolution/Locations.h:182
-msgid "Bariloche"
-msgstr "Bariloche"
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importando archivos"
 
-#: my-evolution/Locations.h:183
-msgid "Barinas"
-msgstr "Barinas"
+#: shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Zona horaria "
 
-#: my-evolution/Locations.h:184
-msgid "Barking Sand"
-msgstr "Barking Sand"
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Bienvenido"
 
-#: my-evolution/Locations.h:185
-msgid "Barksdale"
-msgstr "Barksdale"
+#: shell/glade/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Bienvenido a Evolution. Las siguientes pantallas permitirán a\n"
+"Evolution conectarse a sus cuentas de correo, e importar archivos\n"
+"desde otras aplicaciones. \n"
+"\n"
+"Por favor pulse el botón «Siguiente» para continuar. "
 
-#: my-evolution/Locations.h:186
-msgid "Barnaul"
-msgstr "Barnaul"
+#: shell/glade/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+"Ha introducido toda la información necesaria para\n"
+"configurar Evolution. \n"
+"\n"
+"Pulse el botón «Aplicar» para guardar su configuración. "
 
-#: my-evolution/Locations.h:187
-msgid "Barquisimeto"
-msgstr "Barquisimeto"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
+"línea aquí"
 
-#: my-evolution/Locations.h:188
-msgid "Barranquilla/Ernestocortissoz"
-msgstr "Barranquilla/Ernestocortissoz"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Intérprete de Evolution."
 
-#: my-evolution/Locations.h:189
-msgid "Barrow"
-msgstr "Barrow"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Control de configuración de preferencias de carpetas de Evolution"
 
-#: my-evolution/Locations.h:190
-msgid "Barter Island"
-msgstr "Barter Island"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Configuración de carpetas"
 
-#: my-evolution/Locations.h:191
-msgid "Bartlesville"
-msgstr "Bartlesville"
+#: 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. "
 
-#: my-evolution/Locations.h:192
-msgid "Bartow"
-msgstr "Bartow"
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Asistente de importación de Evolution"
 
-#: my-evolution/Locations.h:193
-msgid "Bastia"
-msgstr "Bastia"
+#: shell/importer/import.glade.h:3
+msgid "Import File (step 3 of 3)"
+msgstr "Importar archivo (Paso 3 de 3)"
 
-#: my-evolution/Locations.h:194
-msgid "Batesville"
-msgstr "Batesville"
+#: shell/importer/import.glade.h:4
+msgid "Importer Type (step 1 of 3)"
+msgstr "Tipo de importador (Paso 1 de 3)"
 
-#: my-evolution/Locations.h:195
-msgid "Batman"
-msgstr "Batman"
+#: shell/importer/import.glade.h:5
+msgid "Select Importers (step 2 of 3)"
+msgstr "Seleccione importadores (paso 2 de 3)"
 
-#: my-evolution/Locations.h:196
-msgid "Baton Rouge"
-msgstr "Baton Rouge"
+#: shell/importer/import.glade.h:6
+msgid "Select a File (step 2 of 3)"
+msgstr "Elija un archivo (paso 2 de 3)"
 
-#: my-evolution/Locations.h:197
-msgid "Battle Creek"
-msgstr "Battle Creek"
+#: shell/importer/import.glade.h:7
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"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:189
+msgid "Importers"
+msgstr "Importadores"
+
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+msgid "Import"
+msgstr "Importar"
+
+#: shell/importer/intelligent.c:195
+msgid "Don't import"
+msgstr "No importar"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "No me preguntes más veces"
 
-#: my-evolution/Locations.h:198
-msgid "Battle Mountain"
-msgstr "Battle Mountain"
+#: 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:109 shell/main.c:561
+msgid "Evolution"
+msgstr "Evolution"
+
+#: shell/main.c:115
+msgid "Evolution is now exiting ..."
+msgstr "Evolution está terminando ..."
+
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:265
+#, 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 is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\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 en descargar esta versión \n"
+"liberación preliminar de la suite para trabajo en grupo de Ximian, "
+"Evolution.\n"
+"\n"
+"Esta versión de Ximian Evolution todavía no está terminada. Está cerca de "
+"terminarse\n"
+"pero algunas características están incompletas o no funcionan bien.\n"
+"\n"
+"Si quiere una versión estable de Evolution, es mejor que desinstale esta "
+"versión e instale la versión %s en su lugar.\n"
+"\n"
+"Si encuentra fallos, por favor informenos de ellos en bugzilla.ximian.com.\n"
+"Este producto viene sin garantía alguna y no está dirigido a personas "
+"proclives a\n"
+"abscesos violentos de ira.\n"
+"\n"
+"esperamos que disfrute de nuestro duro trabajo, y esperamos su "
+"contribución.\n"
 
-#: my-evolution/Locations.h:199
-msgid "Bauru"
-msgstr "Bauru"
+#: shell/main.c:289
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Gracias\n"
+"El equipo de Ximian Evolution\n"
 
-#: my-evolution/Locations.h:200
-msgid "Bayamo"
-msgstr "Bayamo"
+#: shell/main.c:297
+msgid "Don't tell me again"
+msgstr "No preguntarme más veces"
 
-#: my-evolution/Locations.h:201
-msgid "Bayreuth"
-msgstr "Bayreuth"
+#: shell/main.c:389
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "No se pudo acceder a la shell de Ximian Evolution."
 
-#: my-evolution/Locations.h:202
-msgid "Beatrice"
-msgstr "Beatrice"
+#: shell/main.c:398
+#, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
 
-#: my-evolution/Locations.h:203
-msgid "Beaufort"
-msgstr "Beaufort"
+#: shell/main.c:530
+msgid "Start in offline mode"
+msgstr "Iniciar en modo desconectado"
 
-#: my-evolution/Locations.h:204
-msgid "Beaumont"
-msgstr "Beaumont"
+#: shell/main.c:532
+msgid "Start in online mode"
+msgstr "Iniciar en modo conectado"
 
-#: my-evolution/Locations.h:205
-msgid "Beaumont-Port Arthur"
-msgstr "Beaumont-Port Arthur"
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr "Forzar el cierre de todos los componentes de evolution"
 
-#: my-evolution/Locations.h:206
-msgid "Beauvais-Tille"
-msgstr "Beauvais-Tille"
+#: shell/main.c:538
+msgid "Send the debugging output of all components to a file."
+msgstr "Envía la salida de depurado de todos los componente a un archivo."
 
-#: my-evolution/Locations.h:207
-msgid "Beauvechain"
-msgstr "Beauvechain"
+#: shell/main.c:565
+#, 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"
 
-#: my-evolution/Locations.h:208
-msgid "Beckley"
-msgstr "Beckley"
+#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
+#: smime/gui/certificate-manager.c:168
+#, fuzzy
+msgid "Certificate Name"
+msgstr "ID del _certificado:"
 
-#: my-evolution/Locations.h:209
-msgid "Bedford"
-msgstr "Bedford"
+#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#, fuzzy
+msgid "Purposes"
+msgstr "Progreso"
 
-#: my-evolution/Locations.h:210
-msgid "Beijing"
-msgstr "Beijing"
+#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+msgid "Serial Number"
+msgstr ""
 
-#: my-evolution/Locations.h:211
-msgid "Beirut"
-msgstr "Beirut"
+#: smime/gui/certificate-manager.c:92
+#, fuzzy
+msgid "Expires"
+msgstr "Expresión"
 
-#: my-evolution/Locations.h:212
-msgid "Beja"
-msgstr "Beja"
+#: smime/gui/certificate-manager.c:121
+#, fuzzy
+msgid "E-Mail Address"
+msgstr "Dirección de correo:"
 
-#: my-evolution/Locations.h:213
-msgid "Belem"
-msgstr "Belén"
+#: smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr ""
 
-#: my-evolution/Locations.h:214
-msgid "Belfast/Aldergrove"
-msgstr "Belfast/Aldergrove"
+#: smime/gui/smime-ui.glade.h:2
+#, fuzzy
+msgid "<b>Certificate Fields</b>"
+msgstr "Certificado revocado"
 
-#: my-evolution/Locations.h:215
-msgid "Belfast/Harbour"
-msgstr "Belfast/Harbour"
+#: smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:217
-msgid "Belgorod"
-msgstr "Belgorod"
+#: smime/gui/smime-ui.glade.h:4
+#, fuzzy
+msgid "<b>Field Value</b>"
+msgstr "<b>Enviando correo:</b>"
 
-#: my-evolution/Locations.h:219
-msgid "Belleville"
-msgstr "Belleville"
+#: smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:220
-msgid "Bellingham"
-msgstr "Bellingham"
+#: smime/gui/smime-ui.glade.h:6
+#, fuzzy
+msgid "<b>Issued By</b>"
+msgstr "<b>Vencimiento:</b>"
 
-#: my-evolution/Locations.h:221
-msgid "Belmar-Farmingdale"
-msgstr "Belmar-Farmingdale"
+#: smime/gui/smime-ui.glade.h:7
+#, fuzzy
+msgid "<b>Issued To</b>"
+msgstr "<b>Vencimiento:</b>"
 
-#: my-evolution/Locations.h:222
-msgid "Belo Horizonte"
-msgstr "Belo Horizonte"
+#: smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:223
-msgid "Belo Horizonte Apt"
-msgstr "Belo Horizonte Apt"
+#: smime/gui/smime-ui.glade.h:9
+#, fuzzy
+msgid "<b>Validity</b>"
+msgstr "<b>Estado:</b>"
 
-#: my-evolution/Locations.h:224
-msgid "Bemidji"
-msgstr "Bemidji"
+#: smime/gui/smime-ui.glade.h:10
+#, fuzzy
+msgid "Authorities"
+msgstr "Poitiers"
 
-#: my-evolution/Locations.h:225
-msgid "Benbecula"
-msgstr "Benbecula"
+#: smime/gui/smime-ui.glade.h:11
+#, fuzzy
+msgid "Backup"
+msgstr "Blackpool"
 
-#: my-evolution/Locations.h:226
-msgid "Benina"
-msgstr "Benina"
+#: smime/gui/smime-ui.glade.h:12
+#, fuzzy
+msgid "Backup All"
+msgstr "Blackpool"
 
-#: my-evolution/Locations.h:227
-msgid "Benton Harbor"
-msgstr "Benton Harbor"
+#: smime/gui/smime-ui.glade.h:13
+#, fuzzy
+msgid "Common Name (CN)"
+msgstr "Nombre común"
 
-#: my-evolution/Locations.h:228
-msgid "Bentonville"
-msgstr "Bentonville"
+#: smime/gui/smime-ui.glade.h:14
+#, fuzzy
+msgid "Contact Certificates"
+msgstr "ID del _certificado:"
 
-#: my-evolution/Locations.h:229
-msgid "Beograd"
-msgstr "Beograd"
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Edit"
+msgstr "_Editar"
 
-#: my-evolution/Locations.h:230
-msgid "Bergamo"
-msgstr "Bergamo"
+#: smime/gui/smime-ui.glade.h:17
+msgid "Email Recipient Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:231
-msgid "Bergen"
-msgstr "Bergen"
+#: smime/gui/smime-ui.glade.h:18
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "Error al verificar el certificado."
 
-#: my-evolution/Locations.h:232
-msgid "Bergstrom AFB"
-msgstr "Bergstrom AFB"
+#: smime/gui/smime-ui.glade.h:19
+#, fuzzy
+msgid "Expires On"
+msgstr "Expresión"
 
-#: my-evolution/Locations.h:233
-msgid "Berlevag"
-msgstr "Berlevag"
+#: smime/gui/smime-ui.glade.h:22
+msgid "Issued On"
+msgstr ""
 
-#: my-evolution/Locations.h:234
-msgid "Berlin"
-msgstr "Berlín"
+#: smime/gui/smime-ui.glade.h:23
+msgid "MD5 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:235
-msgid "Berlin-Tegel"
-msgstr "Berlin-Tegel"
+#: smime/gui/smime-ui.glade.h:24
+#, fuzzy
+msgid "Organization (O)"
+msgstr "Organización"
 
-#: my-evolution/Locations.h:236
-msgid "Berlin-Tempelhof"
-msgstr "Berlin-Tempelhof"
+#: smime/gui/smime-ui.glade.h:25
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Unidad de organización"
 
-#: my-evolution/Locations.h:237
-msgid "Bern"
-msgstr "Berna"
+#: smime/gui/smime-ui.glade.h:26
+msgid "SHA1 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:238
-msgid "Bethel"
-msgstr "Bethel"
+#: smime/gui/smime-ui.glade.h:27
+msgid "SSL Client Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:239
-msgid "Bethlehem Airport"
-msgstr "Aeropuerto de Belén"
+#: smime/gui/smime-ui.glade.h:28
+msgid "SSL Server Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:240
-msgid "Bettles"
-msgstr "Bettles"
+#: smime/gui/smime-ui.glade.h:30
+#, fuzzy
+msgid "View"
+msgstr "_Ver"
 
-#: my-evolution/Locations.h:241
-msgid "Beverly"
-msgstr "Beverly"
+#: smime/gui/smime-ui.glade.h:31
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
 
-#: my-evolution/Locations.h:242
-msgid "Biarritz-Bayonne"
-msgstr "Biarritz-Bayonne"
+#: smime/gui/smime-ui.glade.h:32
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
 
-#: my-evolution/Locations.h:243
-msgid "Bicycle Lake"
-msgstr "Lago Bicycle"
+#: smime/gui/smime-ui.glade.h:33
+msgid "You have certificates on file that identify these people:"
+msgstr ""
 
-#: my-evolution/Locations.h:244
-msgid "Biggin Hill"
-msgstr "Biggin Hill"
+#: smime/gui/smime-ui.glade.h:34
+#, fuzzy
+msgid "Your Certificates"
+msgstr "ID del _certificado:"
 
-#: my-evolution/Locations.h:245
-msgid "Big Piney"
-msgstr "Big Piney"
+#: smime/gui/smime-ui.glade.h:36
+#, fuzzy
+msgid "import"
+msgstr "Importar"
 
-#: my-evolution/Locations.h:246
-msgid "Big River Lake"
-msgstr "Lago Big River"
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr "Un adjunto para añadir"
 
-#: my-evolution/Locations.h:247
-msgid "Bilbao"
-msgstr "Bilbao"
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr "Tipo de contenido del adjunto."
 
-#: my-evolution/Locations.h:248
-msgid "Billings"
-msgstr "Billings"
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr "El nombre del fichero a mostrar en el correo."
 
-#: my-evolution/Locations.h:249
-msgid "Billund"
-msgstr "Billund"
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr "Descripción del adjunto"
 
-#: my-evolution/Locations.h:250
-msgid "Binghamton"
-msgstr "Binghamton"
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr "Marcar adjunto para que sea mostrado en línea por omisión."
 
-#: my-evolution/Locations.h:251
-msgid "Birmingham"
-msgstr "Birmingham"
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr "Asunto predeterminado para el mensaje."
 
-#: my-evolution/Locations.h:252
-msgid "Bisha"
-msgstr "Bisha"
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "No se pudo ejecutar: «%s»: %s\n"
 
-#: my-evolution/Locations.h:253
-msgid "Bishop"
-msgstr "Bishop"
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr "Cerrando %s (%s)\n"
 
-#: my-evolution/Locations.h:254
-msgid "Bismark"
-msgstr "Bismark"
+#: ui/evolution-addressbook.xml.h:3
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Copia contact(os) a otra carpeta..."
 
-#: my-evolution/Locations.h:255
-msgid "Blackpool"
-msgstr "Blackpool"
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Copia la selección"
 
-#: my-evolution/Locations.h:256
-msgid "Blagoveschensk"
-msgstr "Blagoveschensk"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Copia a la carpeta..."
 
-#: my-evolution/Locations.h:257
-msgid "Blanding"
-msgstr "Blanding"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Corta la selección"
 
-#: my-evolution/Locations.h:258
-msgid "Block Island"
-msgstr "Block Island"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Borra los contactos seleccionados"
 
-#: my-evolution/Locations.h:259
-msgid "Bloemfontein J. B. M. Hertzog "
-msgstr "Bloemfontein J. B. M. Hertzog "
+#: ui/evolution-addressbook.xml.h:11
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Mover contact(os) a otra carpeta..."
 
-#: my-evolution/Locations.h:260
-msgid "Bloomington"
-msgstr "Bloomington"
+#: ui/evolution-addressbook.xml.h:12
+msgid "Move to Folder..."
+msgstr "Mover a la carpeta..."
 
-#: my-evolution/Locations.h:261
-msgid "Blue Canyon"
-msgstr "Blue Canyon"
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+msgid "Paste the clipboard"
+msgstr "Pega el contenido del porta papeles"
 
-#: my-evolution/Locations.h:262
-msgid "Bluefield"
-msgstr "Bluefield"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Previews the contacts to be printed"
+msgstr "Previsualiza los contactos a imprimir"
 
-#: my-evolution/Locations.h:263
-msgid "Bluefields"
-msgstr "Bluefields"
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
+msgid "Print Pre_view"
+msgstr "Pre_visualizar la impresión"
 
-#: my-evolution/Locations.h:264
-msgid "Blythe"
-msgstr "Blythe"
+#: ui/evolution-addressbook.xml.h:18
+msgid "Print selected contacts"
+msgstr "Imprime los contactos seleccionados"
 
-#: my-evolution/Locations.h:265
-msgid "Boa Vista"
-msgstr "Boa Vista"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr "Guarda los contactos seleccionados en una VCard."
 
-#: my-evolution/Locations.h:266
-msgid "Bocas del Toro"
-msgstr "Bocas del Toro"
+#: ui/evolution-addressbook.xml.h:21
+msgid "Select All"
+msgstr "Seleccionar todo"
 
-#: my-evolution/Locations.h:267
-msgid "Bodo"
-msgstr "Bodo"
+#: ui/evolution-addressbook.xml.h:22
+msgid "Select all contacts"
+msgstr "Seleccionar todos los contactos"
 
-#: my-evolution/Locations.h:268
-msgid "Bogota/Eldorado"
-msgstr "Bogotá/Eldorado"
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send a mess to the selected contacts."
+msgstr "Envía un mensaje a los contactos seleccionados"
 
-#: my-evolution/Locations.h:269
-msgid "Boise"
-msgstr "Boise"
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send message to contact"
+msgstr "Envía un mensaje al contacto"
 
-#: my-evolution/Locations.h:271
-msgid "Bologna"
-msgstr "Boloña"
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send selected contacts to another person."
+msgstr "Envía los contactos seleccionados a otra persona."
 
-#: my-evolution/Locations.h:272
-msgid "Bolzano"
-msgstr "Bolzano"
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Parar"
 
-#: my-evolution/Locations.h:273
-msgid "Bombay/Santacruz"
-msgstr "Bombay/Santacruz"
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Parar la carga"
 
-#: my-evolution/Locations.h:274
-msgid "Boone"
-msgstr "Boone"
+#: ui/evolution-addressbook.xml.h:28
+msgid "View the current contact"
+msgstr "Ver el contacto actual"
 
-#: my-evolution/Locations.h:275
-msgid "Bordeaux"
-msgstr "Burdeos"
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+msgid "_Actions"
+msgstr "A_cciones"
 
-#: my-evolution/Locations.h:276
-msgid "Borger"
-msgstr "Borger"
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+msgid "_Forward Contact..."
+msgstr "_Reenviar contactos..."
 
-#: my-evolution/Locations.h:277
-msgid "Bornholm"
-msgstr "Bornholm"
+#: ui/evolution-addressbook.xml.h:35
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpeta..."
 
-#: my-evolution/Locations.h:278
-msgid "Boscombe Down"
-msgstr "Boscombe Down"
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Save as VCard"
+msgstr "G_uardar como vCard"
 
-#: my-evolution/Locations.h:279
-msgid "Bosnia-Herzegovina"
-msgstr "Bosnia y Herzegovina"
+#: ui/evolution-addressbook.xml.h:40
+msgid "_Search for Contacts"
+msgstr "Bu_scar contactos"
+
+#: ui/evolution-addressbook.xml.h:41
+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:3
+#, fuzzy
+msgid "Create a new all-day event"
+msgstr "Crear una nueva cita para todo el día"
+
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
+
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Crear una nueva carpeta"
+
+#: ui/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "Crear una nueva petición de reunión"
+
+#: ui/evolution-calendar.xml.h:7
+msgid "Create a new task"
+msgstr "Crear una nueva tarea"
+
+#: ui/evolution-calendar.xml.h:9
+msgid "Day"
+msgstr "Día"
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Delete All Occurrences"
+msgstr "Borrar todas las ocurrencias"
+
+#: ui/evolution-calendar.xml.h:11
+msgid "Delete the appointment"
+msgstr "Borrar la cita"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Delete this Occurrence"
+msgstr "Borrar esta ocurrencia"
+
+#: ui/evolution-calendar.xml.h:13
+msgid "Delete this occurrence"
+msgstr "Borrar esta ocurrencia"
+
+#: ui/evolution-calendar.xml.h:14
+msgid "Go To"
+msgstr "Ir a"
+
+#: ui/evolution-calendar.xml.h:15
+msgid "Go back"
+msgstr "Volver"
+
+#: ui/evolution-calendar.xml.h:16
+msgid "Go forward"
+msgstr "Avanzar"
+
+#: ui/evolution-calendar.xml.h:17
+msgid "Go to _Date"
+msgstr "Ir a una _fecha"
+
+#: ui/evolution-calendar.xml.h:19
+msgid "Go to a specific date"
+msgstr "Ir a una fecha específica"
+
+#: ui/evolution-calendar.xml.h:20
+msgid "Go to today"
+msgstr "Ir a hoy"
+
+#: ui/evolution-calendar.xml.h:22
+msgid "Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:24
+msgid "New _Appointment"
+msgstr "Nueva cit_a"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "New _Calendar"
+msgstr "Nueva Caledonia"
 
-#: my-evolution/Locations.h:280
-msgid "Boston"
-msgstr "Boston"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "New _Meeting"
+msgstr "Nueva reunión"
 
-#: my-evolution/Locations.h:281
-msgid "Boulmer"
-msgstr "Boulmer"
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "New _Task"
+msgstr "Tarea nueva"
+
+#: ui/evolution-calendar.xml.h:29
+msgid "Previews the calendar to be printed"
+msgstr "Previsualiza el calendario a imprimir"
+
+#: ui/evolution-calendar.xml.h:31
+msgid "Print this calendar"
+msgstr "Imprime este calendario"
 
-#: my-evolution/Locations.h:282
-msgid "Bourges"
+#: ui/evolution-calendar.xml.h:32
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Publica información de disponibilidad para este calendario"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
 msgstr "Bourges"
 
-#: my-evolution/Locations.h:283
-msgid "Bournemouth"
-msgstr "Bournemouth"
+#: ui/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Carpeta pública conteniendo citas y eventos"
+
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "Show as list"
+msgstr "Mostrar detalles"
+
+#: ui/evolution-calendar.xml.h:36
+msgid "Show one day"
+msgstr "Mostrar un día"
+
+#: ui/evolution-calendar.xml.h:37
+msgid "Show one month"
+msgstr "Mostrar un mes"
+
+#: ui/evolution-calendar.xml.h:38
+msgid "Show one week"
+msgstr "Mostrar una semana"
+
+#: ui/evolution-calendar.xml.h:39
+msgid "Show the working week"
+msgstr "Mostrar la semana laboral"
+
+#: ui/evolution-calendar.xml.h:40
+msgid "Week"
+msgstr "Semana"
+
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:3
+msgid "Close"
+msgstr "Cerrar"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this item"
+msgstr "Cerrar este elemento"
+
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+msgid "Delete this item"
+msgstr "Borrar este elemento"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:9
+msgid "Main toolbar"
+msgstr "Barra de herramientas principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Previsualizar el elemento que va a ser impreso"
+
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+msgid "Print this item"
+msgstr "Imprime este elemento"
+
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Guardar _como..."
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Guardar y cerrar"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Guardar y cerrar"
+
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save the item and close the dialog box"
+msgstr "Guarda el elemento y cierra la ventana de diálogo"
+
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save this item to disk"
+msgstr "Guarda este elemento a disco"
+
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:24
+msgid "_File"
+msgstr "_Archivo"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ui/evolution-composer-entries.xml.h:1
+msgid "Copy selected text to the clipboard"
+msgstr "Copia el texto seleccionado al portapapeles"
+
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ui/evolution-composer-entries.xml.h:3
+msgid "Cut selected text to the clipboard"
+msgstr "Corta el texto seleccionado al portapapeles"
+
+#: ui/evolution-composer-entries.xml.h:4
+msgid "Paste text from the clipboard"
+msgstr "Pega texto desde el portapapeles"
+
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
+#: ui/evolution-composer-entries.xml.h:6
+msgid "Select all text"
+msgstr "Selecciona todo el texto"
+
+#: ui/evolution-contact-editor.xml.h:6
+msgid "Print En_velope..."
+msgstr "Imprimir so_bre..."
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Save the contact and close the dialog box"
+msgstr "Guarda el contacto y cierra la ventana de diálogo"
+
+#: ui/evolution-contact-editor.xml.h:12
+msgid "Send _Message to Contact..."
+msgstr "Envía un _mensaje al contacto..."
+
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete this list"
+msgstr "Borra esta lista"
+
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save the list and close the dialog box"
+msgstr "Guarda la lista y cierra la ventana de diálogo"
+
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Se_nd list to other..."
+msgstr "E_nviar la lista a otros..."
+
+#: ui/evolution-contact-list-editor.xml.h:10
+msgid "Send _message to list..."
+msgstr "Enviar un _mensaje a la lista..."
+
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Borrar..."
+
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Cancelar reun_ión"
+
+#: ui/evolution-event-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+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 "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 "Reenvía este elemento por correo"
+
+#: ui/evolution-event-editor.xml.h:7
+msgid "Obtain the latest meeting information"
+msgstr "Obtiene la última información de la reunión"
+
+#: ui/evolution-event-editor.xml.h:8
+msgid "Re_fresh Meeting"
+msgstr "Actuali_zar reunión"
+
+#: ui/evolution-event-editor.xml.h:9
+msgid "Schedule _Meeting"
+msgstr "Concertar una _reunión"
+
+#: ui/evolution-event-editor.xml.h:10
+msgid "Schedule a meeting for this item"
+msgstr "Concierta una reunión para este elemento"
+
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customize My Evolution"
+msgstr "Personaliza Mi Evolution"
+
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Cancela la operación de correo actual"
 
-#: my-evolution/Locations.h:284
-msgid "Bowling Green"
-msgstr "Bowling Green"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose _New Message"
+msgstr "Redactar un _mensaje nuevo"
 
-#: my-evolution/Locations.h:285
-msgid "Bozeman"
-msgstr "Bozeman"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
 
-#: my-evolution/Locations.h:286
-msgid "Bradford"
-msgstr "Bradford"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit virtual folder definitions"
+msgstr "Crea o edita definiciones de carpetas virtuales"
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Empty _Trash"
+msgstr "_Vaciar papelera"
+
+#: ui/evolution-mail-global.xml.h:7
+msgid "Forget _Passwords"
+msgstr "Olvidar _contraseñas"
+
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Open a window for composing a mail message"
+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 ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post Ne_w Message"
+msgstr "Publicar un mensaje nuevo"
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Post a message to a Public folder"
+msgstr "Publica un mensaje en una carpeta pública"
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "S_ubscribe to Folders..."
+msgstr "S_uscribirse a carpetas..."
 
-#: my-evolution/Locations.h:287
-msgid "Bradshaw Field"
-msgstr "Bradshaw Field"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Show message preview window"
+msgstr "Muestra una ventana de previsualización de mensajes"
 
-#: my-evolution/Locations.h:288
-msgid "Brainerd"
-msgstr "Brainerd"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
-#: my-evolution/Locations.h:289
-msgid "Brasilia"
-msgstr "Brasilia"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor de carpetas virtuales..."
 
-#: my-evolution/Locations.h:290
-msgid "Brasschaat"
-msgstr "Brasschaat"
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filtros..."
 
-#: my-evolution/Locations.h:291
-msgid "Bratislava"
-msgstr "Bratislava"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Preview Pane"
+msgstr "Panel de _previsualización"
 
-#: my-evolution/Locations.h:292
-msgid "Bratsk"
-msgstr "Bratsk"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Cambia las propiedades de esta carpeta"
 
-#: my-evolution/Locations.h:293
-msgid "Braunschweig"
-msgstr "Braunschweig"
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copia mensajes seleccionados al portapapeles"
 
-#: my-evolution/Locations.h:295
-msgid "Bremen"
-msgstr "Bremen"
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
 
-#: my-evolution/Locations.h:296
-msgid "Bremerton"
-msgstr "Bremerton"
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "P_urgar"
 
-#: my-evolution/Locations.h:297
-msgid "Brest"
-msgstr "Brest"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Hide S_elected Messages"
+msgstr "Ocultar los mensajes _seleccionados"
 
-#: my-evolution/Locations.h:298
-msgid "Bridgeport"
-msgstr "Bridgeport"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide _Deleted Messages"
+msgstr "Ocultar mensajes _borrados"
 
-#: my-evolution/Locations.h:299
-msgid "Brindisi"
-msgstr "Brindisi"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Read Messages"
+msgstr "Oculta_r mensajes leídos"
 
-#: my-evolution/Locations.h:300
-msgid "Brisbane"
-msgstr "Brisbane"
+#: 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"
 
-#: my-evolution/Locations.h:301
-msgid "Bristol"
-msgstr "Bristol"
+#: ui/evolution-mail-list.xml.h:9
+msgid "Mark All as _Read"
+msgstr "Marcar todos como _leídos"
 
-#: my-evolution/Locations.h:302
-msgid "British Columbia"
-msgstr "British Columbia"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark all visible messages as read"
+msgstr "Marca los mensajes visibles como leídos"
 
-#: my-evolution/Locations.h:303
-msgid "Brno"
-msgstr "Brno"
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+msgid "Paste message(s) from the clipboard"
+msgstr "Pega un(os) mensaje(s) desde el portapapeles"
 
-#: my-evolution/Locations.h:304
-msgid "Broadus"
-msgstr "Broadus"
+#: ui/evolution-mail-list.xml.h:12
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: my-evolution/Locations.h:305
-msgid "Broken Bow"
-msgstr "Broken Bow"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Select _Thread"
+msgstr "Seleccionar _hilo"
 
-#: my-evolution/Locations.h:306
-msgid "Bronnoysund"
-msgstr "Bronnoysund"
+#: 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"
 
-#: my-evolution/Locations.h:307
-msgid "Brookings"
-msgstr "Brookings"
+#: 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"
 
-#: my-evolution/Locations.h:308
-msgid "Brooksville"
-msgstr "Brooksville"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all visible messages"
+msgstr "Selecciona todos los mensajes visibles"
 
-#: my-evolution/Locations.h:309
-msgid "Broome"
-msgstr "Broome"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
+msgstr "M_ostrar mensajes ocultos"
 
-#: my-evolution/Locations.h:310
-msgid "Brownsville"
-msgstr "Brownsville"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Show messages that have been temporarily hidden"
+msgstr "Muestra los mensajes que han estado ocultos temporalmente"
 
-#: my-evolution/Locations.h:311
-msgid "Brunswick"
-msgstr "Brunswick"
+#: 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"
 
-#: my-evolution/Locations.h:312
-msgid "Brussels-National Airport"
-msgstr "Aeropuerto Nacional de Bruselas"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Temporarily hide the selected messages"
+msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: my-evolution/Locations.h:313
-msgid "Bryansk"
-msgstr "Bryansk"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Threaded Message list"
+msgstr "Lista de mensajes encadenados"
 
-#: my-evolution/Locations.h:314
-msgid "Bryce Canyon"
-msgstr "Bryce Canyon"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Folder"
+msgstr "Carpe_ta"
 
-#: my-evolution/Locations.h:315
-msgid "Bucaramanga/Palonegro"
-msgstr "Bucaramanga/Palonegro"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Invertir selección"
 
-#: my-evolution/Locations.h:316
-msgid "Bucuresti"
-msgstr "Bucarest"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Threaded Message List"
+msgstr "_Lista de mensajes encadenados"
 
-#: my-evolution/Locations.h:317
-msgid "Bucuresti-Otopeni"
-msgstr "Bucarest-Otopeni"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
 
-#: my-evolution/Locations.h:318
-msgid "Budapest"
-msgstr "Budapest"
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:23
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: my-evolution/Locations.h:319
-msgid "Buffalo"
-msgstr "Búfalo"
+#: ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Addressbook"
+msgstr "Aña_dir remitente a la agenda"
 
-#: my-evolution/Locations.h:321
-msgid "Bullfrog"
-msgstr "Bullfrog"
+#: ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "A_plicar filtros"
 
-#: my-evolution/Locations.h:322
-msgid "Burbank"
-msgstr "Burbank"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Add Sender to Addressbook"
+msgstr "Añadir remitente a la agenda"
 
-#: my-evolution/Locations.h:323
-msgid "Burgas"
-msgstr "Burgas"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: my-evolution/Locations.h:324
-msgid "Burley"
-msgstr "Burley"
+#: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Modelo del texto"
 
-#: my-evolution/Locations.h:325
-msgid "Burlington"
-msgstr "Burlington"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responde a todos los destinatarios del mensaje seleccionado"
 
-#: my-evolution/Locations.h:326
-msgid "Burnet"
-msgstr "Burnet"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: my-evolution/Locations.h:327
-msgid "Burns"
-msgstr "Burns"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responde al remitente del mensaje seleccionado"
 
-#: my-evolution/Locations.h:328
-msgid "Bursa"
-msgstr "Bursa"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Copy selected messages to another folder"
+msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: my-evolution/Locations.h:329
-msgid "Burwell"
-msgstr "Burwell"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create _Virtual Folder From Message"
+msgstr "Crear una carpeta _virtual según el mensaje"
 
-#: my-evolution/Locations.h:330
-msgid "Butte"
-msgstr "Butte"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: my-evolution/Locations.h:331
-msgid "Caen-Carpiquet"
-msgstr "Caen-Carpiquet"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: my-evolution/Locations.h:332
-msgid "Cagliari"
-msgstr "Cagliari"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: my-evolution/Locations.h:333
-msgid "Cairns"
-msgstr "Cairns"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
-#: my-evolution/Locations.h:334
-msgid "Cairo"
-msgstr "El Cairo"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for these recipients"
+msgstr "Crea una carpeta virtual para estos destinatarios"
 
-#: my-evolution/Locations.h:335
-msgid "Calabozo"
-msgstr "Calabozo"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this mailing list"
+msgstr "Crea una carpeta virtual para esta lista de correo"
 
-#: my-evolution/Locations.h:336
-msgid "Calcutta/Dum Dum"
-msgstr "Calcuta/Dum Dum"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Create a virtual folder for this sender"
+msgstr "Crea una carpeta virtual para este remitente"
 
-#: my-evolution/Locations.h:337
-msgid "Caldwell"
-msgstr "Caldwell"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Create a virtual folder for this subject"
+msgstr "Crea una carpeta virtual para este asunto"
 
-#: my-evolution/Locations.h:338
-msgid "Calgary"
-msgstr "Calgary"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Decrease the text size"
+msgstr "Reduce el tamaño del texto"
 
-#: my-evolution/Locations.h:339
-msgid "Cali/Alfonso Bonillaaragon"
-msgstr "Cali/Alfonso Bonillaaragon"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Display the next important message"
+msgstr "Muestra el siguiente mensaje importante"
 
-#: my-evolution/Locations.h:340
-msgid "Caliente"
-msgstr "Caliente"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Display the next message"
+msgstr "Muestra el mensaje siguiente"
 
-#: my-evolution/Locations.h:341
-msgid "California"
-msgstr "California"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Display the next unread message"
+msgstr "Muestra el siguiente mensaje no leído"
 
-#: my-evolution/Locations.h:342
-msgid "Calvi-Ste-Catherine"
-msgstr "Calvi-Ste-Catherine"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Display the next unread thread"
+msgstr "Muestra el siguiente hilo no leído"
 
-#: my-evolution/Locations.h:343
-msgid "Camaguey"
-msgstr "Camaguey"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Display the previous important message"
+msgstr "Muestra el anterior mensaje importante"
 
-#: my-evolution/Locations.h:344
-msgid "Camarillo"
-msgstr "Camarillo"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Display the previous message"
+msgstr "Muestra el mensaje anterior"
 
-#: my-evolution/Locations.h:345
-msgid "Cambridge"
-msgstr "Cambridge"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Display the previous unread message"
+msgstr "Muestra el anterior mensaje no leído"
 
-#: my-evolution/Locations.h:346
-msgid "Cameron"
-msgstr "Cameron"
+#: ui/evolution-mail-message.xml.h:32
+msgid "F_orward"
+msgstr "Reen_viar"
 
-#: my-evolution/Locations.h:347
-msgid "Camiri"
-msgstr "Camiri"
+#: ui/evolution-mail-message.xml.h:33
+msgid "Filter on Mailing _List..."
+msgstr "Filtrar según la _lista de correo..."
 
-#: my-evolution/Locations.h:348
-msgid "Campeche"
-msgstr "Campeche"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Filter on Se_nder..."
+msgstr "Filtrar según el remite_nte..."
 
-#: my-evolution/Locations.h:349
-msgid "Campinas"
-msgstr "Campinas"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Filter on _Recipients..."
+msgstr "Filtrar según los destinata_rios..."
 
-#: my-evolution/Locations.h:350
-msgid "Campo"
-msgstr "Campo"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Subject..."
+msgstr "Filtrar según el a_sunto..."
+
+#: ui/evolution-mail-message.xml.h:37
+msgid "Flag selected message(s) for follow-up"
+msgstr "Marcar los mensajes seleccionados para seguimiento"
+
+#: ui/evolution-mail-message.xml.h:38
+msgid "Follow _Up..."
+msgstr "_Seguimiento..."
+
+#: ui/evolution-mail-message.xml.h:39
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar la carga de imágenes en el correo HTML"
+
+#: ui/evolution-mail-message.xml.h:41
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
+
+#: ui/evolution-mail-message.xml.h:42
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
+
+#: ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message to someone"
+msgstr "Reenvía a alguien el mensaje seleccionado"
+
+#: ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
+
+#: ui/evolution-mail-message.xml.h:45
+msgid "Increase the text size"
+msgstr "Incrementar el tamaño del texto"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Load _Images"
+msgstr "Cargar _imágenes"
+
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark as I_mportant"
+msgstr "Marcar como i_mportante"
+
+#: ui/evolution-mail-message.xml.h:49
+msgid "Mark as U_nread"
+msgstr "Marcar como _no leído"
+
+#: ui/evolution-mail-message.xml.h:50
+msgid "Mark as Unimp_ortant"
+msgstr "Marcar como no imp_ortante"
+
+#: ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected message(s) as having been read"
+msgstr "Marca el(los) mensaje(s) seleccionado(s) como leídos"
+
+#: ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected message(s) as important"
+msgstr "Marca el(los)r mensaje(s) seleccionado(s) como importantes"
+
+#: ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected message(s) as not having been read"
+msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leídos"
+
+#: ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Marcar mensaje(s) seleccionado(s) como no importantes"
+
+#: ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar los mensajes seleccionados para borrar"
+
+#: ui/evolution-mail-message.xml.h:56
+msgid "Move"
+msgstr "Mover"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Move selected message(s) to another folder"
+msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
+
+#: ui/evolution-mail-message.xml.h:58
+msgid "Next"
+msgstr "Siguiente"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr "Siguiente mensaje _importante"
+
+#: ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr "Siguiente _hilo"
+
+#: ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr "Siguiente m_ensaje no leído"
+
+#: ui/evolution-mail-message.xml.h:62
+msgid "Open the selected message in a new window"
+msgstr "Abre el mensaje seleccionado en una nueva ventana"
+
+#: ui/evolution-mail-message.xml.h:63
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Abre el mensaje seleccionado para reenviarlo"
+
+#: ui/evolution-mail-message.xml.h:64
+msgid "Original Si_ze"
+msgstr "Tamaño _original"
+
+#: ui/evolution-mail-message.xml.h:65
+msgid "P_revious Unread Message"
+msgstr "Me_nsaje anterior no leído"
+
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
+msgstr "Publicar una respuesta"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Post a reply to a message in a Public folder"
+msgstr "Publica una respuesta a un mensaje en una carpeta pública"
+
+#: ui/evolution-mail-message.xml.h:69
+msgid "Pr_evious Important Message"
+msgstr "Mensaje importante an_terior"
+
+#: ui/evolution-mail-message.xml.h:70
+msgid "Preview the message to be printed"
+msgstr "Previsualiza el mensaje que va a ser impreso"
+
+#: ui/evolution-mail-message.xml.h:71
+msgid "Previous"
+msgstr "Anterior"
+
+#: ui/evolution-mail-message.xml.h:74
+msgid "Print this message"
+msgstr "Imprimir este mensaje"
+
+#: ui/evolution-mail-message.xml.h:75
+msgid "Re_direct"
+msgstr "Re_dirigir"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Reenviar (rebotar) el mensaje seleccionado a alguien"
+
+#: ui/evolution-mail-message.xml.h:81
+msgid "Reset the text to its original size"
+msgstr "Dejar el texto en su tamaño original"
+
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
+msgstr "Bu_scar mensaje..."
+
+#: ui/evolution-mail-message.xml.h:83
+msgid "S_maller"
+msgstr "_Menor"
+
+#: ui/evolution-mail-message.xml.h:84
+msgid "Save the message as a text file"
+msgstr "Guardar el mensaje en un archivo de texto"
+
+#: ui/evolution-mail-message.xml.h:85
+msgid "Search for text in the body of the displayed message"
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
+
+#: ui/evolution-mail-message.xml.h:86
+msgid "Set up the page settings for your current printer"
+msgstr "Establecer la configuración de la página para la impresora actual"
+
+#: ui/evolution-mail-message.xml.h:87
+msgid "Show Email _Source"
+msgstr "Mostrar el _origen del mensaje"
+
+#: ui/evolution-mail-message.xml.h:88
+msgid "Show Full _Headers"
+msgstr "Mostrar _cabeceras completas"
+
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
+
+#: ui/evolution-mail-message.xml.h:90
+msgid "Show message in the normal style"
+msgstr "Mostrar mensajes en el estilo normal"
+
+#: ui/evolution-mail-message.xml.h:91
+msgid "Show message with all email headers"
+msgstr "Mostrar mensajes con todas las cabeceras"
+
+#: ui/evolution-mail-message.xml.h:92
+msgid "Show the raw email source of the message"
+msgstr "Mostrar la fuente del mensaje en bruto"
+
+#: ui/evolution-mail-message.xml.h:93
+msgid "Text Si_ze"
+msgstr "_Tamaño del texto"
+
+#: ui/evolution-mail-message.xml.h:94
+msgid "Un-delete the selected messages"
+msgstr "Recuperar los mensajes seleccionados"
+
+#: ui/evolution-mail-message.xml.h:95
+msgid "VFolder on Mailing _List..."
+msgstr "Carpeta virtual según la _lista de correo..."
+
+#: ui/evolution-mail-message.xml.h:96
+msgid "VFolder on Se_nder..."
+msgstr "Carpeta virtual según el remite_nte..."
+
+#: ui/evolution-mail-message.xml.h:97
+msgid "VFolder on _Recipients..."
+msgstr "Carpeta virtual según los destinata_rios..."
+
+#: ui/evolution-mail-message.xml.h:98
+msgid "VFolder on _Subject..."
+msgstr "Carpeta virtual según el a_sunto..."
+
+#: ui/evolution-mail-message.xml.h:100
+msgid "_Attached"
+msgstr "_Adjunto"
+
+#: ui/evolution-mail-message.xml.h:102
+msgid "_Copy to Folder"
+msgstr "_Copiar a la carpeta"
+
+#: ui/evolution-mail-message.xml.h:103
+msgid "_Create Filter From Message"
+msgstr "Crear un filtro del _mensaje"
+
+#: ui/evolution-mail-message.xml.h:105
+msgid "_Forward Message"
+msgstr "_Reenviar mensaje"
+
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Go To"
+msgstr "_Ir a"
+
+#: ui/evolution-mail-message.xml.h:107
+msgid "_Inline"
+msgstr "_Incluido en línea"
+
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Larger"
+msgstr "Ma_yor"
+
+#: ui/evolution-mail-message.xml.h:109
+msgid "_Message Display"
+msgstr "_Mostrar mensaje"
+
+#: ui/evolution-mail-message.xml.h:110
+msgid "_Move to Folder"
+msgstr "_Mover a la carpeta"
 
-#: my-evolution/Locations.h:351
-msgid "Campo Grande"
-msgstr "Campo Grande"
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Next Message"
+msgstr "Mensaje _siguiente"
+
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Normal Display"
+msgstr "Vista _normal"
+
+#: ui/evolution-mail-message.xml.h:113
+msgid "_Open Message"
+msgstr "_Abrir mensaje"
+
+#: ui/evolution-mail-message.xml.h:115
+msgid "_Previous Message"
+msgstr "Mensaje a_nterior"
+
+#: ui/evolution-mail-message.xml.h:117
+msgid "_Quoted"
+msgstr "_Citado"
+
+#: ui/evolution-mail-message.xml.h:119
+msgid "_Resend..."
+msgstr "_Reexpedir..."
+
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ui/evolution-mail-message.xml.h:122
+msgid "_Undelete"
+msgstr "_Recuperar"
+
+#: 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:3
+msgid "Close the current file"
+msgstr "Cierra el archivo actual"
+
+#: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Borra todo menos la firma"
+
+#: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr "Cifrar este mensaje con PGP"
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Cifra este mensaje con su certificado de cifrado S/MIME"
+
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+msgid "For_mat"
+msgstr "For_mato"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
+msgstr "HT_ML"
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Abrir"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Abrir un archivo"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr "Cifrar con PGP"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr "Firmar con PGP"
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "S/MIME Encrypt"
+msgstr "Cifrar con S/MIME"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Sign"
+msgstr "Firmar con S/MIME"
+
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Guardar"
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Guardar como"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save _Draft"
+msgstr "Guardar _borrador"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Guardar en carpeta..."
+
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Save the current file"
+msgstr "Guardar archivo actual"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+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"
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:11
+msgid "Send the mail in HTML format"
+msgstr "Enviar el mensaje en formato HTML"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send this message"
+msgstr "Enviar este mensaje"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Mostrar / ocultar adjuntos"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Mostrar _adjuntos"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Mostrar adjuntos"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Sign this message with your PGP key"
+msgstr "Firmar este mensaje con su clave PGP"
 
-#: my-evolution/Locations.h:352
-msgid "Camp Stanley/H-207"
-msgstr "Camp Stanley/H-207"
+#: ui/evolution-message-composer.xml.h:31
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: my-evolution/Locations.h:353
-msgid "Canaan"
-msgstr "Canaan"
+#: ui/evolution-message-composer.xml.h:32
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Activa si se muestra el campo CCO"
 
-#: my-evolution/Locations.h:355
-msgid "Canarias/Fuerteventura"
-msgstr "Canarias/Fuerteventura"
+#: ui/evolution-message-composer.xml.h:33
+msgid "Toggles whether the CC field is displayed"
+msgstr "Activa si se muestra el campo CC"
 
-#: my-evolution/Locations.h:356
-msgid "Canarias/Gran Canaria"
-msgstr "Canarias/Gran Canária"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Activa si se muestra el selector 'De'"
 
-#: my-evolution/Locations.h:357
-msgid "Canarias/Hierro"
-msgstr "Canarias/Hierro"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Activa si se muestra el campo Responder-A"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "_Attachment..."
+msgstr "_Adjunto..."
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "_Bcc Field"
+msgstr "Campo Cc_o"
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Cc Field"
+msgstr "Campo _Cc"
+
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Delete all"
+msgstr "_Borrar todo"
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_From Field"
+msgstr "Campo _De"
+
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Abrir..."
 
-#: my-evolution/Locations.h:358
-msgid "Canarias/Lanzarote"
-msgstr "Canarias/Lanzarote"
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Reply-To Field"
+msgstr "Campo _Responder-A"
 
-#: my-evolution/Locations.h:359
-msgid "Canarias/La Palma"
-msgstr "Canarias/La Palma"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Seguridad"
 
-#: my-evolution/Locations.h:360
-msgid "Canarias/Tenerife Norte"
-msgstr "Canarias/Tenerife Norte"
+#: ui/evolution-signature-editor.xml.h:5
+msgid "H_TML"
+msgstr "H_TML"
 
-#: my-evolution/Locations.h:361
-msgid "Canarias/Tenerife Sur"
-msgstr "Canarias/Tenerife Sur"
+#: ui/evolution-signature-editor.xml.h:10
+msgid "Save the current file and close the window"
+msgstr "Guardar el archivo y cerrar la ventana de diálogo"
 
-#: my-evolution/Locations.h:362
-msgid "Canberra"
-msgstr "Canberra"
+#: 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"
 
-#: my-evolution/Locations.h:363
-msgid "Cancun"
-msgstr "Cancún"
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "Carpe_ta"
 
-#: my-evolution/Locations.h:364
-msgid "Cannes-Mandelieu"
-msgstr "Cannes-Mandelieu"
+#: ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Regenerar la lista"
 
-#: my-evolution/Locations.h:365
-msgid "Cantwell"
-msgstr "Cantwell"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr "Regenerar la lista de carpetas"
 
-#: my-evolution/Locations.h:366
-msgid "Cape Girardeau"
-msgstr "Cabo Girardeau"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Quitar carpetas de su lista de carpetas suscritas"
 
-#: my-evolution/Locations.h:367
-msgid "Cape Hatteras"
-msgstr "Cabo Hatteras"
+#: ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr "Suscribir"
 
-#: my-evolution/Locations.h:368
-msgid "Cape Lisburne"
-msgstr "Cabo Lisburne"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr "Dessuscribir"
 
-#: my-evolution/Locations.h:369
-msgid "Cape Newenham"
-msgstr "Cabo Newenham"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Asignar tarea"
 
-#: my-evolution/Locations.h:370
-msgid "Cape Romanzoff"
-msgstr "Cabo Romanzoff"
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Asignar esta tarea a otros"
 
-#: my-evolution/Locations.h:371
-msgid "Cape Town D. F. Malan "
-msgstr "Cabo Town D. F. Malan "
+#: ui/evolution-task-editor.xml.h:3
+msgid "Cancel Task"
+msgstr "Cancelar tarea"
 
-#: my-evolution/Locations.h:372
-msgid "Capitan Corbeta"
-msgstr "Capitan Corbeta"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Cancelar esta tarea"
 
-#: my-evolution/Locations.h:373
-msgid "Capo Mele"
-msgstr "Capo Mele"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Obtener la última información de la tarea"
 
-#: my-evolution/Locations.h:374
-msgid "Caracas La Carlota"
-msgstr "Caracas La Carlota"
+#: ui/evolution-task-editor.xml.h:8
+msgid "Re_fresh Task"
+msgstr "Ac_tualizar tarea"
 
-#: my-evolution/Locations.h:375
-msgid "Caracas Maiquetia"
-msgstr "Caracas Maiquetia"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
+msgstr "Copiar las tareas seleccionadas"
 
-#: my-evolution/Locations.h:376
-msgid "Caravelas"
-msgstr "Caravelas"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
+msgstr "Corta las tareas seleccionadas"
 
-#: my-evolution/Locations.h:377
-msgid "Carbondale"
-msgstr "Carbondale"
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete completed tasks"
+msgstr "Borrar las tareas completadas"
 
-#: my-evolution/Locations.h:378
-msgid "Cardiff"
-msgstr "Cardiff"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Borrar las tareas seleccionadas"
 
-#: my-evolution/Locations.h:379
-msgid "Caribou"
-msgstr "Caribou"
+#: ui/evolution-tasks.xml.h:8
+msgid "Mar_k as Complete"
+msgstr "_Marcar como terminado"
 
-#: my-evolution/Locations.h:380
-msgid "Carlisle"
-msgstr "Carlisle"
+#: ui/evolution-tasks.xml.h:9
+msgid "Mark selected tasks as complete"
+msgstr "Marcar tareas seleccionadas como terminadas"
 
-#: my-evolution/Locations.h:381
-msgid "Carlsbad"
-msgstr "Carlsbad"
+#: ui/evolution-tasks.xml.h:11
+msgid "Paste task from the clipboard"
+msgstr "Pegar la tarea del portapapeles"
 
-#: my-evolution/Locations.h:382
-msgid "Carroll"
-msgstr "Carroll"
+#: ui/evolution-tasks.xml.h:12
+msgid "Previews the list of tasks to be printed"
+msgstr "Vista previa de la lista de tareas a imprimir"
 
-#: my-evolution/Locations.h:383
-msgid "Cartagena/Rafael Nunez"
-msgstr "Cartagena/Rafael Núñez"
+#: ui/evolution-tasks.xml.h:14
+msgid "Print the list of tasks"
+msgstr "Imprimir la lista de tareas"
 
-#: my-evolution/Locations.h:384
-msgid "Casa Granda"
-msgstr "Casa Grande"
+#: ui/evolution.xml.h:1
+msgid "About Ximian Evolution..."
+msgstr "Acerca de Ximian Evolution..."
 
-#: my-evolution/Locations.h:385
-msgid "Cascade"
-msgstr "Cascade"
+#: ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "Cambiar la configuración de Evolution"
 
-#: my-evolution/Locations.h:386
-msgid "Casper"
-msgstr "Casper"
+#: ui/evolution.xml.h:5
+msgid "E_xit"
+msgstr "_Salir"
 
-#: my-evolution/Locations.h:387
-msgid "Catacamas"
-msgstr "Catacamas"
+#: ui/evolution.xml.h:6
+msgid "Evolution _Window"
+msgstr "_Ventana de Evolution"
 
-#: my-evolution/Locations.h:388
-msgid "Catania"
-msgstr "Catania"
+#: ui/evolution.xml.h:7
+msgid "Exit the program"
+msgstr "Salir del programa"
 
-#: my-evolution/Locations.h:390
-msgid "Cayo Largo del Sur"
-msgstr "Cayo Largo del Sur"
+#: ui/evolution.xml.h:8
+msgid "Import data from other programs"
+msgstr "Importar datos de otros programas"
 
-#: my-evolution/Locations.h:391
-msgid "Cazaux"
-msgstr "Cazaux"
+#: ui/evolution.xml.h:10
+#, fuzzy
+msgid "Open a new Evolution window"
+msgstr "_Ventana de Evolution"
 
-#: my-evolution/Locations.h:392
-msgid "Cecil NAS"
-msgstr "Cecil NAS"
+#: ui/evolution.xml.h:11
+msgid "Pi_lot Settings..."
+msgstr "Configuración del _Pilot..."
 
-#: my-evolution/Locations.h:393
-msgid "Cedar City"
-msgstr "Cedar City"
+#: ui/evolution.xml.h:12
+msgid "Set up Pilot configuration"
+msgstr "Configuración del Pilot"
 
-#: my-evolution/Locations.h:394
-msgid "Cedar Rapids"
-msgstr "Cedar Rapids"
+#: ui/evolution.xml.h:13
+msgid "Show information about Ximian Evolution"
+msgstr "Mostrar información acerca de Ximian Evolution"
 
-#: my-evolution/Locations.h:395
-msgid "Central and South America"
-msgstr "América central y sur"
+#: ui/evolution.xml.h:14
+msgid "Submit Bug Report"
+msgstr "Remitir un informe de fallo"
 
-#: my-evolution/Locations.h:396
-msgid "Cervia"
-msgstr "Cervia"
+#: ui/evolution.xml.h:15
+msgid "Submit _Bug Report"
+msgstr "Remitir informe de un _fallo"
 
-#: my-evolution/Locations.h:397
-msgid "Chacarita"
-msgstr "Chacarita"
+#: ui/evolution.xml.h:16
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Enviar un informe de fallo usando Bug Buddy"
 
-#: my-evolution/Locations.h:398
-msgid "Chadron"
-msgstr "Chadron"
+#: ui/evolution.xml.h:17
+msgid "Toggle"
+msgstr "Activar"
 
-#: my-evolution/Locations.h:399
-msgid "Challis"
-msgstr "Challis"
+#: ui/evolution.xml.h:18
+msgid "Toggle whether we are working offline."
+msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: my-evolution/Locations.h:400
-msgid "Chamberlain"
-msgstr "Chamberlain"
+#: ui/evolution.xml.h:20
+msgid "Ximian Evolution _FAQ"
+msgstr "_FAQ de Ximian Evolution"
 
-#: my-evolution/Locations.h:401
-msgid "Chambery"
-msgstr "Chambery"
+#: ui/evolution.xml.h:21
+msgid "_About Ximian Evolution..."
+msgstr "_Acerca de Ximian Evolution..."
 
-#: my-evolution/Locations.h:402
-msgid "Champaign"
-msgstr "Champaign"
+#: ui/evolution.xml.h:25
+msgid "_Help"
+msgstr "A_yuda"
 
-#: my-evolution/Locations.h:403
-msgid "Chandalar Lake"
-msgstr "Lago Chandalar"
+#: ui/evolution.xml.h:26
+msgid "_Import..."
+msgstr "_Importar..."
 
-#: my-evolution/Locations.h:404
-msgid "Chandler"
-msgstr "Chandler"
+#: ui/evolution.xml.h:27
+msgid "_New"
+msgstr "_Nuevo"
 
-#: my-evolution/Locations.h:405
-msgid "Chania"
-msgstr "Chania"
+#: ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Imprimir resumen"
 
-#: my-evolution/Locations.h:406
-msgid "Chanute"
-msgstr "Chanute"
+#: ui/my-evolution.xml.h:3
+msgid "Print summary"
+msgstr "Imprimir resumen"
 
-#: my-evolution/Locations.h:407
-msgid "Chariton"
-msgstr "Chariton"
+#: ui/my-evolution.xml.h:4
+msgid "Reload"
+msgstr "Recargar"
 
-#: my-evolution/Locations.h:408
-msgid "Charleroi-Brussels South"
-msgstr "Charleroi-Brussels Sur"
+#: ui/my-evolution.xml.h:5
+msgid "Reload the view"
+msgstr "Recargar la vista"
 
-#: my-evolution/Locations.h:409
-msgid "Charles City"
-msgstr "Charles City"
+#: views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Por _compañía"
 
-#: my-evolution/Locations.h:410
-msgid "Charleston"
-msgstr "Charleston"
+#: views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "T_arjetas de visita"
 
-#: my-evolution/Locations.h:411
-msgid "Charlotte"
-msgstr "Charlotte"
+#: views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr "Lista de t_eléfonos"
 
-#: my-evolution/Locations.h:412
-msgid "Charlottesville"
-msgstr "Charlottesville"
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Vista s_emanal"
 
-#: my-evolution/Locations.h:413
-msgid "Chatham"
-msgstr "Chatham"
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "Vista _diaria"
 
-#: my-evolution/Locations.h:414
-msgid "Chattanooga"
-msgstr "Chattanooga"
+#: views/calendar/galview.xml.h:3
+msgid "_Month View"
+msgstr "Vista _mensual"
 
-#: my-evolution/Locations.h:415
-msgid "Cheboksary"
-msgstr "Cheboksary"
+#: views/calendar/galview.xml.h:4
+msgid "_Work Week View"
+msgstr "Vista de la semana _laboral"
 
-#: my-evolution/Locations.h:416
-msgid "Cheju"
-msgstr "Cheju"
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As _Sent Folder"
+msgstr "Como carpeta de enviados"
 
-#: my-evolution/Locations.h:417
-msgid "Chelyabinsk"
-msgstr "Chelyabinsk"
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Por estado"
 
-#: my-evolution/Locations.h:418
-msgid "Chengdu"
-msgstr "Chengdu"
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Se_nder"
+msgstr "Por remitente"
 
-#: my-evolution/Locations.h:419
-msgid "Cherbourg"
-msgstr "Cherbourg"
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Por asunto"
 
-#: my-evolution/Locations.h:420
-msgid "Cherry Point"
-msgstr "Cherry Point"
+#: views/mail/galview.xml.h:5
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Por marca de seguimiento"
 
-#: my-evolution/Locations.h:421
-msgid "Chetumal"
-msgstr "Chetumal"
+#: views/mail/galview.xml.h:6
+#, fuzzy
+msgid "_Messages"
+msgstr "Mensajes"
 
-#: my-evolution/Locations.h:422
-msgid "Cheyenne"
-msgstr "Cheyenne"
+#: views/tasks/galview.xml.h:1
+msgid "With _Category"
+msgstr "Con _categoría"
 
-#: my-evolution/Locations.h:423
-msgid "Chiang Kai Shek"
-msgstr "Chiang Kai Shek"
+#: views/tasks/galview.xml.h:2
+msgid "_Tasks"
+msgstr "_Tareas"
 
-#: my-evolution/Locations.h:424
-msgid "Chia Tung"
-msgstr "Chia Tung"
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+msgid "UTC"
+msgstr "UTC"
 
-#: my-evolution/Locations.h:425
-msgid "Chiayi"
-msgstr "Chiayi"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Select a Time Zone"
+msgstr "Seleccione una zona horaria"
 
-#: my-evolution/Locations.h:426
-msgid "Chicago-DuPage"
-msgstr "Chicago-DuPage"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Zonas horarias"
 
-#: my-evolution/Locations.h:427
-msgid "Chicago-Lakefront"
-msgstr "Chicago-Lakefront"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Use el botón izquierdo del ratón para ampliar un área del mapa y seleccionar "
+"una zona horaria.\n"
+"Use el botón derecho del ratón para volver al tamaño de mapa anterior."
 
-#: my-evolution/Locations.h:428
-msgid "Chicago-Midway"
-msgstr "Chicago-Midway"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "_Selection:"
+msgstr "_Selección:"
 
-#: my-evolution/Locations.h:429
-msgid "Chicago-O'Hare"
-msgstr "Chicago-O'Hare"
+#: widgets/menus/gal-view-menus.c:290
+msgid "_Current View"
+msgstr "_Vista actual"
 
-#: my-evolution/Locations.h:430
-msgid "Chichijima"
-msgstr "Chichijima"
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:349
+msgid "Custom View"
+msgstr "Vista personalizada"
 
-#: my-evolution/Locations.h:431
-msgid "Chiclayo"
-msgstr "Chiclayo"
+#: widgets/menus/gal-view-menus.c:358
+msgid "Save Custom View..."
+msgstr "Guardar vista personalizada..."
 
-#: my-evolution/Locations.h:432
-msgid "Chico"
-msgstr "Chico"
+#: widgets/menus/gal-view-menus.c:371
+msgid "Define Views..."
+msgstr "Definir vistas..."
 
-#: my-evolution/Locations.h:433
-msgid "Chicopee Falls"
-msgstr "Chicopee Falls"
+#. 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:456
+msgid "MTWTFSS"
+msgstr "LMXJVSD"
 
-#: my-evolution/Locations.h:434
-msgid "Chievres"
-msgstr "Chievres"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1174
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: my-evolution/Locations.h:435
-msgid "Chihhang"
-msgstr "Chihhang"
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+msgid "Now"
+msgstr "Ahora"
 
-#: my-evolution/Locations.h:436
-msgid "Chihuahua"
-msgstr "Chihuahua"
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+msgid "Today"
+msgstr "Hoy"
 
-#: my-evolution/Locations.h:437
-msgid "Childress"
-msgstr "Childress"
+#: widgets/misc/e-cell-date-edit.c:805
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "La fecha debe estar en el formato: %s"
 
-#: my-evolution/Locations.h:439
-msgid "China Lake"
-msgstr "Lago China"
+#: 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, inclusive"
 
-#: my-evolution/Locations.h:440
-msgid "Chinandega"
-msgstr "Chinandega"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Baltic"
+msgstr "Báltico"
 
-#: my-evolution/Locations.h:441
-msgid "Chinmem/Shatou"
-msgstr "Chinmem/Shatou"
+#: widgets/misc/e-charset-picker.c:62
+msgid "Central European"
+msgstr "Centroeuropeo"
 
-#: my-evolution/Locations.h:442
-msgid "Chino"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Chinese"
 msgstr "Chino"
 
-#: my-evolution/Locations.h:443
-msgid "Chippewa County"
-msgstr "Chippewa County"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Cyrillic"
+msgstr "Cirílico"
 
-#: my-evolution/Locations.h:444
-msgid "Chita"
-msgstr "Chita"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Greek"
+msgstr "Griego"
 
-#: my-evolution/Locations.h:445
-msgid "Chitose Ab"
-msgstr "Chitose Ab"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Hebrew"
+msgstr "Hebreo"
 
-#: my-evolution/Locations.h:446
-msgid "Chitose ASDF"
-msgstr "Chitose ASDF"
+#: widgets/misc/e-charset-picker.c:67
+msgid "Japanese"
+msgstr "Japonés"
 
-#: my-evolution/Locations.h:447
-msgid "Chofu Airport"
-msgstr "Aeropuerto de Chofu"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Korean"
+msgstr "Coreano"
 
-#: my-evolution/Locations.h:448
-msgid "Choluteca"
-msgstr "Choluteca"
+#: widgets/misc/e-charset-picker.c:69
+msgid "Turkish"
+msgstr "Turco"
 
-#: my-evolution/Locations.h:449
-msgid "Chongju Ab"
-msgstr "Chongju Ab"
+#: widgets/misc/e-charset-picker.c:70
+msgid "Unicode"
+msgstr "Unicode"
 
-#: my-evolution/Locations.h:450
-msgid "Christchurch"
-msgstr "Christchurch"
+#: widgets/misc/e-charset-picker.c:71
+msgid "Western European"
+msgstr "Europeo occidental"
 
-#: my-evolution/Locations.h:452
-msgid "Chulitna"
-msgstr "Chulitna"
+#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:90
+msgid "Traditional"
+msgstr "Tradicional"
 
-#: my-evolution/Locations.h:453
-msgid "Churchill"
-msgstr "Churchill"
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+msgid "Simplified"
+msgstr "Simplificado"
 
-#: my-evolution/Locations.h:454
-msgid "Churchill Falls"
-msgstr "Churchill Falls"
+#: widgets/misc/e-charset-picker.c:97
+msgid "Ukrainian"
+msgstr "Ucraniano"
 
-#: my-evolution/Locations.h:455
-msgid "Cincinnati"
-msgstr "Cincinnati"
+#: widgets/misc/e-charset-picker.c:100
+msgid "Visual"
+msgstr "Visual"
 
-#: my-evolution/Locations.h:456
-msgid "Circle City"
-msgstr "Circle City"
+#: widgets/misc/e-charset-picker.c:168
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Conjunto de caracteres desconocido: %s"
 
-#: my-evolution/Locations.h:457
-msgid "Ciudad Bolivar"
-msgstr "Ciudad Bolívar"
+#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+msgid "Character Encoding"
+msgstr "Codificación de caracteres"
 
-#: my-evolution/Locations.h:458
-msgid "Ciudad del Carmen"
-msgstr "Ciudad del Carmen"
+#: widgets/misc/e-charset-picker.c:222
+msgid "Enter the character set to use"
+msgstr "Introduzca conjunto de caracteres a usar"
 
-#: my-evolution/Locations.h:459
-msgid "Ciudad Juarez"
-msgstr "Ciudad Juárez"
+#: widgets/misc/e-charset-picker.c:318
+msgid "Other..."
+msgstr "Otro..."
 
-#: my-evolution/Locations.h:460
-msgid "Ciudad Obregon"
-msgstr "Ciudad Obregón"
+#: widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
 
-#: my-evolution/Locations.h:461
-msgid "Ciudad Victoria"
-msgstr "Ciudad Victoria"
+#: widgets/misc/e-filter-bar.c:185
+msgid "Search Editor"
+msgstr "Editor de búsquedas"
 
-#: my-evolution/Locations.h:462
-msgid "Clarinda"
-msgstr "Clarinda"
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:206
+msgid "Save Search"
+msgstr "Guardar búsqueda"
 
-#: my-evolution/Locations.h:463
-msgid "Clarion"
-msgstr "Clarion"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+msgid "_Save Search..."
+msgstr "_Guardar búsqueda..."
 
-#: my-evolution/Locations.h:464
-msgid "Clarksburg"
-msgstr "Clarksburg"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+msgid "_Edit Saved Searches..."
+msgstr "_Editar búsquedas guardadas"
 
-#: my-evolution/Locations.h:465
-msgid "Clayton"
-msgstr "Clayton"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Advanced..."
+msgstr "_Avanzado..."
 
-#: my-evolution/Locations.h:466
-msgid "Clayton Lake"
-msgstr "Lago Clayton"
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Buscar"
 
-#: my-evolution/Locations.h:467
-msgid "Clermont-Ferrand"
-msgstr "Clermont-Ferrand"
+#: widgets/misc/e-search-bar.c:537
+msgid "_Find Now"
+msgstr "_Buscar ahora"
 
-#: my-evolution/Locations.h:468
-msgid "Cleveland"
-msgstr "Cleveland"
+#: widgets/misc/e-search-bar.c:538
+msgid "_Clear"
+msgstr "_Vaciar"
 
-#: my-evolution/Locations.h:469
-msgid "Cleveland/Cuyahoga"
-msgstr "Cleveland/Cuyahoga"
+#: widgets/misc/e-search-bar.c:836
+msgid "Item ID"
+msgstr "ID de elemento"
 
-#: my-evolution/Locations.h:470
-msgid "Cleveland-Lakefront"
-msgstr "Cleveland-Lakefront"
+#: widgets/misc/e-search-bar.c:843
+msgid "Subitem ID"
+msgstr "ID de subelemento"
 
-#: my-evolution/Locations.h:471
-msgid "Clinton"
-msgstr "Clinton"
+#: widgets/misc/e-search-bar.c:850
+msgid "Text"
+msgstr "Texto"
 
-#: my-evolution/Locations.h:472
-msgid "Clovis-Cannon AFB"
-msgstr "Clovis-Cannon AFB"
+#: widgets/misc/e-search-bar.c:928
+msgid "Clear"
+msgstr "Vaciar"
 
-#: my-evolution/Locations.h:473
-msgid "Cobija"
-msgstr "Cobija"
+#: widgets/misc/e-search-bar.c:930
+msgid "Find Now"
+msgstr "Buscar ahora"
 
-#: my-evolution/Locations.h:474
-msgid "Cochabamba"
-msgstr "Cochabamba"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Soporte de libreta de direcciones local/LDAP de Evolution"
 
-#: my-evolution/Locations.h:475
-msgid "Cocoa Beach"
-msgstr "Playa Cocoa"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+msgid "Evolution Calendar local file backend"
+msgstr "Soporte de archivo local de calendario de Evolution"
 
-#: my-evolution/Locations.h:476
-msgid "Cocos Island"
-msgstr "Islas Cocos"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local backend"
+msgstr "Soporte de libreta de direcciones local/LDAP de Evolution"
 
-#: my-evolution/Locations.h:477
-msgid "Cody"
-msgstr "Cody"
+#~ msgid "Primary"
+#~ msgstr "Principal"
 
-#: my-evolution/Locations.h:478
-msgid "Coeur d'Alene"
-msgstr "Coeur d'Alene"
+#~ msgid "Prim"
+#~ msgstr "Pral"
 
-#: my-evolution/Locations.h:479
-msgid "Cold Bay"
-msgstr "Baiha Cold"
+#~ msgid "Bus"
+#~ msgstr "Trab"
 
-#: my-evolution/Locations.h:480
-msgid "Colima"
-msgstr "Colima"
+#~ msgid "Callback"
+#~ msgstr "Devolución de llamada"
 
-#: my-evolution/Locations.h:481
-msgid "College Station"
-msgstr "College Station"
+#~ msgid "Company"
+#~ msgstr "Compañía"
 
-#: my-evolution/Locations.h:482
-msgid "Colmar-Meyenheim"
-msgstr "Colmar-Meyenheim"
+#~ msgid "Comp"
+#~ msgstr "Comp"
 
-#: my-evolution/Locations.h:484
-msgid "Colonia"
-msgstr "Colonia"
+#~ msgid "Org"
+#~ msgstr "Org"
 
-#: my-evolution/Locations.h:485
-msgid "Colorado"
-msgstr "Colorado"
+#~ msgid "Mobile"
+#~ msgstr "Móvil"
 
-#: my-evolution/Locations.h:486
-msgid "Colorado Springs"
-msgstr "Colorado Springs"
+#~ msgid "Car"
+#~ msgstr "Coche"
 
-#: my-evolution/Locations.h:487
-msgid "Columbia"
-msgstr "Colombia"
+#~ msgid "Bus Fax"
+#~ msgstr "Fax de trab"
 
-#: my-evolution/Locations.h:488
-msgid "Columbia-McEntire"
-msgstr "Columbia-McEntire"
+#~ msgid "Business 2"
+#~ msgstr "Trabajo 2"
 
-#: my-evolution/Locations.h:489
-msgid "Columbus"
-msgstr "Columbus"
+#~ msgid "Bus 2"
+#~ msgstr "Trab 2"
 
-#: my-evolution/Locations.h:490
-msgid "Columbus-Fort Benning"
-msgstr "Columbus-Fort Benning"
+#~ msgid "Home 2"
+#~ msgstr "Domicilio 2"
 
-#: my-evolution/Locations.h:491
-msgid "Columbus-Gahanna"
-msgstr "Columbus-Gahanna"
+#~ msgid "Url"
+#~ msgstr "Url"
 
-#: my-evolution/Locations.h:492
-msgid "Columbus-OSU"
-msgstr "Columbus-OSU"
+#~ msgid "Dep"
+#~ msgstr "Dep"
 
-#: my-evolution/Locations.h:493
-msgid "Columbus-W Point-Starkville"
-msgstr "Columbus-W Point-Starkville"
+#~ msgid "Off"
+#~ msgstr "Ofic"
 
-#: my-evolution/Locations.h:494
-msgid "Colville"
-msgstr "Colville"
+#~ msgid "Prof"
+#~ msgstr "Prof"
 
-#: my-evolution/Locations.h:495
-msgid "Comodoro Rivadavia"
-msgstr "Comodoro Rivadavia"
+#~ msgid "Man"
+#~ msgstr "Jefe"
 
-#: my-evolution/Locations.h:496
-msgid "Comox"
-msgstr "Comox"
+#~ msgid "Ass"
+#~ msgstr "Asist"
 
-#: my-evolution/Locations.h:497
-msgid "Conceicao Do Araguaia"
-msgstr "Conceicao Do Araguaia"
+#~ msgid "Nick"
+#~ msgstr "Apodo"
 
-#: my-evolution/Locations.h:498
-msgid "Concepcion"
-msgstr "Concepción"
+#~ msgid "CALUri"
+#~ msgstr "CALUri"
 
-#: my-evolution/Locations.h:499
-msgid "Concord"
-msgstr "Concord"
+#~ msgid "FBUrl"
+#~ msgstr "DISUrl"
 
-#: my-evolution/Locations.h:500
-msgid "Concordia"
-msgstr "Concordia"
+#~ msgid "Default server calendar"
+#~ msgstr "Servidor predeterminado de calendario"
 
-#: my-evolution/Locations.h:501
-msgid "Connaught"
-msgstr "Connaught"
+#~ msgid "icsCalendar"
+#~ msgstr "icsCalendar"
 
-#: my-evolution/Locations.h:502
-msgid "Connecticut"
-msgstr "Conectica"
+#~ msgid "Anniv"
+#~ msgstr "Aniv"
 
-#: my-evolution/Locations.h:503
-msgid "Conroe"
-msgstr "Conroe"
+#~ msgid "ECard"
+#~ msgstr "ECard"
 
-#: my-evolution/Locations.h:504
-msgid "Constantine"
-msgstr "Constantine"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: my-evolution/Locations.h:505
-msgid "Copper Harbor"
-msgstr "Copper Harbor"
+#~ msgid "Phone"
+#~ msgstr "Teléfono"
 
-#: my-evolution/Locations.h:506
-msgid "Cordoba"
-msgstr "Córdoba"
+#~ msgid "Birth date"
+#~ msgstr "Cumpleaños"
 
-#: my-evolution/Locations.h:507
-msgid "Cordova"
-msgstr "Cordova"
+#~ msgid "Related Contacts"
+#~ msgstr "Contactos relacionados:"
 
-#: my-evolution/Locations.h:508
-msgid "Cork"
-msgstr "Cork"
+#~ msgid "Wants HTML set"
+#~ msgstr "Desea página de códigos HTML"
 
-#: my-evolution/Locations.h:509
-msgid "Coro"
-msgstr "Coro"
+#~ msgid "Arbitrary"
+#~ msgstr "Arbitrario"
 
-#: my-evolution/Locations.h:510
-msgid "Corona"
-msgstr "Corona"
+#~ msgid "ID"
+#~ msgstr "ID"
 
-#: my-evolution/Locations.h:511
-msgid "Corpus Christi"
-msgstr "Corpus Christi"
+#~ msgid "Last Use"
+#~ msgstr "Último uso"
 
-#: my-evolution/Locations.h:512
-msgid "Corpus Christi NAS"
-msgstr "Corpus Christi NAS"
+#~ msgid "Use Score"
+#~ msgstr "Usar puntuación"
 
-#: my-evolution/Locations.h:513
-msgid "Corrientes"
-msgstr "Corrientes"
+#~ msgid "Cursor could not be loaded\n"
+#~ msgstr "No se pudo cargar el cursor\n"
 
-#: my-evolution/Locations.h:514
-msgid "Corsicana"
-msgstr "Corsicana"
+#~ msgid "Folder containing contact information"
+#~ msgstr "La carpeta contiene información de contacto"
 
-#: my-evolution/Locations.h:515
-msgid "Cortez"
-msgstr "Cortez"
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP"
 
-#: my-evolution/Locations.h:516
-msgid "Corumba"
-msgstr "Corumba"
+#~ msgid "LDAP server containing contact information"
+#~ msgstr "El servidor LDAP contiene información de contacto"
 
-#: my-evolution/Locations.h:518
-msgid "Cotulla"
-msgstr "Cotulla"
+#~ msgid "Public Contacts"
+#~ msgstr "Contactos públicos"
 
-#: my-evolution/Locations.h:519
-msgid "Council Bluffs"
-msgstr "Council Bluffs"
+#~ msgid "Public folder containing contact information"
+#~ msgstr "Carpeta pública conteniendo información de contactos"
 
-#: my-evolution/Locations.h:520
-msgid "Coventry"
-msgstr "Coventry"
+#~ msgid "_Contact"
+#~ msgstr "_Contacto"
 
-#: my-evolution/Locations.h:521
-msgid "Covington"
-msgstr "Covington"
+#~ msgid "Create a new contact"
+#~ msgstr "Crea un contacto nuevo"
 
-#: my-evolution/Locations.h:522
-msgid "Cozumel"
-msgstr "Cozumel"
+#~ msgid "New Contact List"
+#~ msgstr "Lista de contactos nueva"
 
-#: my-evolution/Locations.h:523
-msgid "Craig"
-msgstr "Craig"
+#~ msgid "Create a new contact list"
+#~ msgstr "Crea una lista de contactos nueva"
 
-#: my-evolution/Locations.h:524
-msgid "Cranfield"
-msgstr "Cranfield"
+#~ msgid "The URI that the Folder Browser will display"
+#~ msgstr "La URI que mostrará el visor de carpetas"
 
-#: my-evolution/Locations.h:525
-msgid "Crescent City"
-msgstr "Crescent City"
+#~ msgid "Disable Queries"
+#~ msgstr "Deshabilitar consultas"
 
-#: my-evolution/Locations.h:526
-msgid "Creston"
-msgstr "Creston"
+#~ msgid "Enable Queries (Dangerous!)"
+#~ msgstr "Habilitar consultas (¡Peligroso!)"
 
-#: my-evolution/Locations.h:527
-msgid "Crestview"
-msgstr "Crestview"
+#~ msgid "Card"
+#~ msgstr "Tarjeta"
 
-#: my-evolution/Locations.h:529
-msgid "Cross City"
-msgstr "Cross City"
+#~ msgid "Is New Card"
+#~ msgstr "Es tarjeta nueva"
 
-#: my-evolution/Locations.h:530
-msgid "Crossville"
-msgstr "Crossville"
+#~ msgid "TTY/TDD"
+#~ msgstr "TTY/TDD"
 
-#: my-evolution/Locations.h:531
-msgid "Crotone"
-msgstr "Crotone"
+#~ msgid "No cards"
+#~ msgstr "Sin tarjetas"
 
-#: my-evolution/Locations.h:533
-msgid "Cuba Awrs"
-msgstr "Cuba Awrs"
+#~ msgid "1 card"
+#~ msgstr "1 tarjeta"
 
-#: my-evolution/Locations.h:534
-msgid "Cuernavaca"
-msgstr "Cuernavaca"
+#~ msgid "%d cards"
+#~ msgstr "%d tarjetas"
 
-#: my-evolution/Locations.h:535
-msgid "Cuiaba"
-msgstr "Cuiaba"
+#~ 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"
 
-#: my-evolution/Locations.h:536
-msgid "Culdrose"
-msgstr "Culdrose"
+#~ 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"
 
-#: my-evolution/Locations.h:537
-msgid "Culiacan"
-msgstr "Culiacan"
+#~ msgid "Print cards"
+#~ msgstr "Imprimir tarjetas"
 
-#: my-evolution/Locations.h:538
-msgid "Cumana"
-msgstr "Cumana"
+#~ msgid "Print card"
+#~ msgstr "Imprimir tarjeta"
 
-#: my-evolution/Locations.h:539
-msgid "Cumberland"
-msgstr "Cumberland"
+#~ msgid "Error while communicating with calendar server"
+#~ msgstr "Error mientras me comunicaba con el servidor de agenda"
 
-#: my-evolution/Locations.h:540
-msgid "Curitiba"
-msgstr "Curitiba"
+#~ msgid ""
+#~ "Could not create the calendar view.  Please check your ORBit and OAF "
+#~ "setup."
+#~ msgstr ""
+#~ "No se pudo mostrar el agenda.  Por favor compruebe su ORBit y su OAF."
 
-#: my-evolution/Locations.h:541
-msgid "Curitiba Apt"
-msgstr "Curitiba Apt"
+#~ msgid "Folder containing appointments and events"
+#~ msgstr "Carpeta conteniendo citas y eventos"
 
-#: my-evolution/Locations.h:542
-msgid "Custer"
-msgstr "Custer"
+#~ msgid "Public Calendar"
+#~ msgstr "Calendario público:"
 
-#: my-evolution/Locations.h:543
-msgid "Cut Bank"
-msgstr "Cut Bank"
+#~ msgid "Folder containing to-do items"
+#~ msgstr "Carpeta que contiene elementos por hacer"
 
-#: my-evolution/Locations.h:544
-msgid "Cuzco"
-msgstr "Cuzco"
+#~ msgid "Public Tasks"
+#~ msgstr "Tareas públicas"
 
-#: my-evolution/Locations.h:547
-msgid "Dagali"
-msgstr "Dagali"
+#~ msgid "Public folder containing to-do items"
+#~ msgstr "Carpeta pública conteniendo elementos por hacer"
 
-#: my-evolution/Locations.h:548
-msgid "Daggett"
-msgstr "Daggett"
+#~ msgid "New appointment"
+#~ msgstr "Nueva cita"
 
-#: my-evolution/Locations.h:549
-msgid "Dalhart"
-msgstr "Dalhart"
+#~ msgid "_Appointment"
+#~ msgstr "Cit_a"
 
-#: my-evolution/Locations.h:550
-msgid "Dalian"
-msgstr "Dalian"
+#~ msgid "New meeting"
+#~ msgstr "Reunión nueva"
 
-#: my-evolution/Locations.h:551
-msgid "Dallas-Addison"
-msgstr "Dallas-Addison"
+#~ msgid "M_eeting"
+#~ msgstr "R_eunión"
 
-#: my-evolution/Locations.h:552
-msgid "Dallas-Fort Worth"
-msgstr "Dallas-Fort Worth"
+#~ msgid "New task"
+#~ msgstr "Nueva tarea"
 
-#: my-evolution/Locations.h:553
-msgid "Dallas-Love Field"
-msgstr "Dallas-Love Field"
+#~ msgid "_Task"
+#~ msgstr "_Tarea"
 
-#: my-evolution/Locations.h:554
-msgid "Dallas-Redbird"
-msgstr "Dallas-Redbird"
+#~ msgid "New All Day Appointment"
+#~ msgstr "Cita para todo el día"
 
-#: my-evolution/Locations.h:555
-msgid "Da Nang"
-msgstr "Da Nang"
+#~ msgid "All _Day Appointment"
+#~ msgstr "Cita de todo el _día"
 
-#: my-evolution/Locations.h:556
-msgid "Danbury"
-msgstr "Danbury"
+#~ msgid "Could not update invalid object"
+#~ msgstr "No se pudo actualizar el objeto inválido"
 
-#: my-evolution/Locations.h:557
-msgid "Danville"
-msgstr "Danville"
+#~ msgid "Object not found, not updated"
+#~ msgstr "Objeto no encontrado, no actualizado"
 
-#: my-evolution/Locations.h:558
-msgid "Dar-El-Beida"
-msgstr "Dar-El-Beida"
+#~ msgid "You don't have permissions to update this object"
+#~ msgstr "No tiene permisos para actualizar este objeto"
 
-#: my-evolution/Locations.h:559
-msgid "Davenport"
-msgstr "Davenport"
+#~ msgid "The event could not be deleted because it was invalid"
+#~ msgstr "El evento no pudo ser borrado  a causa de un estado inválido"
 
-#: my-evolution/Locations.h:560
-msgid "David"
-msgstr "David"
+#~ msgid "The task could not be deleted because it was invalid"
+#~ msgstr "La tarea no pudo ser borrada porque era inválida"
 
-#: my-evolution/Locations.h:561
-msgid "Dawadmi"
-msgstr "Dawadmi"
+#~ msgid "The journal entry could not be deleted because it was invalid"
+#~ msgstr "La entrada del diario no pudo ser borrada porque era inválida"
 
-#: my-evolution/Locations.h:562
-msgid "Dayton"
-msgstr "Daiton"
+#~ msgid "The item could not be deleted because it was invalid"
+#~ msgstr "El elemento no pudo ser borrado porque era inválido"
 
-#: my-evolution/Locations.h:563
-msgid "Daytona Beach"
-msgstr "Playa de Daitona"
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "¡Esa persona ya está participando en la reunión!"
 
-#: my-evolution/Locations.h:564
-msgid "Dayton-Fairborn"
-msgstr "Dayton-Fairborn"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#: my-evolution/Locations.h:565
-msgid "Dayton-South Airport"
-msgstr "Dayton-South Airport"
+#~ msgid "_Save as..."
+#~ msgstr "_Guardar como..."
 
-#: my-evolution/Locations.h:566
-msgid "Dead Horse"
-msgstr "Dead Horse"
+#~ msgid "End Date"
+#~ msgstr "Fecha final"
 
-#: my-evolution/Locations.h:567
-msgid "Deauville-Saint-Gatien"
-msgstr "Deauville-Saint-Gatien"
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
 
-#: my-evolution/Locations.h:568
-msgid "Decatur"
-msgstr "Decatur"
+#~ msgid "Make this Occurrence _Movable"
+#~ msgstr "Hacer esta ocurrencia _movible"
 
-#: my-evolution/Locations.h:569
-msgid "Decimomannu"
-msgstr "Decimomannu"
+#~ msgid "You do not have the right permissions to update the calendar\n"
+#~ msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: my-evolution/Locations.h:570
-msgid "Decorah"
-msgstr "Decorah"
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Abriendo calendario en %s"
 
-#: my-evolution/Locations.h:571
-msgid "Deelen"
-msgstr "Deelen"
+#~ msgid "Opening default tasks folder"
+#~ msgstr "Abriendo carpeta de tareas predeterminada"
 
-#: my-evolution/Locations.h:572
-msgid "Dekalb/Peachtree"
-msgstr "Dekalb/Peachtree"
+#~ 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"
 
-#: my-evolution/Locations.h:573
-msgid "Delaware"
-msgstr "Delaware"
+#~ msgid "Failed to decrypt MIME part: parse error"
+#~ msgstr "Falló al descifrar la parte MIME: error de análisis"
 
-#: my-evolution/Locations.h:574
-msgid "Del Bajio"
-msgstr "Del Bajio"
+#~ msgid "Please enter your password for %s"
+#~ msgstr "Por favor introduzca su contraseña para %s"
 
-#: my-evolution/Locations.h:575
-msgid "Del Rio"
-msgstr "Del Río"
+#~ msgid "Please indicate the nickname of a certificate to sign with."
+#~ msgstr "Por favor indique el apodo de un certificado con el que firmar."
 
-#: my-evolution/Locations.h:576
-msgid "Delta"
-msgstr "Delta"
+#~ msgid "The signature certificate for \"%s\" does not exist."
+#~ msgstr "El certificado de firma para «%s» no existe."
 
-#: my-evolution/Locations.h:577
-msgid "Deming"
-msgstr "Deming"
+#~ msgid "The encryption certificate for \"%s\" does not exist."
+#~ msgstr "No existe el certificado de cifrado «%s»."
 
-#: my-evolution/Locations.h:578
-msgid "Den Helder/De Kooy"
-msgstr "Den Helder/De Kooy"
+#~ msgid "Failed to find certificate for \"%s\"."
+#~ msgstr "Error al buscar el certificado para «%s»."
 
-#: my-evolution/Locations.h:579
-msgid "Denison"
-msgstr "Denison"
+#~ msgid "Failed to find a common bulk algorithm."
+#~ msgstr "Error al buscar un algoritmo de volumen común."
 
-#: my-evolution/Locations.h:581
-msgid "Denton"
-msgstr "Denton"
+#~ msgid "Failed to decode message."
+#~ msgstr "Error al decodificar el mensaje."
 
-#: my-evolution/Locations.h:582
-msgid "Denver"
-msgstr "Denver"
+#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
+#~ msgstr "Necesita una cuenta para enviar correo."
 
-#: my-evolution/Locations.h:583
-msgid "Denver-Aurora"
-msgstr "Denver-Aurora"
+#~ msgid "Could not create a PGP signature context"
+#~ msgstr "No se pudo crear un contexto de firma PGP."
 
-#: my-evolution/Locations.h:584
-msgid "Denver-Broomfield"
-msgstr "Denver-Broomfield"
+#~ msgid ""
+#~ "Evolution has found GnomeCard files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution ha encontrado archivos de GnomeCard.\n"
+#~ "¿Quiere importarlos a Evolution?"
 
-#: my-evolution/Locations.h:585
-msgid "Denver-Cherry Knolls"
-msgstr "Denver-Cherry Knolls"
+#~ msgid "Evolution Mail configuration interface"
+#~ msgstr "Interfaz de configuración del correo de Evolution"
 
-#: my-evolution/Locations.h:586
-msgid "Desert Rock"
-msgstr "Desert Rock"
+#~ msgid "Folder containing mail"
+#~ msgstr "Carpeta conteniendo correo"
 
-#: my-evolution/Locations.h:587
-msgid "Des Moines"
-msgstr "Des Moines"
+#~ msgid "Public Mail"
+#~ msgstr "Correo público"
 
-#: my-evolution/Locations.h:588
-msgid "Destin"
-msgstr "Destin"
+#~ msgid "Public folder containing mail"
+#~ msgstr "Carpeta pública conteniendo correo"
 
-#: my-evolution/Locations.h:589
-msgid "Detroit"
-msgstr "Detroit"
+#~ msgid "Virtual Trash"
+#~ msgstr "Papelera virtual"
 
-#: my-evolution/Locations.h:590
-msgid "Detroit Lakes"
-msgstr "Detroit Lakes"
+#~ msgid "Virtual Trash folder"
+#~ msgstr "Carpetas de papelera virtuales"
 
-#: my-evolution/Locations.h:591
-msgid "Detroit-Taylor"
-msgstr "Detroit-Taylor"
+#~ msgid "Properties..."
+#~ msgstr "Propiedades..."
 
-#: my-evolution/Locations.h:592
-msgid "Detroit/Ypsilanti"
-msgstr "Detroit/Ypsilanti"
+#~ msgid "Change this folder's properties"
+#~ msgstr "Cambiar las propiedades de esta carpeta"
 
-#: my-evolution/Locations.h:593
-msgid "Devils Lake"
-msgstr "Devils Lake"
+#~ msgid "You have not set a mail transport method"
+#~ msgstr "No ha definido un sistema para enviar el correo"
 
-#: my-evolution/Locations.h:594
-msgid "Devils Lake (2)"
-msgstr "Devils Lake (2)"
+#~ msgid "You have unsent messages, do you wish to quit anyway?"
+#~ msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: my-evolution/Locations.h:595
-msgid "Dhahran"
-msgstr "Dhahran"
+#~ msgid "New Mail Message"
+#~ msgstr "Mensaje de correo nuevo"
 
-#: my-evolution/Locations.h:596
-msgid "Dickinson"
-msgstr "Dickinson"
+#~ msgid "_Mail Message"
+#~ msgstr "_Mensaje de correo"
 
-#: my-evolution/Locations.h:597
-msgid "Dijon"
-msgstr "Dijon"
+#~ msgid "Compose a new mail message"
+#~ msgstr "Redactar mensaje nuevo"
 
-#: my-evolution/Locations.h:598
-msgid "Dillingham"
-msgstr "Dillingham"
+#~ msgid "New Message Post"
+#~ msgstr "Publicar anuncio nuevo"
 
-#: my-evolution/Locations.h:599
-msgid "Dillon"
-msgstr "Dillon"
+#~ msgid "_Post Message"
+#~ msgstr "_Publicar mensaje"
 
-#: my-evolution/Locations.h:600
-msgid "Dinard"
-msgstr "Dinard"
+#~ msgid "Post a new mail message"
+#~ msgstr "Publicar un mensaje nuevo"
 
-#: my-evolution/Locations.h:601
-msgid "District of Columbia"
-msgstr "Distrito de Columbia"
+#~ msgid "Cannot register storage with shell"
+#~ msgstr "No se pudo registrar un sistema de guardado con la shell"
 
-#: my-evolution/Locations.h:602
-msgid "Diyarbakir"
-msgstr "Diyarbakir"
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Propiedades para «%s»"
 
-#: my-evolution/Locations.h:603
-msgid "Dnipropetrovsk"
-msgstr "Dnipropetrovsk"
+#~ msgid "%d new"
+#~ msgstr "%d nuevos"
 
-#: my-evolution/Locations.h:604
-msgid "Dobbiaco"
-msgstr "Dobbiaco"
+#~ msgid ", "
+#~ msgstr ", "
 
-#: my-evolution/Locations.h:605
-msgid "Dodge City"
-msgstr "Dodge City"
+#~ msgid "%d hidden"
+#~ msgstr "%d ocultos"
 
-#: my-evolution/Locations.h:606
-msgid "Doha"
-msgstr "Doha"
+#~ msgid "%d visible"
+#~ msgstr "%d visibles"
 
-#: my-evolution/Locations.h:607
-msgid "Dole"
-msgstr "Dole"
+#~ msgid "%d selected"
+#~ msgstr "%d seleccionado"
 
-#: my-evolution/Locations.h:609
-msgid "Donetsk"
-msgstr "Donetsk"
+#~ msgid "%d unsent"
+#~ msgstr "%d sin enviar"
 
-#: my-evolution/Locations.h:610
-msgid "Dongsha"
-msgstr "Dongsha"
+#~ msgid "%d sent"
+#~ msgstr "%d enviar"
 
-#: my-evolution/Locations.h:611
-msgid "Dongshi"
-msgstr "Dongshi"
+#~ msgid "%d total"
+#~ msgstr "%d total"
 
-#: my-evolution/Locations.h:612
-msgid "Don Torcuato"
-msgstr "Don Torcuato"
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Carpeta virtual según la _lista de correo"
 
-#: my-evolution/Locations.h:613
-msgid "Dortmund-Wickede"
-msgstr "Dortmund-Wickede"
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filtrar según la _lista de correo (%s)"
 
-#: my-evolution/Locations.h:614
-msgid "Dothan"
-msgstr "Dothan"
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Carpeta virtual según la li_sta de correo (%s)"
 
-#: my-evolution/Locations.h:615
-msgid "Douglas"
-msgstr "Douglas"
+#~ msgid "Getting Folder Information"
+#~ msgstr "Obteniendo información de la carpeta"
 
-#: my-evolution/Locations.h:616
-msgid "Dover"
-msgstr "Dover"
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "No ha configurado el cliente de correo.\n"
+#~ "Necesita hacerlo para poder enviar,\n"
+#~ "recibir o escribir mensajes.\n"
+#~ "¿Querría configurarlo ahora?"
 
-#: my-evolution/Locations.h:617
-msgid "Dresden-Klotzsche"
-msgstr "Dresden-Klotzsche"
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Necesita configurar una identidad para\n"
+#~ "poder escribir mensajes de correo."
 
-#: my-evolution/Locations.h:618
-msgid "Drummond"
-msgstr "Drummond"
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Necesita configurar un transporte de\n"
+#~ "correo para poder enviarlo."
 
-#: my-evolution/Locations.h:619
-msgid "Dubai"
-msgstr "Dubai"
+#~ msgid "Move message(s) to"
+#~ msgstr "Mover mensaje(s) a"
 
-#: my-evolution/Locations.h:620
-msgid "Dubbo"
-msgstr "Dubbo"
+#~ msgid "Copy message(s) to"
+#~ msgstr "Copiar mensaje(s) a"
 
-#: my-evolution/Locations.h:621
-msgid "Dublin"
-msgstr "Dublín"
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "¿Seguro que quiere editar los %d mensajes?"
 
-#: my-evolution/Locations.h:622
-msgid "Du Bois"
-msgstr "Du Bois"
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Solo puede editar mensajes guardados\n"
+#~ "en la carpeta Borradores."
 
-#: my-evolution/Locations.h:623
-msgid "Dubrovnik"
-msgstr "Dubrovnik"
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Sólo puede reenviar mensajes\n"
+#~ "de la carpeta Enviados."
 
-#: my-evolution/Locations.h:624
-msgid "Dubuque"
-msgstr "Dubuque"
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
 
-#: my-evolution/Locations.h:625
-msgid "Dugway"
-msgstr "Dugway"
+#~ msgid "No Message Selected"
+#~ msgstr "Se hay mensajes seleccionados"
 
-#: my-evolution/Locations.h:626
-msgid "Duluth"
-msgstr "Duluth"
+#~ msgid "Save Messages As..."
+#~ msgstr "Guardar mensajes como..."
 
-#: my-evolution/Locations.h:627
-msgid "Dundee"
-msgstr "Dundee"
+#~ msgid "Printing of message failed"
+#~ msgstr "Ha fallado la impresión del mensaje"
 
-#: my-evolution/Locations.h:628
-msgid "Durango"
-msgstr "Durango"
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
 
-#: my-evolution/Locations.h:629
-msgid "Durango Awrs"
-msgstr "Durango Awrs"
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "No se pudo crear un contexto de firma S/MIME."
 
-#: my-evolution/Locations.h:630
-msgid "Durazno"
-msgstr "Durazno"
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "No se pudo crear un contexto de certificado S/MIME."
 
-#: my-evolution/Locations.h:631
-msgid "Durban Louis Botha "
-msgstr "Durban Louis Botha "
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "No se pudo crear un contexto de cifrado S/MIME."
 
-#: my-evolution/Locations.h:632
-msgid "Dusseldorf"
-msgstr "Dusseldorf"
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "No se pudo crear un contexto sobre tipo S/MIME."
 
-#: my-evolution/Locations.h:633
-msgid "Dutch Harbor"
-msgstr "Dutch Harbor"
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "No se pudo crear un contexto de decodificación S/MIME."
 
-#: my-evolution/Locations.h:634
-msgid "Dyersburg"
-msgstr "Dyersburg"
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "El archivo «%s» ya existe.\n"
+#~ "¿Quiere que lo sobreescriba?"
 
-#: my-evolution/Locations.h:635
-msgid "Eagle"
-msgstr "Eagle"
+#~ msgid "Save Attachment"
+#~ msgstr "Guardar adjunto"
 
-#: my-evolution/Locations.h:636
-msgid "Eagle Range"
-msgstr "Eagle Range"
+#~ msgid "Save Attachment..."
+#~ msgstr "Guardar adjunto"
 
-#: my-evolution/Locations.h:637
-msgid "East London"
-msgstr "Londres este"
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Ver incluido (vía %s)"
 
-#: my-evolution/Locations.h:638
-msgid "East Midlands"
-msgstr "East Midlands"
+#~ msgid "External Viewer"
+#~ msgstr "Visores externos"
 
-#: my-evolution/Locations.h:639
-msgid "East St Louis"
-msgstr "East St Louis"
+#~ msgid "Downloading images"
+#~ msgstr "Descargando imágenes"
 
-#: my-evolution/Locations.h:640
-msgid "Eau Claire"
-msgstr "Eau Claire"
+#~ msgid "Loading message content"
+#~ msgstr "Cargando el contenido del mensaje"
 
-#: my-evolution/Locations.h:642
-msgid "Edinburgh"
-msgstr "Edimburgo"
+#~ msgid "Overdue:"
+#~ msgstr "Retrasadas:"
 
-#: my-evolution/Locations.h:643
-msgid "Edmonton"
-msgstr "Edmonton"
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "por %B %d, %Y, %l:%M %P"
 
-#: my-evolution/Locations.h:644
-msgid "Edmonton/Villeneuve"
-msgstr "Edmonton/Villeneuve"
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Guardar enlace como (ARRÉGLAME)"
 
-#: my-evolution/Locations.h:645
-msgid "Eduardo Gomes International"
-msgstr "Eduardo Gomes International"
+#~ msgid "Save Image as..."
+#~ msgstr "Guardar imagen como..."
 
-#: my-evolution/Locations.h:646
-msgid "Edwards AFB"
-msgstr "Edwards AFB"
+#~ msgid "Bad Address"
+#~ msgstr "Dirección errónea"
 
-#: my-evolution/Locations.h:647
-msgid "Egilsstadir"
-msgstr "Egilsstadir"
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "No se pudo crear un contexto de verificación PGP."
 
-#: my-evolution/Locations.h:648
-msgid "Eglin"
-msgstr "Eglin"
+#~ msgid "Local folders/%s"
+#~ msgstr "Carpetas locales/%s"
 
-#: my-evolution/Locations.h:649
-msgid "Eglington/Londonderry"
-msgstr "Eglington/Londonderry"
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Reconfigurando carpeta"
 
-#: my-evolution/Locations.h:651
-msgid "Eindhoven"
-msgstr "Eindhoven"
+#~ msgid ""
+#~ "Cannot save folder metainfo; you may find you can't\n"
+#~ "open this folder anymore: %s: %s"
+#~ msgstr ""
+#~ "No se pudo guardar la meta información de la carpeta: probablemente\n"
+#~ "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: my-evolution/Locations.h:652
-msgid "Ekofisk"
-msgstr "Ekofisk"
+#~ msgid "Cannot save folder metainfo to %s: %s"
+#~ msgstr "No se pudo guardar la meta información de la carpeta en %s: %s"
 
-#: my-evolution/Locations.h:653
-msgid "Elazig"
-msgstr "Elazig"
+#~ msgid "Cannot delete folder metadata %s: %s"
+#~ msgstr "No se pudo borrar la metainformación de la carpeta %s: %s"
 
-#: my-evolution/Locations.h:654
-msgid "El Centro"
-msgstr "El Centro"
+#~ msgid "Changing folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiando la carpeta «%s» al formato «%s»"
 
-#: my-evolution/Locations.h:655
-msgid "El Dorado"
-msgstr "El Dorado"
+#~ 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"
+#~ "puede que tenga que arreglarlo a mano."
 
-#: my-evolution/Locations.h:656
-msgid "Elefsis"
-msgstr "Elefsis"
+#~ msgid "Reconfigure /%s"
+#~ msgstr "Reconfigurar /%s"
 
-#: my-evolution/Locations.h:657
-msgid "Elfin Cove"
-msgstr "Elfin Cove"
+#~ msgid "You cannot change the format of a non-local folder."
+#~ msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: my-evolution/Locations.h:658
-msgid "Elizabeth City"
-msgstr "Elizabeth City"
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Aun así, este mensaje fue enviado correctamente."
 
-#: my-evolution/Locations.h:659
-msgid "Elk City"
-msgstr "Elk City"
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Mensaje sin título)"
 
-#: my-evolution/Locations.h:660
-msgid "Elkhart"
-msgstr "Elkhart"
+#~ msgid "Untitled Message"
+#~ msgstr "Mensaje sin título"
 
-#: my-evolution/Locations.h:661
-msgid "Elkins"
-msgstr "Elkins"
+#~ msgid "Empty Message"
+#~ msgstr "Mensaje vacío"
 
-#: my-evolution/Locations.h:662
-msgid "Elko"
-msgstr "Elko"
+#~ msgid "Search Forward"
+#~ msgstr "Buscar hacia adelante"
 
-#: my-evolution/Locations.h:663
-msgid "Elmira"
-msgstr "Elmira"
+#~ msgid "(No subject)"
+#~ msgstr "(Sin asunto)"
 
-#: my-evolution/Locations.h:664
-msgid "El Monte"
-msgstr "El Monte"
+#~ msgid "%s - Message"
+#~ msgstr "%s - Mensaje"
 
-#: my-evolution/Locations.h:665
-msgid "El Paso"
-msgstr "El Paso"
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Analizando carpetas bajo %s en «%s»"
 
-#: my-evolution/Locations.h:667
-msgid "El Salvador Int."
-msgstr "El Salvador Int."
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Analizando carpetas de nivel superior en «%s»"
 
-#: my-evolution/Locations.h:668
-msgid "Elsenborn"
-msgstr "Elsenborn"
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Suscribiendo a carpeta «%s»"
 
-#: my-evolution/Locations.h:669
-msgid "Ely"
-msgstr "Ely"
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Desuscribiendo la carpeta «%s»"
 
-#: my-evolution/Locations.h:670
-msgid "Emmonak"
-msgstr "Emmonak"
+#~ msgid "Scanning folders ..."
+#~ msgstr "Analizando carpetas..."
 
-#: my-evolution/Locations.h:671
-msgid "Emporia"
-msgstr "Emporia"
+#~ msgid "Configure the appearance of the Evolution Summary here"
+#~ msgstr "Configure la apariencia del Resumen de Evolution aquí"
 
-#: my-evolution/Locations.h:672
-msgid "Enid"
-msgstr "Enid"
+#~ msgid "Evolution Summary"
+#~ msgstr "Resumen de Evolution"
 
-#: my-evolution/Locations.h:673
-msgid "Enid/Woodring"
-msgstr "Enid/Woodring"
+#~ msgid "Evolution Summary component"
+#~ msgstr "Componente del resumen de Evolution"
 
-#: my-evolution/Locations.h:674
-msgid "Enosburg Falls"
-msgstr "Enosburg Falls"
+#~ msgid "Evolution Summary configuration control"
+#~ msgstr "Componente de configuración del Resumen de Evolution"
 
-#: my-evolution/Locations.h:675
-msgid "Ephrata"
-msgstr "Ephrata"
+#~ msgid "Summary Preferences"
+#~ msgstr "Configuración del resumen"
 
-#: my-evolution/Locations.h:676
-msgid "Ercan"
-msgstr "Ercan"
+#~ msgid "Aarhus"
+#~ msgstr "Aarhus"
 
-#: my-evolution/Locations.h:677
-msgid "Erie"
-msgstr "Erie"
+#~ msgid "Abakan"
+#~ msgstr "Abakan"
 
-#: my-evolution/Locations.h:678
-msgid "Erzurum"
-msgstr "Erzurum"
+#~ msgid "Abbotsford"
+#~ msgstr "Abbotsford"
 
-#: my-evolution/Locations.h:679
-msgid "Esbjerg"
-msgstr "Esbjerg"
+#~ msgid "Aberdeen"
+#~ msgstr "Aberdeen"
 
-#: my-evolution/Locations.h:680
-msgid "Escanaba"
-msgstr "Escanaba"
+#~ msgid "Abha"
+#~ msgstr "Abha"
 
-#: my-evolution/Locations.h:681
-msgid "Esfahan"
-msgstr "Esfahan"
+#~ msgid "Abilene"
+#~ msgstr "Abilene"
 
-#: my-evolution/Locations.h:682
-msgid "Eskisehir"
-msgstr "Eskisehir"
+#~ msgid "Abingdon"
+#~ msgstr "Abingdon"
 
-#: my-evolution/Locations.h:683
-msgid "Estherville"
-msgstr "Estherville"
+#~ msgid "Abu Dhabi"
+#~ msgstr "Abu Dhabi"
 
-#: my-evolution/Locations.h:685
-msgid "Eugene"
-msgstr "Eugene"
+#~ msgid "Abu Dhabi - Bateen"
+#~ msgstr "Abu Dhabi - Bateen"
 
-#: my-evolution/Locations.h:686
-msgid "Eureka"
-msgstr "Eureka"
+#~ msgid "Acajutla"
+#~ msgstr "Acajutla"
 
-#: my-evolution/Locations.h:687
-msgid "Europe"
-msgstr "Europa"
+#~ msgid "Acapulco"
+#~ msgstr "Acapulco"
 
-#: my-evolution/Locations.h:688
-msgid "Evanston"
-msgstr "Evanston"
+#~ msgid "Acarigua"
+#~ msgstr "Acarigua"
 
-#: my-evolution/Locations.h:689
-msgid "Evansville"
-msgstr "Evansville"
+#~ msgid "Adak"
+#~ msgstr "Adak"
 
-#: my-evolution/Locations.h:690
-msgid "Everett"
-msgstr "Everett"
+#~ msgid "Adana"
+#~ msgstr "Adana"
 
-#: my-evolution/Locations.h:691
-msgid "Evergreen"
-msgstr "Evergreen"
+#~ msgid "Adana/Incirlik"
+#~ msgstr "Adana/Incirlik"
 
-#: my-evolution/Locations.h:692
-msgid "Evreux-Fauville"
-msgstr "Evreux-Fauville"
+#~ msgid "Adelaide"
+#~ msgstr "Adelaide"
 
-#: my-evolution/Locations.h:693
-msgid "Exeter"
-msgstr "Exeter"
+#~ msgid "Aden"
+#~ msgstr "Aden"
 
-#: my-evolution/Locations.h:694
-msgid "Ezeiza"
-msgstr "Ezeiza"
+#~ msgid "Adrar"
+#~ msgstr "Adrar"
 
-#: my-evolution/Locations.h:695
-msgid "Fagernes"
-msgstr "Fagernes"
+#~ msgid "Aeroparque"
+#~ msgstr "Aeroparque"
 
-#: my-evolution/Locations.h:696
-msgid "Fairbanks"
-msgstr "Fairbanks"
+#~ msgid "Aeropuerto del Norte"
+#~ msgstr "Aeropuerto del Norte"
 
-#: my-evolution/Locations.h:697
-msgid "Fairchild"
-msgstr "Fairchild"
+#~ msgid "Afonsos"
+#~ msgstr "Afonsos"
 
-#: my-evolution/Locations.h:698
-msgid "Fairfield"
-msgstr "Fairfield"
+#~ msgid "Africa"
+#~ msgstr "África"
 
-#: my-evolution/Locations.h:699
-msgid "Fairmont"
-msgstr "Fairmont"
+#~ msgid "Afyon"
+#~ msgstr "Afyon"
 
-#: my-evolution/Locations.h:700
-msgid "Fallon"
-msgstr "Fallon"
+#~ msgid "Agen"
+#~ msgstr "Agen"
 
-#: my-evolution/Locations.h:701
-msgid "Falls City"
-msgstr "Falls City"
+#~ msgid "Aguascaliantes"
+#~ msgstr "Aguascalientes"
 
-#: my-evolution/Locations.h:702
-msgid "Falmouth-Otis AFB"
-msgstr "Falmouth-Otis AFB"
+#~ msgid "Ahmadabad"
+#~ msgstr "Ahmadabad"
 
-#: my-evolution/Locations.h:703
-msgid "Farbanks/Eielson AFB"
-msgstr "Farbanks/Eielson AFB"
+#~ msgid "Ahwaz"
+#~ msgstr "Ahwaz"
 
-#: my-evolution/Locations.h:704
-msgid "Fargo"
-msgstr "Fargo"
+#~ msgid "Ainsworth"
+#~ msgstr "Ainsworth"
 
-#: my-evolution/Locations.h:705
-msgid "Farmingdale"
-msgstr "Farmingdale"
+#~ msgid "Air Force"
+#~ msgstr "Fuerzas aéreas"
 
-#: my-evolution/Locations.h:706
-msgid "Farmington"
-msgstr "Farmington"
+#~ msgid "Ajaccio/Campo dell'Oro"
+#~ msgstr "Ajaccio/Campo dell'Oro"
 
-#: my-evolution/Locations.h:707
-msgid "Farmville"
-msgstr "Farmville"
+#~ msgid "Akeno Ab"
+#~ msgstr "Akeno Ab"
 
-#: my-evolution/Locations.h:708
-msgid "Faro"
-msgstr "Faro"
+#~ msgid "Akita Airport"
+#~ msgstr "Aeropuerto de Akita"
 
-#: my-evolution/Locations.h:709
-msgid "Fayetteville"
-msgstr "Fayetteville"
+#~ msgid "Akron"
+#~ msgstr "Akron"
 
-#: my-evolution/Locations.h:710
-msgid "Feng Nin"
-msgstr "Feng Nin"
+#~ msgid "Akrotiri"
+#~ msgstr "Akrotiri"
 
-#: my-evolution/Locations.h:711
-msgid "Fergus Falls"
-msgstr "Fergus Falls"
+#~ msgid "Alabama"
+#~ msgstr "Alabama"
 
-#: my-evolution/Locations.h:712
-msgid "Fernando De Noronha"
-msgstr "Fernando De Noronha"
+#~ msgid "Al Ahsa"
+#~ msgstr "Al Ahsa"
 
-#: my-evolution/Locations.h:713
-msgid "Ferrara"
-msgstr "Ferrara"
+#~ msgid "Al Ain"
+#~ msgstr "Al Ain"
 
-#: my-evolution/Locations.h:714
-msgid "Figari"
-msgstr "Figari"
+#~ msgid "Alamogordo"
+#~ msgstr "Alamogordo"
 
-#: my-evolution/Locations.h:715
-msgid "Findlay"
-msgstr "Findlay"
+#~ msgid "Alamosa"
+#~ msgstr "Alamosa"
 
-#: my-evolution/Locations.h:717
-msgid "Firenze"
-msgstr "Firenze"
+#~ msgid "Alaska"
+#~ msgstr "Alaska"
 
-#: my-evolution/Locations.h:718
-msgid "Fitchburg"
-msgstr "Fitchburg"
+#~ msgid "Al Baha"
+#~ msgstr "Al Baha"
 
-#: my-evolution/Locations.h:719
-msgid "Flagstaff"
-msgstr "Flagstaff"
+#~ msgid "Albany"
+#~ msgstr "Albania"
 
-#: my-evolution/Locations.h:720
-msgid "Flint"
-msgstr "Flint"
+#~ msgid "Albenga"
+#~ msgstr "Albenga"
 
-#: my-evolution/Locations.h:721
-msgid "Flippin"
-msgstr "Flippin"
+#~ msgid "Alberta"
+#~ msgstr "Alberta"
 
-#: my-evolution/Locations.h:722
-msgid "Florence"
-msgstr "Florencia"
+#~ msgid "Alborg"
+#~ msgstr "Alborg"
 
-#: my-evolution/Locations.h:723
-msgid "Florennes"
-msgstr "Florennes"
+#~ msgid "Albuquerque"
+#~ msgstr "Albuquerque"
 
-#: my-evolution/Locations.h:724
-msgid "Flores"
-msgstr "Flores"
+#~ msgid "Alderney"
+#~ msgstr "Alderney"
 
-#: my-evolution/Locations.h:725
-msgid "Florianopolis"
-msgstr "Florianopolis"
+#~ msgid "Alesund"
+#~ msgstr "Alesund"
 
-#: my-evolution/Locations.h:726
-msgid "Florida"
-msgstr "Florida"
+#~ msgid "Alexandria"
+#~ msgstr "Alexandria"
 
-#: my-evolution/Locations.h:727
-msgid "Floro"
-msgstr "Floro"
+#~ msgid "Alexandria-Esler"
+#~ msgstr "Alexandria-Esler"
 
-#: my-evolution/Locations.h:728
-msgid "Fond Du Lac"
-msgstr "Fond Du Lac"
+#~ msgid "Alexandria/Nouzha"
+#~ msgstr "Alexandria/Nouzha"
 
-#: my-evolution/Locations.h:729
-msgid "Forde/Bringeland"
-msgstr "Forde/Bringeland"
+#~ msgid "Alexandroupolis"
+#~ msgstr "Alexandroupolis"
 
-#: my-evolution/Locations.h:730
-msgid "Forli"
-msgstr "Forli"
+#~ msgid "Alghero"
+#~ msgstr "Alghero"
 
-#: my-evolution/Locations.h:731
-msgid "Formosa"
-msgstr "Formosa"
+#~ msgid "Algona"
+#~ msgstr "Algona"
 
-#: my-evolution/Locations.h:732
-msgid "Fortaleza"
-msgstr "Fortaleza"
+#~ msgid "Alicante"
+#~ msgstr "Alicante"
 
-#: my-evolution/Locations.h:733
-msgid "Fort Belvoir"
-msgstr "Fuerte Belvoir"
+#~ msgid "Alice"
+#~ msgstr "Alice"
 
-#: my-evolution/Locations.h:734
-msgid "Fort Benning"
-msgstr "Fuerte Benning"
+#~ msgid "Alice Springs"
+#~ msgstr "Alice Springs"
 
-#: my-evolution/Locations.h:735
-msgid "Fort Bragg"
-msgstr "Fuerte Bragg"
+#~ msgid "Al-Jouf"
+#~ msgstr "Al-Jouf"
 
-#: my-evolution/Locations.h:736
-msgid "Fort Campbell"
-msgstr "Fuerte Campbell"
+#~ msgid "Allentown"
+#~ msgstr "Allentown"
 
-#: my-evolution/Locations.h:737
-msgid "Fort Carson"
-msgstr "Fuerte Carson"
+#~ msgid "Alliance"
+#~ msgstr "Alliance"
 
-#: my-evolution/Locations.h:738
-msgid "Fort Collins"
-msgstr "Fuerte Collins"
+#~ msgid "Alma"
+#~ msgstr "Alma"
 
-#: my-evolution/Locations.h:739
-msgid "Fort Collins/Lovel"
-msgstr "Fuerte Collins/Lovel"
+#~ msgid "Almeria"
+#~ msgstr "Almería"
 
-#: my-evolution/Locations.h:740
-msgid "Fort Dodge"
-msgstr "Fuerte Dodge"
+#~ msgid "Alpena"
+#~ msgstr "Alpena"
 
-#: my-evolution/Locations.h:741
-msgid "Fort Drum"
-msgstr "Fuerte Drum"
+#~ msgid "Al Qaysumah"
+#~ msgstr "Al Qaysumah"
 
-#: my-evolution/Locations.h:742
-msgid "Fort Eustis"
-msgstr "Fuerte Eustis"
+#~ msgid "Alta"
+#~ msgstr "Alta"
 
-#: my-evolution/Locations.h:743
-msgid "Fort Greely/Allen AAF"
-msgstr "Fuerte Greely/Allen AAF"
+#~ msgid "Altamira"
+#~ msgstr "Altamira"
 
-#: my-evolution/Locations.h:744
-msgid "Fort Huachuca"
-msgstr "Fuerte Huachuca"
+#~ msgid "Alton"
+#~ msgstr "Alton"
 
-#: my-evolution/Locations.h:745
-msgid "Fort Knox"
-msgstr "Fuerte Knox"
+#~ msgid "Altoona"
+#~ msgstr "Altoona"
 
-#: my-evolution/Locations.h:746
-msgid "Fort Lauderdale"
-msgstr "Fuerte Lauderdale"
+#~ msgid "Alturas"
+#~ msgstr "Alturas"
 
-#: my-evolution/Locations.h:747
-msgid "Fort Lauderdale (International)"
-msgstr "Fuerte Lauderdale (International)"
+#~ msgid "Altus"
+#~ msgstr "Altus"
 
-#: my-evolution/Locations.h:748
-msgid "Fort Leonard"
-msgstr "Fuerte Leonard"
+#~ msgid "Amami Airport"
+#~ msgstr "Aeropuerto de Amami"
 
-#: my-evolution/Locations.h:749
-msgid "Fort Lewis"
-msgstr "Fuerte Lewis"
+#~ msgid "Amapala"
+#~ msgstr "Amapala"
 
-#: my-evolution/Locations.h:750
-msgid "Fort Madison"
-msgstr "Fuerte Madison"
+#~ msgid "Amarillo"
+#~ msgstr "Amarillo"
 
-#: my-evolution/Locations.h:751
-msgid "Fort Meade"
-msgstr "Fuerte Meade"
+#~ msgid "Amasya"
+#~ msgstr "Amasya"
 
-#: my-evolution/Locations.h:752
-msgid "Fort Myers (Page Field)"
-msgstr "Fuerte Myers (Page Field)"
+#~ msgid "Ambler"
+#~ msgstr "Ambler"
 
-#: my-evolution/Locations.h:753
-msgid "Fort Myers (Southwest Florida International)"
-msgstr "Fuerte Myers (Southwest Florida International)"
+#~ msgid "Amelia"
+#~ msgstr "Amelia"
 
-#: my-evolution/Locations.h:754
-msgid "Fort Polk-Leesville"
-msgstr "Fuerte Polk-Leesville"
+#~ msgid "Amendola"
+#~ msgstr "Amendola"
 
-#: my-evolution/Locations.h:755
-msgid "Fort Riley"
-msgstr "Fuerte Riley"
+#~ msgid "Ames"
+#~ msgstr "Ames"
 
-#: my-evolution/Locations.h:756
-msgid "Fort Sill"
-msgstr "Fuerte Sill"
+#~ msgid "Amritsar"
+#~ msgstr "Amritsar"
 
-#: my-evolution/Locations.h:757
-msgid "Fort Smith"
-msgstr "Fuerte Smith"
+#~ msgid "Amsterdam"
+#~ msgstr "Amsterdam"
 
-#: my-evolution/Locations.h:758
-msgid "Fort Stewart"
-msgstr "Fuerte Stewart"
+#~ msgid "Anadyr"
+#~ msgstr "Anadyr"
 
-#: my-evolution/Locations.h:759
-msgid "Fort Stockton"
-msgstr "Fuerte Stockton"
+#~ msgid "Anaktuvuk"
+#~ msgstr "Anaktuvuk"
 
-#: my-evolution/Locations.h:760
-msgid "Fort Wayne"
-msgstr "Fuerte Wayne"
+#~ msgid "Anapa"
+#~ msgstr "Anapa"
 
-#: my-evolution/Locations.h:761
-msgid "Fort Worth-Alliance"
-msgstr "Fuerte Worth-Alliance"
+#~ msgid "Anchorage"
+#~ msgstr "Anchorage"
 
-#: my-evolution/Locations.h:762
-msgid "Fort Worth-Meacham"
-msgstr "Fuerte Worth-Meacham"
+#~ msgid "Anchorage - Elmendorf AFB"
+#~ msgstr "Anchorage - Elmendorf AFB"
 
-#: my-evolution/Locations.h:763
-msgid "Fort Worth NAS"
-msgstr "Fuerte Worth NAS"
+#~ msgid "Ancona"
+#~ msgstr "Ancona"
 
-#: my-evolution/Locations.h:764
-msgid "Fourchon"
-msgstr "Fourchon"
+#~ msgid "Andahuayla"
+#~ msgstr "Andahuayla"
 
-#: my-evolution/Locations.h:765
-msgid "Foz Do Iguacu"
-msgstr "Foz Do Iguacu"
+#~ msgid "Anderson"
+#~ msgstr "Anderson"
 
-#: my-evolution/Locations.h:767
-msgid "Frankfort"
-msgstr "Frankfurt"
+#~ msgid "Andoya"
+#~ msgstr "Andoya"
 
-#: my-evolution/Locations.h:768
-msgid "Frankfurt/Main"
-msgstr "Frankfurt/Main"
+#~ msgid "Andravida"
+#~ msgstr "Andravida"
 
-#: my-evolution/Locations.h:769
-msgid "Franklin"
-msgstr "Franklin"
+#~ msgid "Andrews AFB"
+#~ msgstr "Andrews AFB"
 
-#: my-evolution/Locations.h:770
-msgid "Fredericton"
-msgstr "Fredericton"
+#~ msgid "Angleton"
+#~ msgstr "Angleton"
 
-#: my-evolution/Locations.h:771
-msgid "Freeport"
-msgstr "Freeport"
+#~ msgid "Aniak"
+#~ msgstr "Aniak"
 
-#: my-evolution/Locations.h:772
-msgid "Frenchville"
-msgstr "Frenchville"
+#~ msgid "Ankara/Esenboga"
+#~ msgstr "Ankara/Esenboga"
 
-#: my-evolution/Locations.h:773
-msgid "Fresno"
-msgstr "Fresno"
+#~ msgid "Ankara/Etimesgut"
+#~ msgstr "Ankara/Etimesgut"
 
-#: my-evolution/Locations.h:774
-msgid "Fresno-Chandler"
-msgstr "Fresno-Chandler"
+#~ msgid "Annaba"
+#~ msgstr "Annaba"
 
-#: my-evolution/Locations.h:775
-msgid "Friday Harbor"
-msgstr "Friday Harbor"
+#~ msgid "Ann Arbor"
+#~ msgstr "Ann Arbor"
 
-#: my-evolution/Locations.h:776
-msgid "Friedrichshafen"
-msgstr "Friedrichshafen"
+#~ msgid "Annette"
+#~ msgstr "Annette"
 
-#: my-evolution/Locations.h:777
-msgid "Frigg"
-msgstr "Frigg"
+#~ msgid "Anniston"
+#~ msgstr "Anniston"
 
-#: my-evolution/Locations.h:778
-msgid "Frontone"
-msgstr "Frontone"
+#~ msgid "Antalya"
+#~ msgstr "Antalya"
 
-#: my-evolution/Locations.h:779
-msgid "Frosinone"
-msgstr "Frosinone"
+#~ msgid "Antartica"
+#~ msgstr "Antártida"
 
-#: my-evolution/Locations.h:780
-msgid "Fryeburg"
-msgstr "Fryeburg"
+#~ msgid "Antigo"
+#~ msgstr "Antigo"
 
-#: my-evolution/Locations.h:781
-msgid "Fujairah"
-msgstr "Fujairah"
+#~ msgid "Antigua"
+#~ msgstr "Antigua"
 
-#: my-evolution/Locations.h:782
-msgid "Fuji Ab"
-msgstr "Fuji Ab"
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua y Barbuda"
 
-#: my-evolution/Locations.h:783
-msgid "Fukue Airport"
-msgstr "Aeropuerto de Fukue"
+#~ msgid "Antofagasta"
+#~ msgstr "Antofagasta"
 
-#: my-evolution/Locations.h:784
-msgid "Fukui Airport"
-msgstr "Aeropuerto de Fukui"
+#~ msgid "Antwerpen/Deurne"
+#~ msgstr "Antwerpen/Deurne"
 
-#: my-evolution/Locations.h:785
-msgid "Fukuoka Airport"
-msgstr "Aeropuerto de Fukuoka"
+#~ msgid "Aomori Airport"
+#~ msgstr "Aeropuerto de Aomori"
 
-#: my-evolution/Locations.h:786
-msgid "Fullerton"
-msgstr "Fullerton"
+#~ msgid "Apalachicola"
+#~ msgstr "Apalachicola"
 
-#: my-evolution/Locations.h:787
-msgid "Funchal"
-msgstr "Funchal"
+#~ msgid "Appleton"
+#~ msgstr "Appleton"
 
-#: my-evolution/Locations.h:788
-msgid "FYR Macedonia"
-msgstr "FYR Macedonia"
+#~ msgid "Aquadilla"
+#~ msgstr "Aquadilla"
 
-#: my-evolution/Locations.h:789
-msgid "Gadsden"
-msgstr "Gadsden"
+#~ msgid "Aracaju"
+#~ msgstr "Aracaju"
 
-#: my-evolution/Locations.h:790
-msgid "Gage"
-msgstr "Gage"
+#~ msgid "Arad"
+#~ msgstr "Arad"
 
-#: my-evolution/Locations.h:791
-msgid "Gainesville"
-msgstr "Gainesville"
+#~ msgid "Arar"
+#~ msgstr "Arar"
 
-#: my-evolution/Locations.h:792
-msgid "Galax-Hillsville"
-msgstr "Galax-Hillsville"
+#~ msgid "Araxos"
+#~ msgstr "Araxos"
 
-#: my-evolution/Locations.h:793
-msgid "Galbraith Lake"
-msgstr "Lago Galbraith"
+#~ msgid "Arcata"
+#~ msgstr "Arcata"
 
-#: my-evolution/Locations.h:794
-msgid "Galeao"
-msgstr "Galeao"
+#~ msgid "Ardmore"
+#~ msgstr "Ardmore"
 
-#: my-evolution/Locations.h:795
-msgid "Galena"
-msgstr "Galena"
+#~ msgid "Arequipa"
+#~ msgstr "Arequipa"
 
-#: my-evolution/Locations.h:796
-msgid "Galesburg"
-msgstr "Galesburg"
+#~ msgid "Arica"
+#~ msgstr "Arica"
 
-#: my-evolution/Locations.h:797
-msgid "Gallup"
-msgstr "Gallup"
+#~ msgid "Arizona"
+#~ msgstr "Arizona"
 
-#: my-evolution/Locations.h:798
-msgid "Galveston"
-msgstr "Galveston"
+#~ msgid "Arkansas"
+#~ msgstr "Arkansas"
 
-#: my-evolution/Locations.h:799
-msgid "Gambell"
-msgstr "Gambell"
+#~ msgid "Arkhangelsk"
+#~ msgstr "Arkhangelsk"
 
-#: my-evolution/Locations.h:800
-msgid "Gander"
-msgstr "Gander"
+#~ msgid "Arlington"
+#~ msgstr "Arlington"
 
-#: my-evolution/Locations.h:801
-msgid "Garden City"
-msgstr "Garden City"
+#~ msgid "Artigas"
+#~ msgstr "Artigas"
 
-#: my-evolution/Locations.h:802
-msgid "Gary"
-msgstr "Gary"
+#~ msgid "Asahikawa Ab"
+#~ msgstr "Asahikawa Ab"
 
-#: my-evolution/Locations.h:803
-msgid "Gassim"
-msgstr "Gassim"
+#~ msgid "Asahikawa Airport"
+#~ msgstr "Aeropuerto de Asahikawa"
 
-#: my-evolution/Locations.h:804
-msgid "Gatineau"
-msgstr "Gatineau"
+#~ msgid "Ashburnam"
+#~ msgstr "Ashburnam"
 
-#: my-evolution/Locations.h:805
-msgid "Gaziantep"
-msgstr "Gaziantep"
+#~ msgid "Asheville"
+#~ msgstr "Asheville"
 
-#: my-evolution/Locations.h:806
-msgid "Gdansk"
-msgstr "Gdansk"
+#~ msgid "Ashfield"
+#~ msgstr "Ashfield"
 
-#: my-evolution/Locations.h:807
-msgid "Geneve"
-msgstr "Geneve"
+#~ msgid "Ashiya Ab"
+#~ msgstr "Ashiya Ab"
 
-#: my-evolution/Locations.h:808
-msgid "Genova"
-msgstr "Génova"
+#~ msgid "Ashland"
+#~ msgstr "Ashland"
 
-#: my-evolution/Locations.h:809
-msgid "George Airport"
-msgstr "Aeropuerto de George"
+#~ msgid "Asia"
+#~ msgstr "Asia"
 
-#: my-evolution/Locations.h:810
-msgid "Georgetown"
-msgstr "Georgetown"
+#~ msgid "Aspen"
+#~ msgstr "Aspen"
 
-#: my-evolution/Locations.h:813
-msgid "Ghardaia"
-msgstr "Ghardaia"
+#~ msgid "Asswan"
+#~ msgstr "Asswan"
 
-#: my-evolution/Locations.h:814
-msgid "Ghedi"
-msgstr "Ghedi"
+#~ msgid "Astoria"
+#~ msgstr "Astoria"
 
-#: my-evolution/Locations.h:816
-msgid "Gifu Ab"
-msgstr "Gifu Ab"
+#~ msgid "Astrakhan"
+#~ msgstr "Astrakhan"
 
-#: my-evolution/Locations.h:817
-msgid "Gila Bend"
-msgstr "Gila Bend"
+#~ msgid "Asturias"
+#~ msgstr "Asturias"
 
-#: my-evolution/Locations.h:818
-msgid "Gillette"
-msgstr "Gillette"
+#~ msgid "Asuncion"
+#~ msgstr "Asunción"
 
-#: my-evolution/Locations.h:819
-msgid "Gilze-Rijen"
-msgstr "Gilze-Rijen"
+#~ msgid "Athens"
+#~ msgstr "Atenas"
 
-#: my-evolution/Locations.h:820
-msgid "Gioia del Colle"
-msgstr "Gioia del Colle"
+#~ msgid "Athinai"
+#~ msgstr "Athinai"
 
-#: my-evolution/Locations.h:821
-msgid "Girona"
-msgstr "Gerona"
+#~ msgid "Atlanta"
+#~ msgstr "Atlanta"
 
-#: my-evolution/Locations.h:822
-msgid "Gizan"
-msgstr "Gizan"
+#~ msgid "Atlantic"
+#~ msgstr "Atlántico"
 
-#: my-evolution/Locations.h:823
-msgid "Glasgow"
-msgstr "Glasgow"
+#~ msgid "Atlantic City"
+#~ msgstr "Atlantic City"
 
-#: my-evolution/Locations.h:824
-msgid "Glendive"
-msgstr "Glendive"
+#~ msgid "Atsugi US NAS"
+#~ msgstr "Atsugi US NAS"
 
-#: my-evolution/Locations.h:825
-msgid "Glens Falls"
-msgstr "Glens Falls"
+#~ msgid "Auburn"
+#~ msgstr "Auburn"
 
-#: my-evolution/Locations.h:826
-msgid "Goiania"
-msgstr "Goiania"
+#~ msgid "Auckland"
+#~ msgstr "Auckland"
 
-#: my-evolution/Locations.h:827
-msgid "Goldsboro"
-msgstr "Goldsboro"
+#~ msgid "Augsburg"
+#~ msgstr "Augsburg"
 
-#: my-evolution/Locations.h:828
-msgid "Goodland"
-msgstr "Goodland"
+#~ msgid "Augusta"
+#~ msgstr "Augusta"
 
-#: my-evolution/Locations.h:829
-msgid "Goose Bay"
-msgstr "Goose Bay"
+#~ msgid "Aurora"
+#~ msgstr "Aurora"
 
-#: my-evolution/Locations.h:830
-msgid "Goteborg (Landvetter)"
-msgstr "Goteborg (Landvetter)"
+#~ msgid "Austin"
+#~ msgstr "Austin"
 
-#: my-evolution/Locations.h:831
-msgid "Goteborg (Save)"
-msgstr "Goteborg (Save)"
+#~ msgid "Australasia"
+#~ msgstr "Asia austral"
 
-#: my-evolution/Locations.h:832
-msgid "Granada"
-msgstr "Granada"
+#~ msgid "Avalon"
+#~ msgstr "Avalon"
 
-#: my-evolution/Locations.h:833
-msgid "Grand Canyon"
-msgstr "Gran Cañón"
+#~ msgid "Aviano"
+#~ msgstr "Aviano"
 
-#: my-evolution/Locations.h:834
-msgid "Grand Cayman"
-msgstr "Grand Cayman"
+#~ msgid "Ayacucho"
+#~ msgstr "Ayacucho"
 
-#: my-evolution/Locations.h:835
-msgid "Grand Forks"
-msgstr "Grand Forks"
+#~ msgid "Bage"
+#~ msgstr "Bage"
 
-#: my-evolution/Locations.h:836
-msgid "Grand Island"
-msgstr "Grand Island"
+#~ msgid "Bagotville"
+#~ msgstr "Bagotville"
 
-#: my-evolution/Locations.h:837
-msgid "Grand Isle"
-msgstr "Grand Isle"
+#~ msgid "Bahia Blanca"
+#~ msgstr "Bahía Blanca"
 
-#: my-evolution/Locations.h:838
-msgid "Grand Junction"
-msgstr "Grand Junction"
+#~ msgid "Bahias de Huatulco"
+#~ msgstr "Bahías de Huatulco"
 
-#: my-evolution/Locations.h:839
-msgid "Grand Marais"
-msgstr "Grand Marais"
+#~ msgid "Baker City"
+#~ msgstr "Baker City"
 
-#: my-evolution/Locations.h:840
-msgid "Grand Rapids"
-msgstr "Grand Rapids"
+#~ msgid "Bakersfield"
+#~ msgstr "Bakersfield"
 
-#: my-evolution/Locations.h:841
-msgid "Grandview"
-msgstr "Grandview"
+#~ msgid "Bale-Mulhouse"
+#~ msgstr "Bale-Mulhouse"
 
-#: my-evolution/Locations.h:842
-msgid "Grangeville"
-msgstr "Grangeville"
+#~ msgid "Balikesir"
+#~ msgstr "Balikesir"
 
-#: my-evolution/Locations.h:843
-msgid "Grants"
-msgstr "Grants"
+#~ msgid "Balikesir/Bandirma"
+#~ msgstr "Balikesir/Bandirma"
 
-#: my-evolution/Locations.h:844
-msgid "Graz"
-msgstr "Graz"
+#~ msgid "Ball Mountain"
+#~ msgstr "Ball Mountain"
 
-#: my-evolution/Locations.h:845
-msgid "Great Falls"
-msgstr "Great Falls"
+#~ msgid "Baltimore"
+#~ msgstr "Baltimore"
 
-#: my-evolution/Locations.h:847
-msgid "Greeley"
-msgstr "Greeley"
+#~ msgid "Baltimore-Glen Burnie"
+#~ msgstr "Baltimore-Glen Burnie"
 
-#: my-evolution/Locations.h:848
-msgid "Green Bay"
-msgstr "Green Bay"
+#~ msgid "Banak"
+#~ msgstr "Banak"
 
-#: my-evolution/Locations.h:849
-msgid "Green River"
-msgstr "Green River"
+#~ msgid "Bandarabbass"
+#~ msgstr "Bandarabbass"
 
-#: my-evolution/Locations.h:850
-msgid "Greensboro"
-msgstr "Greensboro"
+#~ msgid "Bangor"
+#~ msgstr "Bangor"
 
-#: my-evolution/Locations.h:851
-msgid "Greenville"
-msgstr "Greenville"
+#~ msgid "Baracoa"
+#~ msgstr "Baracoa"
 
-#: my-evolution/Locations.h:852
-msgid "Greenville-Spartanburg"
-msgstr "Greenville-Spartanburg"
+#~ msgid "Barbers Point"
+#~ msgstr "Barbers Point"
 
-#: my-evolution/Locations.h:853
-msgid "Greenwood"
-msgstr "Greenwood"
+#~ msgid "Barcelona"
+#~ msgstr "Barcelona"
 
-#: my-evolution/Locations.h:854
-msgid "Grenoble-Saint-Geoirs"
-msgstr "Grenoble-Saint-Geoirs"
+#~ msgid "Bardufoss"
+#~ msgstr "Bardufoss"
 
-#: my-evolution/Locations.h:855
-msgid "Griffiss AFB"
-msgstr "Griffiss AFB"
+#~ msgid "Bar Harbor"
+#~ msgstr "Bar Harbor"
 
-#: my-evolution/Locations.h:856
-msgid "Groningen"
-msgstr "Groningen"
+#~ msgid "Bari"
+#~ msgstr "Bari"
 
-#: my-evolution/Locations.h:857
-msgid "Grosseto"
-msgstr "Grosseto"
+#~ msgid "Bariloche"
+#~ msgstr "Bariloche"
 
-#: my-evolution/Locations.h:858
-msgid "Groton"
-msgstr "Groton"
+#~ msgid "Barinas"
+#~ msgstr "Barinas"
 
-#: my-evolution/Locations.h:859
-msgid "Guadalajara"
-msgstr "Guadalajara"
+#~ msgid "Barking Sand"
+#~ msgstr "Barking Sand"
 
-#: my-evolution/Locations.h:860
-msgid "Guadalupe Pass"
-msgstr "Paso de Guadalupe"
+#~ msgid "Barksdale"
+#~ msgstr "Barksdale"
 
-#: my-evolution/Locations.h:861
-msgid "Guanare"
-msgstr "Guanare"
+#~ msgid "Barnaul"
+#~ msgstr "Barnaul"
 
-#: my-evolution/Locations.h:862
-msgid "Guangzhou"
-msgstr "Guangzhou"
+#~ msgid "Barquisimeto"
+#~ msgstr "Barquisimeto"
 
-#: my-evolution/Locations.h:863
-msgid "Guantanamo"
-msgstr "Guantánamo"
+#~ msgid "Barranquilla/Ernestocortissoz"
+#~ msgstr "Barranquilla/Ernestocortissoz"
 
-#: my-evolution/Locations.h:864
-msgid "Guarany"
-msgstr "Guaraní"
+#~ msgid "Barrow"
+#~ msgstr "Barrow"
 
-#: my-evolution/Locations.h:865
-msgid "Guaratingueta"
-msgstr "Guarantingueta"
+#~ msgid "Barter Island"
+#~ msgstr "Barter Island"
 
-#: my-evolution/Locations.h:866
-msgid "Guarulhos"
-msgstr "Guarulhos"
+#~ msgid "Bartlesville"
+#~ msgstr "Bartlesville"
 
-#: my-evolution/Locations.h:868
-msgid "Guayaquil/Simon Bolivar"
-msgstr "Guayaquil/Simon Bolivar"
+#~ msgid "Bartow"
+#~ msgstr "Bartow"
 
-#: my-evolution/Locations.h:869
-msgid "Guaymas"
-msgstr "Guaymas"
+#~ msgid "Bastia"
+#~ msgstr "Bastia"
 
-#: my-evolution/Locations.h:870
-msgid "Guernsey"
-msgstr "Guernsey"
+#~ msgid "Batesville"
+#~ msgstr "Batesville"
 
-#: my-evolution/Locations.h:871
-msgid "Guidonia"
-msgstr "Guidonia"
+#~ msgid "Batman"
+#~ msgstr "Batman"
 
-#: my-evolution/Locations.h:872
-msgid "Gulfport"
-msgstr "Gulfport"
+#~ msgid "Baton Rouge"
+#~ msgstr "Baton Rouge"
 
-#: my-evolution/Locations.h:873
-msgid "Gulkana"
-msgstr "Gulkana"
+#~ msgid "Battle Creek"
+#~ msgstr "Battle Creek"
 
-#: my-evolution/Locations.h:874
-msgid "Gullfax C"
-msgstr "Gullfax C"
+#~ msgid "Battle Mountain"
+#~ msgstr "Battle Mountain"
 
-#: my-evolution/Locations.h:875
-msgid "Gunnison"
-msgstr "Gunnison"
+#~ msgid "Bauru"
+#~ msgstr "Bauru"
 
-#: my-evolution/Locations.h:876
-msgid "Gunnison (2)"
-msgstr "Gunnison (2)"
+#~ msgid "Bayamo"
+#~ msgstr "Bayamo"
 
-#: my-evolution/Locations.h:877
-msgid "Guriat"
-msgstr "Guriat"
+#~ msgid "Bayreuth"
+#~ msgstr "Bayreuth"
 
-#: my-evolution/Locations.h:878
-msgid "Gustavus"
-msgstr "Gustavus"
+#~ msgid "Beatrice"
+#~ msgstr "Beatrice"
 
-#: my-evolution/Locations.h:879
-msgid "Guymon"
-msgstr "Guymon"
+#~ msgid "Beaufort"
+#~ msgstr "Beaufort"
 
-#: my-evolution/Locations.h:880
-msgid "Habana"
-msgstr "La Habana"
+#~ msgid "Beaumont"
+#~ msgstr "Beaumont"
 
-#: my-evolution/Locations.h:881
-msgid "Hachijojima Airport"
-msgstr "Hachijojima Airport"
+#~ msgid "Beaumont-Port Arthur"
+#~ msgstr "Beaumont-Port Arthur"
 
-#: my-evolution/Locations.h:882
-msgid "Hachinohe Ab"
-msgstr "Hachinohe Ab"
+#~ msgid "Beauvais-Tille"
+#~ msgstr "Beauvais-Tille"
 
-#: my-evolution/Locations.h:883
-msgid "Hafr Al-Batin"
-msgstr "Hafr Al-Batin"
+#~ msgid "Beauvechain"
+#~ msgstr "Beauvechain"
 
-#: my-evolution/Locations.h:884
-msgid "Hagerstown"
-msgstr "Hagerstown"
+#~ msgid "Beckley"
+#~ msgstr "Beckley"
 
-#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:218
-msgid "Hail"
-msgstr "Granizo"
+#~ msgid "Bedford"
+#~ msgstr "Bedford"
 
-#: my-evolution/Locations.h:886
-msgid "Hailey-Sun Valley"
-msgstr "Hailey-Sun Valley"
+#~ msgid "Beijing"
+#~ msgstr "Beijing"
 
-#: my-evolution/Locations.h:887
-msgid "Haines"
-msgstr "Haines"
+#~ msgid "Beirut"
+#~ msgstr "Beirut"
 
-#: my-evolution/Locations.h:889
-msgid "Hakodate Airport"
-msgstr "Aeropuerto Hakodate"
+#~ msgid "Beja"
+#~ msgstr "Beja"
 
-#: my-evolution/Locations.h:890
-msgid "Halifax"
-msgstr "Halifax"
+#~ msgid "Belem"
+#~ msgstr "Belén"
 
-#: my-evolution/Locations.h:891
-msgid "Hamamatsu Ab"
-msgstr "Hamamatsu Ab"
+#~ msgid "Belfast/Aldergrove"
+#~ msgstr "Belfast/Aldergrove"
 
-#: my-evolution/Locations.h:892
-msgid "Hamburg"
-msgstr "Hamburg"
+#~ msgid "Belfast/Harbour"
+#~ msgstr "Belfast/Harbour"
 
-#: my-evolution/Locations.h:893
-msgid "Hamburg-Finkenwerder"
-msgstr "Hamburg-Finkenwerder"
+#~ msgid "Belgorod"
+#~ msgstr "Belgorod"
 
-#: my-evolution/Locations.h:894
-msgid "Hamilton"
-msgstr "Hamilton"
+#~ msgid "Belleville"
+#~ msgstr "Belleville"
 
-#: my-evolution/Locations.h:895
-msgid "Hammerfest"
-msgstr "Hammerfest"
+#~ msgid "Bellingham"
+#~ msgstr "Bellingham"
 
-#: my-evolution/Locations.h:896
-msgid "Hampton"
-msgstr "Hampton"
+#~ msgid "Belmar-Farmingdale"
+#~ msgstr "Belmar-Farmingdale"
 
-#: my-evolution/Locations.h:897
-msgid "Hanamaki Airport"
-msgstr "Aeropuerto Hanamaki"
+#~ msgid "Belo Horizonte"
+#~ msgstr "Belo Horizonte"
 
-#: my-evolution/Locations.h:898
-msgid "Hancock"
-msgstr "Hancock"
+#~ msgid "Belo Horizonte Apt"
+#~ msgstr "Belo Horizonte Apt"
 
-#: my-evolution/Locations.h:899
-msgid "Hangzhou"
-msgstr "Hangzhou"
+#~ msgid "Bemidji"
+#~ msgstr "Bemidji"
 
-#: my-evolution/Locations.h:900
-msgid "Hanksville"
-msgstr "Hanksville"
+#~ msgid "Benbecula"
+#~ msgstr "Benbecula"
 
-#: my-evolution/Locations.h:901
-msgid "Hannover"
-msgstr "Hannover"
+#~ msgid "Benina"
+#~ msgstr "Benina"
 
-#: my-evolution/Locations.h:902
-msgid "Ha Noi"
-msgstr "Hanoi"
+#~ msgid "Benton Harbor"
+#~ msgstr "Benton Harbor"
 
-#: my-evolution/Locations.h:903
-msgid "Harbor Beach"
-msgstr "Harbor Beach"
+#~ msgid "Bentonville"
+#~ msgstr "Bentonville"
 
-#: my-evolution/Locations.h:904
-msgid "Harlingen"
-msgstr "Harlingen"
+#~ msgid "Beograd"
+#~ msgstr "Beograd"
 
-#: my-evolution/Locations.h:905
-msgid "Harlowton"
-msgstr "Harlowton"
+#~ msgid "Bergamo"
+#~ msgstr "Bergamo"
 
-#: my-evolution/Locations.h:906
-msgid "Harrisburg"
-msgstr "Harrisburg"
+#~ msgid "Bergen"
+#~ msgstr "Bergen"
 
-#: my-evolution/Locations.h:907
-msgid "Harrison"
-msgstr "Harrison"
+#~ msgid "Bergstrom AFB"
+#~ msgstr "Bergstrom AFB"
 
-#: my-evolution/Locations.h:908
-msgid "Harstad/Narvik/Evenes"
-msgstr "Harstad/Narvik/Evenes"
+#~ msgid "Berlevag"
+#~ msgstr "Berlevag"
 
-#: my-evolution/Locations.h:909
-msgid "Hartford"
-msgstr "Hartford"
+#~ msgid "Berlin"
+#~ msgstr "Berlín"
 
-#: my-evolution/Locations.h:910
-msgid "Hassi-Messaoud"
-msgstr "Hassi-Messaoud"
+#~ msgid "Berlin-Tegel"
+#~ msgstr "Berlin-Tegel"
 
-#: my-evolution/Locations.h:911
-msgid "Hastings"
-msgstr "Hastings"
+#~ msgid "Berlin-Tempelhof"
+#~ msgstr "Berlin-Tempelhof"
 
-#: my-evolution/Locations.h:912
-msgid "Haugesund"
-msgstr "Haugesund"
+#~ msgid "Bern"
+#~ msgstr "Berna"
 
-#: my-evolution/Locations.h:913
-msgid "Havre"
-msgstr "Havre"
+#~ msgid "Bethel"
+#~ msgstr "Bethel"
 
-#: my-evolution/Locations.h:914
-msgid "Hawaii"
-msgstr "Hawaii"
+#~ msgid "Bethlehem Airport"
+#~ msgstr "Aeropuerto de Belén"
 
-#: my-evolution/Locations.h:915
-msgid "Hawthorne"
-msgstr "Hawthorne"
+#~ msgid "Bettles"
+#~ msgstr "Bettles"
 
-#: my-evolution/Locations.h:916
-msgid "Hayden"
-msgstr "Hayden"
+#~ msgid "Beverly"
+#~ msgstr "Beverly"
 
-#: my-evolution/Locations.h:917
-msgid "Hayes River"
-msgstr "Hayes River"
+#~ msgid "Biarritz-Bayonne"
+#~ msgstr "Biarritz-Bayonne"
 
-#: my-evolution/Locations.h:918
-msgid "Hays"
-msgstr "Hays"
+#~ msgid "Bicycle Lake"
+#~ msgstr "Lago Bicycle"
 
-#: my-evolution/Locations.h:919
-msgid "Hayward"
-msgstr "Hayward"
+#~ msgid "Biggin Hill"
+#~ msgstr "Biggin Hill"
 
-#: my-evolution/Locations.h:920
-msgid "Healy River"
-msgstr "Healy River"
+#~ msgid "Big Piney"
+#~ msgstr "Big Piney"
 
-#: my-evolution/Locations.h:921
-msgid "Helena"
-msgstr "Helena"
+#~ msgid "Big River Lake"
+#~ msgstr "Lago Big River"
 
-#: my-evolution/Locations.h:922
-msgid "Helsinki"
-msgstr "Helsinki"
+#~ msgid "Bilbao"
+#~ msgstr "Bilbao"
 
-#: my-evolution/Locations.h:923
-msgid "Henderson"
-msgstr "Henderson"
+#~ msgid "Billings"
+#~ msgstr "Billings"
 
-#: my-evolution/Locations.h:924
-msgid "Hengchun"
-msgstr "Hengchun"
+#~ msgid "Billund"
+#~ msgstr "Billund"
 
-#: my-evolution/Locations.h:925
-msgid "Hermosillo"
-msgstr "Hermosillo"
+#~ msgid "Binghamton"
+#~ msgstr "Binghamton"
 
-#: my-evolution/Locations.h:926
-msgid "Hibbing"
-msgstr "Hibbing"
+#~ msgid "Birmingham"
+#~ msgstr "Birmingham"
 
-#: my-evolution/Locations.h:927
-msgid "Hickory"
-msgstr "Hickory"
+#~ msgid "Bisha"
+#~ msgstr "Bisha"
 
-#: my-evolution/Locations.h:928
-msgid "Hill City"
-msgstr "Hill City"
+#~ msgid "Bishop"
+#~ msgstr "Bishop"
 
-#: my-evolution/Locations.h:929
-msgid "Hillsboro"
-msgstr "Hillsboro"
+#~ msgid "Bismark"
+#~ msgstr "Bismark"
 
-#: my-evolution/Locations.h:930
-msgid "Hilo"
-msgstr "Hilo"
+#~ msgid "Blagoveschensk"
+#~ msgstr "Blagoveschensk"
 
-#: my-evolution/Locations.h:931
-msgid "Hinesville"
-msgstr "Hinesville"
+#~ msgid "Blanding"
+#~ msgstr "Blanding"
 
-#: my-evolution/Locations.h:932
-msgid "Hiroshima Airport"
-msgstr "Aeropuerto de Hiroshima"
+#~ msgid "Block Island"
+#~ msgstr "Block Island"
 
-#: my-evolution/Locations.h:933
-msgid "Hobart"
-msgstr "Hobart"
+#~ msgid "Bloemfontein J. B. M. Hertzog "
+#~ msgstr "Bloemfontein J. B. M. Hertzog "
 
-#: my-evolution/Locations.h:934
-msgid "Hobbs"
-msgstr "Hobbs"
+#~ msgid "Bloomington"
+#~ msgstr "Bloomington"
 
-#: my-evolution/Locations.h:935
-msgid "Ho Chi Minh"
-msgstr "Ho Chi Minh"
+#~ msgid "Blue Canyon"
+#~ msgstr "Blue Canyon"
 
-#: my-evolution/Locations.h:936
-msgid "Hodeidah"
-msgstr "Hodeidah"
+#~ msgid "Bluefield"
+#~ msgstr "Bluefield"
 
-#: my-evolution/Locations.h:937
-msgid "Hof"
-msgstr "Hof"
+#~ msgid "Bluefields"
+#~ msgstr "Bluefields"
 
-#: my-evolution/Locations.h:938
-msgid "Hoffman"
-msgstr "Hoffman"
+#~ msgid "Blythe"
+#~ msgstr "Blythe"
 
-#: my-evolution/Locations.h:939
-msgid "Hofu Ab"
-msgstr "Hofu Ab"
+#~ msgid "Boa Vista"
+#~ msgstr "Boa Vista"
 
-#: my-evolution/Locations.h:940
-msgid "Hohenems"
-msgstr "Hohenems"
+#~ msgid "Bocas del Toro"
+#~ msgstr "Bocas del Toro"
 
-#: my-evolution/Locations.h:941
-msgid "Holguin"
-msgstr "Holguin"
+#~ msgid "Bodo"
+#~ msgstr "Bodo"
 
-#: my-evolution/Locations.h:942
-msgid "Homer"
-msgstr "Homer"
+#~ msgid "Bogota/Eldorado"
+#~ msgstr "Bogotá/Eldorado"
 
-#: my-evolution/Locations.h:943
-msgid "Homestead AFB"
-msgstr "Homestead AFB"
+#~ msgid "Boise"
+#~ msgstr "Boise"
 
-#: my-evolution/Locations.h:944
-msgid "Hondo"
-msgstr "Hondo"
+#~ msgid "Bolzano"
+#~ msgstr "Bolzano"
 
-#: my-evolution/Locations.h:947
-msgid "Honningsvag"
-msgstr "Honningsvag"
+#~ msgid "Bombay/Santacruz"
+#~ msgstr "Bombay/Santacruz"
 
-#: my-evolution/Locations.h:948
-msgid "Honolulu"
-msgstr "Honolulú"
+#~ msgid "Boone"
+#~ msgstr "Boone"
 
-#: my-evolution/Locations.h:949
-msgid "Hoonah"
-msgstr "Hoonah"
+#~ msgid "Bordeaux"
+#~ msgstr "Burdeos"
 
-#: my-evolution/Locations.h:950
-msgid "Hoquiam"
-msgstr "Hoquiam"
+#~ msgid "Borger"
+#~ msgstr "Borger"
 
-#: my-evolution/Locations.h:951
-msgid "Hot Springs"
-msgstr "Hot Springs"
+#~ msgid "Bornholm"
+#~ msgstr "Bornholm"
 
-#: my-evolution/Locations.h:952
-msgid "Houghton Lake"
-msgstr "Houghton Lake"
+#~ msgid "Boscombe Down"
+#~ msgstr "Boscombe Down"
 
-#: my-evolution/Locations.h:953
-msgid "Houlton"
-msgstr "Houlton"
+#~ msgid "Bosnia-Herzegovina"
+#~ msgstr "Bosnia y Herzegovina"
 
-#: my-evolution/Locations.h:954
-msgid "Houma"
-msgstr "Houma"
+#~ msgid "Boston"
+#~ msgstr "Boston"
 
-#: my-evolution/Locations.h:955
-msgid "Houston-Bush"
-msgstr "Houston-Bush"
+#~ msgid "Boulmer"
+#~ msgstr "Boulmer"
 
-#: my-evolution/Locations.h:956
-msgid "Houston-Clover"
-msgstr "Houston-Clover"
+#~ msgid "Bournemouth"
+#~ msgstr "Bournemouth"
 
-#: my-evolution/Locations.h:957
-msgid "Houston-Ellington Field"
-msgstr "Houston-Ellington Field"
+#~ msgid "Bowling Green"
+#~ msgstr "Bowling Green"
 
-#: my-evolution/Locations.h:958
-msgid "Houston-Hobby"
-msgstr "Houston-Hobby"
+#~ msgid "Bozeman"
+#~ msgstr "Bozeman"
 
-#: my-evolution/Locations.h:959
-msgid "Houston-Hooks"
-msgstr "Houston-Hooks"
+#~ msgid "Bradford"
+#~ msgstr "Bradford"
 
-#: my-evolution/Locations.h:960
-msgid "Howard AFB"
-msgstr "Howard AFB"
+#~ msgid "Bradshaw Field"
+#~ msgstr "Bradshaw Field"
 
-#: my-evolution/Locations.h:961
-msgid "Hsinchu"
-msgstr "Hsinchu"
+#~ msgid "Brainerd"
+#~ msgstr "Brainerd"
 
-#: my-evolution/Locations.h:962
-msgid "Huanuco"
-msgstr "Huanuco"
+#~ msgid "Brasilia"
+#~ msgstr "Brasilia"
 
-#: my-evolution/Locations.h:963
-msgid "Huehuetenango"
-msgstr "Huehuetenango"
+#~ msgid "Brasschaat"
+#~ msgstr "Brasschaat"
 
-#: my-evolution/Locations.h:964
-msgid "Hulien"
-msgstr "Hulien"
+#~ msgid "Bratislava"
+#~ msgstr "Bratislava"
 
-#: my-evolution/Locations.h:965
-msgid "Humberside"
-msgstr "Humberside"
+#~ msgid "Bratsk"
+#~ msgstr "Bratsk"
 
-#: my-evolution/Locations.h:967
-msgid "Huntington"
-msgstr "Huntington"
+#~ msgid "Braunschweig"
+#~ msgstr "Braunschweig"
 
-#: my-evolution/Locations.h:968
-msgid "Huntsville"
-msgstr "Huntsville"
+#~ msgid "Bremen"
+#~ msgstr "Bremen"
 
-#: my-evolution/Locations.h:969
-msgid "Hurlburt"
-msgstr "Hurlburt"
+#~ msgid "Bremerton"
+#~ msgstr "Bremerton"
 
-#: my-evolution/Locations.h:970
-msgid "Huron"
-msgstr "Huron"
+#~ msgid "Brest"
+#~ msgstr "Brest"
 
-#: my-evolution/Locations.h:971
-msgid "Hutchinson"
-msgstr "Hutchinson"
+#~ msgid "Bridgeport"
+#~ msgstr "Bridgeport"
 
-#: my-evolution/Locations.h:972
-msgid "Hyakuri Ab"
-msgstr "Hyakuri Ab"
+#~ msgid "Brindisi"
+#~ msgstr "Brindisi"
 
-#: my-evolution/Locations.h:973
-msgid "Hyannis"
-msgstr "Hyannis"
+#~ msgid "Brisbane"
+#~ msgstr "Brisbane"
 
-#: my-evolution/Locations.h:974
-msgid "Hyderabad"
-msgstr "Hyderabad"
+#~ msgid "Bristol"
+#~ msgstr "Bristol"
 
-#: my-evolution/Locations.h:975
-msgid "Hyeres-Le Palyvestre"
-msgstr "Hyeres-Le Palyvestre"
+#~ msgid "British Columbia"
+#~ msgstr "British Columbia"
 
-#: my-evolution/Locations.h:976
-msgid "Iasi"
-msgstr "Iasi"
+#~ msgid "Brno"
+#~ msgstr "Brno"
 
-#: my-evolution/Locations.h:977
-msgid "Ibiza"
-msgstr "Ibiza"
+#~ msgid "Broadus"
+#~ msgstr "Broadus"
 
-#: my-evolution/Locations.h:979
-msgid "Ichikawa"
-msgstr "Ichikawa"
+#~ msgid "Broken Bow"
+#~ msgstr "Broken Bow"
 
-#: my-evolution/Locations.h:980
-msgid "Idaho"
-msgstr "Idaho"
+#~ msgid "Bronnoysund"
+#~ msgstr "Bronnoysund"
 
-#: my-evolution/Locations.h:981
-msgid "Idaho Falls"
-msgstr "Idaho Falls"
+#~ msgid "Brookings"
+#~ msgstr "Brookings"
 
-#: my-evolution/Locations.h:982
-msgid "Iguazu"
-msgstr "Iguazú"
+#~ msgid "Brooksville"
+#~ msgstr "Brooksville"
 
-#: my-evolution/Locations.h:983
-msgid "Iki Airport"
-msgstr "Aeropuerto de Iki"
+#~ msgid "Broome"
+#~ msgstr "Broome"
 
-#: my-evolution/Locations.h:984
-msgid "Ilan"
-msgstr "Ilan"
+#~ msgid "Brownsville"
+#~ msgstr "Brownsville"
 
-#: my-evolution/Locations.h:985
-msgid "Iliamna"
-msgstr "Iliamna"
+#~ msgid "Brunswick"
+#~ msgstr "Brunswick"
 
-#: my-evolution/Locations.h:986
-msgid "Illinois"
-msgstr "Illinois"
+#~ msgid "Brussels-National Airport"
+#~ msgstr "Aeropuerto Nacional de Bruselas"
 
-#: my-evolution/Locations.h:987
-msgid "Imperial"
-msgstr "Imperial"
+#~ msgid "Bryansk"
+#~ msgstr "Bryansk"
 
-#: my-evolution/Locations.h:988
-msgid "Imperial (2)"
-msgstr "Imperial (2)"
+#~ msgid "Bryce Canyon"
+#~ msgstr "Bryce Canyon"
 
-#: my-evolution/Locations.h:989
-msgid "Imperial Beach"
-msgstr "Imperial Beach"
+#~ msgid "Bucaramanga/Palonegro"
+#~ msgstr "Bucaramanga/Palonegro"
 
-#: my-evolution/Locations.h:990
-msgid "In Amenas"
-msgstr "In Amenas"
+#~ msgid "Bucuresti"
+#~ msgstr "Bucarest"
 
-#: my-evolution/Locations.h:992
-msgid "Indiana"
-msgstr "Indiana"
+#~ msgid "Bucuresti-Otopeni"
+#~ msgstr "Bucarest-Otopeni"
 
-#: my-evolution/Locations.h:993
-msgid "Indianapolis"
-msgstr "Indianápolis"
+#~ msgid "Budapest"
+#~ msgstr "Budapest"
 
-#: my-evolution/Locations.h:994
-msgid "Indian Springs"
-msgstr "Indian Springs"
+#~ msgid "Buffalo"
+#~ msgstr "Búfalo"
 
-#: my-evolution/Locations.h:995
-msgid "Innsbruck"
-msgstr "Innsbruck"
+#~ msgid "Bullfrog"
+#~ msgstr "Bullfrog"
 
-#: my-evolution/Locations.h:996
-msgid "International Falls"
-msgstr "International Falls"
+#~ msgid "Burbank"
+#~ msgstr "Burbank"
 
-#: my-evolution/Locations.h:997
-msgid "Intracoastal"
-msgstr "Intracoastal"
+#~ msgid "Burgas"
+#~ msgstr "Burgas"
 
-#: my-evolution/Locations.h:998
-msgid "Inverness"
-msgstr "Inverness"
+#~ msgid "Burley"
+#~ msgstr "Burley"
 
-#: my-evolution/Locations.h:999
-msgid "Inyokern"
-msgstr "Inyokern"
+#~ msgid "Burlington"
+#~ msgstr "Burlington"
 
-#: my-evolution/Locations.h:1000
-msgid "Iowa"
-msgstr "Iowa"
+#~ msgid "Burnet"
+#~ msgstr "Burnet"
 
-#: my-evolution/Locations.h:1001
-msgid "Iowa City"
-msgstr "Iowa City"
+#~ msgid "Burns"
+#~ msgstr "Burns"
 
-#: my-evolution/Locations.h:1002
-msgid "Iqaluit"
-msgstr "Iqaluit"
+#~ msgid "Bursa"
+#~ msgstr "Bursa"
 
-#: my-evolution/Locations.h:1003
-msgid "Iquique/Diego Arac"
-msgstr "Iquique/Diego Arac"
+#~ msgid "Burwell"
+#~ msgstr "Burwell"
 
-#: my-evolution/Locations.h:1004
-msgid "Iquitos"
-msgstr "Iquitos"
+#~ msgid "Butte"
+#~ msgstr "Butte"
 
-#: my-evolution/Locations.h:1005
-msgid "Iraklion"
-msgstr "Iraklion"
+#~ msgid "Caen-Carpiquet"
+#~ msgstr "Caen-Carpiquet"
 
-#: my-evolution/Locations.h:1006
-msgid "Iran, Islamic Republic of"
-msgstr "Irán, República Islámica de"
+#~ msgid "Cagliari"
+#~ msgstr "Cagliari"
 
-#: my-evolution/Locations.h:1008
-msgid "Iron Mountain"
-msgstr "Iron Mountain"
+#~ msgid "Cairns"
+#~ msgstr "Cairns"
 
-#: my-evolution/Locations.h:1009
-msgid "Ironwood"
-msgstr "Ironwood"
+#~ msgid "Cairo"
+#~ msgstr "El Cairo"
 
-#: my-evolution/Locations.h:1010
-msgid "Iruma Ab"
-msgstr "Iruma Ab"
+#~ msgid "Calabozo"
+#~ msgstr "Calabozo"
 
-#: my-evolution/Locations.h:1011
-msgid "Islamabad"
-msgstr "Islamabad"
+#~ msgid "Calcutta/Dum Dum"
+#~ msgstr "Calcuta/Dum Dum"
 
-#: my-evolution/Locations.h:1012
-msgid "Isle of Man"
-msgstr "Isle of Man"
+#~ msgid "Caldwell"
+#~ msgstr "Caldwell"
 
-#: my-evolution/Locations.h:1013
-msgid "Islip"
-msgstr "Islip"
+#~ msgid "Calgary"
+#~ msgstr "Calgary"
 
-#: my-evolution/Locations.h:1014
-msgid "Istanbul"
-msgstr "Estambul"
+#~ msgid "Cali/Alfonso Bonillaaragon"
+#~ msgstr "Cali/Alfonso Bonillaaragon"
 
-#: my-evolution/Locations.h:1015
-msgid "Itaituba"
-msgstr "Itaituba"
+#~ msgid "Caliente"
+#~ msgstr "Caliente"
 
-#: my-evolution/Locations.h:1017
-msgid "Ithaca"
-msgstr "Ithaca"
+#~ msgid "California"
+#~ msgstr "California"
 
-#: my-evolution/Locations.h:1018
-msgid "Ivano-Frankivsk"
-msgstr "Ivano-Frankivsk"
+#~ msgid "Calvi-Ste-Catherine"
+#~ msgstr "Calvi-Ste-Catherine"
 
-#: my-evolution/Locations.h:1019
-msgid "Iwakuni MCAS"
-msgstr "Iwakuni MCAS"
+#~ msgid "Camaguey"
+#~ msgstr "Camaguey"
 
-#: my-evolution/Locations.h:1020
-msgid "Iwojima"
-msgstr "Iwojima"
+#~ msgid "Camarillo"
+#~ msgstr "Camarillo"
 
-#: my-evolution/Locations.h:1021
-msgid "Ixtapa"
-msgstr "Ixtapa"
+#~ msgid "Cambridge"
+#~ msgstr "Cambridge"
 
-#: my-evolution/Locations.h:1022
-msgid "Izmir/Adnan Menderes"
-msgstr "Izmir/Adnan Menderes"
+#~ msgid "Cameron"
+#~ msgstr "Cameron"
 
-#: my-evolution/Locations.h:1023
-msgid "Izmir/Cigli"
-msgstr "Izmir/Cigli"
+#~ msgid "Camiri"
+#~ msgstr "Camiri"
 
-#: my-evolution/Locations.h:1024
-msgid "Izmit"
-msgstr "Izmit"
+#~ msgid "Campeche"
+#~ msgstr "Campeche"
 
-#: my-evolution/Locations.h:1025
-msgid "Izumo Airport"
-msgstr "Aeropuesto Izumo"
+#~ msgid "Campinas"
+#~ msgstr "Campinas"
 
-#: my-evolution/Locations.h:1026
-msgid "Jackson"
-msgstr "Jackson"
+#~ msgid "Campo"
+#~ msgstr "Campo"
 
-#: my-evolution/Locations.h:1027
-msgid "Jacksonville"
-msgstr "Jacksonville"
+#~ msgid "Campo Grande"
+#~ msgstr "Campo Grande"
 
-#: my-evolution/Locations.h:1028
-msgid "Jacksonville-Craig Airport"
-msgstr "Jacksonville-Craig Airport"
+#~ msgid "Camp Stanley/H-207"
+#~ msgstr "Camp Stanley/H-207"
 
-#: my-evolution/Locations.h:1029
-msgid "Jacksonville NAS"
-msgstr "Jacksonville NAS"
+#~ msgid "Canaan"
+#~ msgstr "Canaan"
 
-#: my-evolution/Locations.h:1030
-msgid "Jaffrey"
-msgstr "Jaffrey"
+#~ msgid "Canarias/Fuerteventura"
+#~ msgstr "Canarias/Fuerteventura"
 
-#: my-evolution/Locations.h:1032
-msgid "Jamestown"
-msgstr "Jamestown"
+#~ msgid "Canarias/Gran Canaria"
+#~ msgstr "Canarias/Gran Canária"
 
-#: my-evolution/Locations.h:1033
-msgid "Janesville"
-msgstr "Janesville"
+#~ msgid "Canarias/Hierro"
+#~ msgstr "Canarias/Hierro"
 
-#: my-evolution/Locations.h:1034
-msgid "Jan Smuts"
-msgstr "Jan Smuts"
+#~ msgid "Canarias/Lanzarote"
+#~ msgstr "Canarias/Lanzarote"
 
-#: my-evolution/Locations.h:1036
-msgid "Jeddah King Abdul Aziz International Airport"
-msgstr "Jeddah King Abdul Aziz International Airport"
+#~ msgid "Canarias/La Palma"
+#~ msgstr "Canarias/La Palma"
 
-#: my-evolution/Locations.h:1037
-msgid "Jefferson City"
-msgstr "Jefferson City"
+#~ msgid "Canarias/Tenerife Norte"
+#~ msgstr "Canarias/Tenerife Norte"
 
-#: my-evolution/Locations.h:1038
-msgid "Jerez"
-msgstr "Jerez"
+#~ msgid "Canarias/Tenerife Sur"
+#~ msgstr "Canarias/Tenerife Sur"
 
-#: my-evolution/Locations.h:1039
-msgid "Jersey"
-msgstr "Jersey"
+#~ msgid "Canberra"
+#~ msgstr "Canberra"
 
-#: my-evolution/Locations.h:1040
-msgid "Jinotega"
-msgstr "Jinotega"
+#~ msgid "Cancun"
+#~ msgstr "Cancún"
 
-#: my-evolution/Locations.h:1041
-msgid "Johan A. Pengel"
-msgstr "Johan A. Pengel"
+#~ msgid "Cannes-Mandelieu"
+#~ msgstr "Cannes-Mandelieu"
 
-#: my-evolution/Locations.h:1042
-msgid "Johnstown"
-msgstr "Johnstown"
+#~ msgid "Cantwell"
+#~ msgstr "Cantwell"
 
-#: my-evolution/Locations.h:1043
-msgid "Jonesboro"
-msgstr "Jonesboro"
+#~ msgid "Cape Girardeau"
+#~ msgstr "Cabo Girardeau"
 
-#: my-evolution/Locations.h:1044
-msgid "Jonkoping"
-msgstr "Jonkoping"
+#~ msgid "Cape Hatteras"
+#~ msgstr "Cabo Hatteras"
 
-#: my-evolution/Locations.h:1045
-msgid "Joplin"
-msgstr "Joplin"
+#~ msgid "Cape Lisburne"
+#~ msgstr "Cabo Lisburne"
 
-#: my-evolution/Locations.h:1047
-msgid "Juanjui"
-msgstr "Juanjui"
+#~ msgid "Cape Newenham"
+#~ msgstr "Cabo Newenham"
 
-#: my-evolution/Locations.h:1048
-msgid "Juan Santamaria"
-msgstr "Juan Santamaría"
+#~ msgid "Cape Romanzoff"
+#~ msgstr "Cabo Romanzoff"
 
-#: my-evolution/Locations.h:1049
-msgid "Juigalpa"
-msgstr "Juigalpa"
+#~ msgid "Cape Town D. F. Malan "
+#~ msgstr "Cabo Town D. F. Malan "
 
-#: my-evolution/Locations.h:1050
-msgid "Jujuy"
-msgstr "Jujuy"
+#~ msgid "Capitan Corbeta"
+#~ msgstr "Capitan Corbeta"
 
-#: my-evolution/Locations.h:1051
-msgid "Juliaca"
-msgstr "Juliaca"
+#~ msgid "Capo Mele"
+#~ msgstr "Capo Mele"
 
-#: my-evolution/Locations.h:1052
-msgid "Junction"
-msgstr "Junction"
+#~ msgid "Caracas La Carlota"
+#~ msgstr "Caracas La Carlota"
 
-#: my-evolution/Locations.h:1053
-msgid "Juneau"
-msgstr "Juneau"
+#~ msgid "Caracas Maiquetia"
+#~ msgstr "Caracas Maiquetia"
 
-#: my-evolution/Locations.h:1054
-msgid "Kadena Ab"
-msgstr "Kadena Ab"
+#~ msgid "Caravelas"
+#~ msgstr "Caravelas"
 
-#: my-evolution/Locations.h:1055
-msgid "Kagoshima Airport"
-msgstr "Kagoshima Airport"
+#~ msgid "Carbondale"
+#~ msgstr "Carbondale"
 
-#: my-evolution/Locations.h:1056
-msgid "Kahului"
-msgstr "Kahului"
+#~ msgid "Cardiff"
+#~ msgstr "Cardiff"
 
-#: my-evolution/Locations.h:1057
-msgid "Kailua-Kona"
-msgstr "Kailua-Kona"
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
 
-#: my-evolution/Locations.h:1058
-msgid "Kake"
-msgstr "Kake"
+#~ msgid "Carlisle"
+#~ msgstr "Carlisle"
 
-#: my-evolution/Locations.h:1059
-msgid "Kalamata"
-msgstr "Kalamata"
+#~ msgid "Carlsbad"
+#~ msgstr "Carlsbad"
 
-#: my-evolution/Locations.h:1060
-msgid "Kalamazoo"
-msgstr "Kalamazoo"
+#~ msgid "Carroll"
+#~ msgstr "Carroll"
 
-#: my-evolution/Locations.h:1061
-msgid "Kalispell"
-msgstr "Kalispell"
+#~ msgid "Cartagena/Rafael Nunez"
+#~ msgstr "Cartagena/Rafael Núñez"
 
-#: my-evolution/Locations.h:1062
-msgid "Kamigoto"
-msgstr "Kamigoto"
+#~ msgid "Casa Granda"
+#~ msgstr "Casa Grande"
 
-#: my-evolution/Locations.h:1063
-msgid "Kaneohe"
-msgstr "Kaneohe"
+#~ msgid "Cascade"
+#~ msgstr "Cascade"
 
-#: my-evolution/Locations.h:1064
-msgid "Kangshan"
-msgstr "Kangshan"
+#~ msgid "Casper"
+#~ msgstr "Casper"
 
-#: my-evolution/Locations.h:1065
-msgid "Kanoya Ab"
-msgstr "Kanoya Ab"
+#~ msgid "Catacamas"
+#~ msgstr "Catacamas"
 
-#: my-evolution/Locations.h:1066
-msgid "Kansai International Airport"
-msgstr "Kansai International Airport"
+#~ msgid "Catania"
+#~ msgstr "Catania"
 
-#: my-evolution/Locations.h:1067
-msgid "Kansas"
-msgstr "Kansas"
+#~ msgid "Cayo Largo del Sur"
+#~ msgstr "Cayo Largo del Sur"
 
-#: my-evolution/Locations.h:1068
-msgid "Kansas City"
-msgstr "Kansas City"
+#~ msgid "Cazaux"
+#~ msgstr "Cazaux"
 
-#: my-evolution/Locations.h:1069
-msgid "Kansas City-Gladstone"
-msgstr "Kansas City-Gladstone"
+#~ msgid "Cecil NAS"
+#~ msgstr "Cecil NAS"
 
-#: my-evolution/Locations.h:1070
-msgid "Kaohsiung"
-msgstr "Kaohsiung"
+#~ msgid "Cedar City"
+#~ msgstr "Cedar City"
 
-#: my-evolution/Locations.h:1071
-msgid "Karachi"
-msgstr "Karachi"
+#~ msgid "Cedar Rapids"
+#~ msgstr "Cedar Rapids"
 
-#: my-evolution/Locations.h:1072
-msgid "Karup"
-msgstr "Karup"
+#~ msgid "Central and South America"
+#~ msgstr "América central y sur"
 
-#: my-evolution/Locations.h:1073
-msgid "Kassel-Calden"
-msgstr "Kassel-Calden"
+#~ msgid "Cervia"
+#~ msgstr "Cervia"
 
-#: my-evolution/Locations.h:1074
-msgid "Kasumigaura Ab"
-msgstr "Kasumigaura Ab"
+#~ msgid "Chacarita"
+#~ msgstr "Chacarita"
 
-#: my-evolution/Locations.h:1075
-msgid "Kasuminome Ab"
-msgstr "Kasuminome Ab"
+#~ msgid "Chadron"
+#~ msgstr "Chadron"
 
-#: my-evolution/Locations.h:1076
-msgid "Katowice"
-msgstr "Katowice"
+#~ msgid "Challis"
+#~ msgstr "Challis"
 
-#: my-evolution/Locations.h:1077
-msgid "Kavala"
-msgstr "Kavala"
+#~ msgid "Chamberlain"
+#~ msgstr "Chamberlain"
 
-#: my-evolution/Locations.h:1078
-msgid "Kayseri"
-msgstr "Kayseri"
+#~ msgid "Chambery"
+#~ msgstr "Chambery"
 
-#: my-evolution/Locations.h:1079
-msgid "Kazan"
-msgstr "Kazan"
+#~ msgid "Champaign"
+#~ msgstr "Champaign"
 
-#: my-evolution/Locations.h:1080
-msgid "Kearney"
-msgstr "Kearney"
+#~ msgid "Chandalar Lake"
+#~ msgstr "Lago Chandalar"
 
-#: my-evolution/Locations.h:1081
-msgid "Keene"
-msgstr "Keene"
+#~ msgid "Chandler"
+#~ msgstr "Chandler"
 
-#: my-evolution/Locations.h:1082
-msgid "Kefallinia"
-msgstr "Kefallinia"
+#~ msgid "Chania"
+#~ msgstr "Chania"
 
-#: my-evolution/Locations.h:1083
-msgid "Keflavik"
-msgstr "Keflavik"
+#~ msgid "Chanute"
+#~ msgstr "Chanute"
 
-#: my-evolution/Locations.h:1084
-msgid "Kenai"
-msgstr "Kenai"
+#~ msgid "Chariton"
+#~ msgstr "Chariton"
 
-#: my-evolution/Locations.h:1085
-msgid "Kenosha"
-msgstr "Kenosha"
+#~ msgid "Charleroi-Brussels South"
+#~ msgstr "Charleroi-Brussels Sur"
 
-#: my-evolution/Locations.h:1086
-msgid "Kentucky"
-msgstr "Kentucky"
+#~ msgid "Charles City"
+#~ msgstr "Charles City"
 
-#: my-evolution/Locations.h:1087
-msgid "Keokuk"
-msgstr "Keokuk"
+#~ msgid "Charleston"
+#~ msgstr "Charleston"
 
-#: my-evolution/Locations.h:1088
-msgid "Kerkira"
-msgstr "Kerkira"
+#~ msgid "Charlotte"
+#~ msgstr "Charlotte"
 
-#: my-evolution/Locations.h:1089
-msgid "Kerman"
-msgstr "Kerman"
+#~ msgid "Charlottesville"
+#~ msgstr "Charlottesville"
 
-#: my-evolution/Locations.h:1090
-msgid "Ketchikan"
-msgstr "Ketchikan"
+#~ msgid "Chatham"
+#~ msgstr "Chatham"
 
-#: my-evolution/Locations.h:1091
-msgid "Key West"
-msgstr "Key West"
+#~ msgid "Chattanooga"
+#~ msgstr "Chattanooga"
 
-#: my-evolution/Locations.h:1092
-msgid "Key West NAS"
-msgstr "Key West NAS"
+#~ msgid "Cheboksary"
+#~ msgstr "Cheboksary"
 
-#: my-evolution/Locations.h:1093
-msgid "Khabarovsk"
-msgstr "Khabarovsk"
+#~ msgid "Cheju"
+#~ msgstr "Cheju"
 
-#: my-evolution/Locations.h:1094
-msgid "Khamis Mushait"
-msgstr "Khamis Mushait"
+#~ msgid "Chelyabinsk"
+#~ msgstr "Chelyabinsk"
 
-#: my-evolution/Locations.h:1095
-msgid "Kharkiv"
-msgstr "Kharkiv"
+#~ msgid "Chengdu"
+#~ msgstr "Chengdu"
 
-#: my-evolution/Locations.h:1096
-msgid "Kikai Island"
-msgstr "Isla Kikai"
+#~ msgid "Cherbourg"
+#~ msgstr "Cherbourg"
 
-#: my-evolution/Locations.h:1097
-msgid "Killeen"
-msgstr "Killeen"
+#~ msgid "Cherry Point"
+#~ msgstr "Cherry Point"
 
-#: my-evolution/Locations.h:1098
-msgid "Killeen-Ft Hood"
-msgstr "Killeen-Ft Hood"
+#~ msgid "Chetumal"
+#~ msgstr "Chetumal"
 
-#: my-evolution/Locations.h:1099
-msgid "Killeen-Gray AAF"
-msgstr "Killeen-Gray AAF"
+#~ msgid "Cheyenne"
+#~ msgstr "Cheyenne"
 
-#: my-evolution/Locations.h:1100
-msgid "King Khaled International Airport"
-msgstr "King Khaled International Airport"
+#~ msgid "Chiang Kai Shek"
+#~ msgstr "Chiang Kai Shek"
 
-#: my-evolution/Locations.h:1101
-msgid "Kingman"
-msgstr "Kingman"
+#~ msgid "Chia Tung"
+#~ msgstr "Chia Tung"
 
-#: my-evolution/Locations.h:1102
-msgid "King Salmon"
-msgstr "King Salmon"
+#~ msgid "Chiayi"
+#~ msgstr "Chiayi"
 
-#: my-evolution/Locations.h:1103
-msgid "Kingston"
-msgstr "Kingston"
+#~ msgid "Chicago-DuPage"
+#~ msgstr "Chicago-DuPage"
 
-#: my-evolution/Locations.h:1104
-msgid "Kingsville"
-msgstr "Kingsville"
+#~ msgid "Chicago-Lakefront"
+#~ msgstr "Chicago-Lakefront"
 
-#: my-evolution/Locations.h:1105
-msgid "Kinloss"
-msgstr "Kinloss"
+#~ msgid "Chicago-Midway"
+#~ msgstr "Chicago-Midway"
 
-#: my-evolution/Locations.h:1106
-msgid "Kinston"
-msgstr "Kinston"
+#~ msgid "Chicago-O'Hare"
+#~ msgstr "Chicago-O'Hare"
 
-#: my-evolution/Locations.h:1107
-msgid "Kirkenes"
-msgstr "Kirkenes"
+#~ msgid "Chichijima"
+#~ msgstr "Chichijima"
 
-#: my-evolution/Locations.h:1108
-msgid "Kirksville"
-msgstr "Kirksville"
+#~ msgid "Chiclayo"
+#~ msgstr "Chiclayo"
 
-#: my-evolution/Locations.h:1109
-msgid "Kiruna"
-msgstr "Kiruna"
+#~ msgid "Chico"
+#~ msgstr "Chico"
 
-#: my-evolution/Locations.h:1110
-msgid "Kisarazu Ab"
-msgstr "Kisarazu Ab"
+#~ msgid "Chicopee Falls"
+#~ msgstr "Chicopee Falls"
 
-#: my-evolution/Locations.h:1111
-msgid "Kishineu"
-msgstr "Kishineu"
+#~ msgid "Chievres"
+#~ msgstr "Chievres"
 
-#: my-evolution/Locations.h:1112
-msgid "Kitakyushu Airport"
-msgstr "Kitakyushu Airport"
+#~ msgid "Chihhang"
+#~ msgstr "Chihhang"
 
-#: my-evolution/Locations.h:1113
-msgid "Klagenfurt"
-msgstr "Klagenfurt"
+#~ msgid "Chihuahua"
+#~ msgstr "Chihuahua"
 
-#: my-evolution/Locations.h:1114
-msgid "Klamath Falls"
-msgstr "Klamath Falls"
+#~ msgid "Childress"
+#~ msgstr "Childress"
 
-#: my-evolution/Locations.h:1115
-msgid "Klawock"
-msgstr "Klawock"
+#~ msgid "China Lake"
+#~ msgstr "Lago China"
 
-#: my-evolution/Locations.h:1116
-msgid "Kleine Brogel"
-msgstr "Kleine Brogel"
+#~ msgid "Chinandega"
+#~ msgstr "Chinandega"
 
-#: my-evolution/Locations.h:1117
-msgid "Kliningrad"
-msgstr "Kliningrad"
+#~ msgid "Chinmem/Shatou"
+#~ msgstr "Chinmem/Shatou"
 
-#: my-evolution/Locations.h:1118
-msgid "Knoxville"
-msgstr "Knoxville"
+#~ msgid "Chino"
+#~ msgstr "Chino"
 
-#: my-evolution/Locations.h:1119
-msgid "Knoxville-Downtown"
-msgstr "Knoxville-Downtown"
+#~ msgid "Chippewa County"
+#~ msgstr "Chippewa County"
 
-#: my-evolution/Locations.h:1120
-msgid "Kobenhavn/Kastrup"
-msgstr "Kobenhavn/Kastrup"
+#~ msgid "Chita"
+#~ msgstr "Chita"
 
-#: my-evolution/Locations.h:1121
-msgid "Kobenhavn/Roskilde"
-msgstr "Kobenhavn/Roskilde"
+#~ msgid "Chitose Ab"
+#~ msgstr "Chitose Ab"
 
-#: my-evolution/Locations.h:1122
-msgid "Kochi Airport"
-msgstr "Kochi Airport"
+#~ msgid "Chitose ASDF"
+#~ msgstr "Chitose ASDF"
 
-#: my-evolution/Locations.h:1123
-msgid "Kodiak"
-msgstr "Kodiak"
+#~ msgid "Chofu Airport"
+#~ msgstr "Aeropuerto de Chofu"
 
-#: my-evolution/Locations.h:1124
-msgid "Kogalniceanu"
-msgstr "Kogalniceanu"
+#~ msgid "Choluteca"
+#~ msgstr "Choluteca"
 
-#: my-evolution/Locations.h:1125
-msgid "Kogalym"
-msgstr "Kogalym"
+#~ msgid "Chongju Ab"
+#~ msgstr "Chongju Ab"
 
-#: my-evolution/Locations.h:1126
-msgid "Koksijde"
-msgstr "Koksijde"
+#~ msgid "Christchurch"
+#~ msgstr "Christchurch"
 
-#: my-evolution/Locations.h:1127
-msgid "Kolding/Vandrup"
-msgstr "Kolding/Vandrup"
+#~ msgid "Chulitna"
+#~ msgstr "Chulitna"
 
-#: my-evolution/Locations.h:1128
-msgid "Koln/Bonn"
-msgstr "Koln/Bonn"
+#~ msgid "Churchill"
+#~ msgstr "Churchill"
 
-#: my-evolution/Locations.h:1129
-msgid "Komatsu Ab"
-msgstr "Komatsu Ab"
+#~ msgid "Churchill Falls"
+#~ msgstr "Churchill Falls"
 
-#: my-evolution/Locations.h:1130
-msgid "Komatsujima Ab"
-msgstr "Komatsujima Ab"
+#~ msgid "Cincinnati"
+#~ msgstr "Cincinnati"
 
-#: my-evolution/Locations.h:1131
-msgid "Konya"
-msgstr "Konya"
+#~ msgid "Circle City"
+#~ msgstr "Circle City"
 
-#: my-evolution/Locations.h:1132
-msgid "Korea, Democratic People's Republic of"
-msgstr "Corea, República Democrática Popular de"
+#~ msgid "Ciudad Bolivar"
+#~ msgstr "Ciudad Bolívar"
 
-#: my-evolution/Locations.h:1133
-msgid "Korea, Republic of"
-msgstr "República Coreana"
+#~ msgid "Ciudad del Carmen"
+#~ msgstr "Ciudad del Carmen"
 
-#: my-evolution/Locations.h:1134
-msgid "Kos"
-msgstr "Kos"
+#~ msgid "Ciudad Juarez"
+#~ msgstr "Ciudad Juárez"
 
-#: my-evolution/Locations.h:1135
-msgid "Kotzebue"
-msgstr "Kotzebue"
+#~ msgid "Ciudad Obregon"
+#~ msgstr "Ciudad Obregón"
 
-#: my-evolution/Locations.h:1136
-msgid "Kozani"
-msgstr "Kozani"
+#~ msgid "Ciudad Victoria"
+#~ msgstr "Ciudad Victoria"
 
-#: my-evolution/Locations.h:1137
-msgid "Krakow"
-msgstr "Krakow"
+#~ msgid "Clarinda"
+#~ msgstr "Clarinda"
 
-#: my-evolution/Locations.h:1138
-msgid "Krasnodar"
-msgstr "Krasnodar"
+#~ msgid "Clarion"
+#~ msgstr "Clarion"
 
-#: my-evolution/Locations.h:1139
-msgid "Krasnoyarsk"
-msgstr "Krasnoyarsk"
+#~ msgid "Clarksburg"
+#~ msgstr "Clarksburg"
 
-#: my-evolution/Locations.h:1140
-msgid "Kristiansand/Kjevik"
-msgstr "Kristiansand/Kjevik"
+#~ msgid "Clayton"
+#~ msgstr "Clayton"
 
-#: my-evolution/Locations.h:1141
-msgid "Kristiansund/Kvernberget"
-msgstr "Kristiansund/Kvernberget"
+#~ msgid "Clayton Lake"
+#~ msgstr "Lago Clayton"
 
-#: my-evolution/Locations.h:1142
-msgid "Kryviy Rig/Lozovatka"
-msgstr "Kryviy Rig/Lozovatka"
+#~ msgid "Clermont-Ferrand"
+#~ msgstr "Clermont-Ferrand"
 
-#: my-evolution/Locations.h:1143
-msgid "Kumamoto Airport"
-msgstr "Kumamoto Airport"
+#~ msgid "Cleveland"
+#~ msgstr "Cleveland"
 
-#: my-evolution/Locations.h:1144
-msgid "Kunming"
-msgstr "Kunming"
+#~ msgid "Cleveland/Cuyahoga"
+#~ msgstr "Cleveland/Cuyahoga"
 
-#: my-evolution/Locations.h:1145
-msgid "Kushiro Airport"
-msgstr "Kushiro Airport"
+#~ msgid "Cleveland-Lakefront"
+#~ msgstr "Cleveland-Lakefront"
 
-#: my-evolution/Locations.h:1147
-msgid "Kyiv/Boryspil"
-msgstr "Kyiv/Boryspil"
+#~ msgid "Clinton"
+#~ msgstr "Clinton"
 
-#: my-evolution/Locations.h:1148
-msgid "Kyiv/Zhulyany"
-msgstr "Kyiv/Zhulyany"
+#~ msgid "Clovis-Cannon AFB"
+#~ msgstr "Clovis-Cannon AFB"
 
-#: my-evolution/Locations.h:1149
-msgid "La Ceiba"
-msgstr "La Ceiba"
+#~ msgid "Cobija"
+#~ msgstr "Cobija"
 
-#: my-evolution/Locations.h:1150
-msgid "Laconia"
-msgstr "Laconia"
+#~ msgid "Cochabamba"
+#~ msgstr "Cochabamba"
 
-#: my-evolution/Locations.h:1151
-msgid "La Coruna"
-msgstr "La Coruña"
+#~ msgid "Cocoa Beach"
+#~ msgstr "Playa Cocoa"
 
-#: my-evolution/Locations.h:1152
-msgid "La Crosse"
-msgstr "La Cruz"
+#~ msgid "Cocos Island"
+#~ msgstr "Islas Cocos"
 
-#: my-evolution/Locations.h:1153
-msgid "La Esperanza"
-msgstr "La Esperanza"
+#~ msgid "Cody"
+#~ msgstr "Cody"
 
-#: my-evolution/Locations.h:1154
-msgid "Lafayette"
-msgstr "Lafayette"
+#~ msgid "Coeur d'Alene"
+#~ msgstr "Coeur d'Alene"
 
-#: my-evolution/Locations.h:1155
-msgid "La Grande"
-msgstr "La Grande"
+#~ msgid "Cold Bay"
+#~ msgstr "Baiha Cold"
 
-#: my-evolution/Locations.h:1156
-msgid "Lahaina"
-msgstr "Lahaina"
+#~ msgid "Colima"
+#~ msgstr "Colima"
 
-#: my-evolution/Locations.h:1157
-msgid "Lahore"
-msgstr "Lahore"
+#~ msgid "College Station"
+#~ msgstr "College Station"
 
-#: my-evolution/Locations.h:1158
-msgid "Lajes"
-msgstr "Lajes"
+#~ msgid "Colmar-Meyenheim"
+#~ msgstr "Colmar-Meyenheim"
 
-#: my-evolution/Locations.h:1159
-msgid "La Junta"
-msgstr "La Junta"
+#~ msgid "Colonia"
+#~ msgstr "Colonia"
 
-#: my-evolution/Locations.h:1160
-msgid "Lake Charles"
-msgstr "Lago Charles"
+#~ msgid "Colorado"
+#~ msgstr "Colorado"
 
-#: my-evolution/Locations.h:1161
-msgid "Lake Hood"
-msgstr "Lago Hood"
+#~ msgid "Colorado Springs"
+#~ msgstr "Colorado Springs"
 
-#: my-evolution/Locations.h:1162
-msgid "Lakehurst"
-msgstr "Lakehurst"
+#~ msgid "Columbia"
+#~ msgstr "Colombia"
 
-#: my-evolution/Locations.h:1163
-msgid "Lakeland"
-msgstr "Lakeland"
+#~ msgid "Columbia-McEntire"
+#~ msgstr "Columbia-McEntire"
 
-#: my-evolution/Locations.h:1164
-msgid "Lake Tahoe"
-msgstr "Lago Tahoe"
+#~ msgid "Columbus"
+#~ msgstr "Columbus"
 
-#: my-evolution/Locations.h:1165
-msgid "Lakeview"
-msgstr "Lakeview"
+#~ msgid "Columbus-Fort Benning"
+#~ msgstr "Columbus-Fort Benning"
 
-#: my-evolution/Locations.h:1166
-msgid "Lamar"
-msgstr "Lamar"
+#~ msgid "Columbus-Gahanna"
+#~ msgstr "Columbus-Gahanna"
 
-#: my-evolution/Locations.h:1167
-msgid "La Mesa"
-msgstr "La Mesa"
+#~ msgid "Columbus-OSU"
+#~ msgstr "Columbus-OSU"
 
-#: my-evolution/Locations.h:1168
-msgid "Lamezia"
-msgstr "Lamezia"
+#~ msgid "Columbus-W Point-Starkville"
+#~ msgstr "Columbus-W Point-Starkville"
 
-#: my-evolution/Locations.h:1169
-msgid "Lamoni"
-msgstr "Lamoni"
+#~ msgid "Colville"
+#~ msgstr "Colville"
 
-#: my-evolution/Locations.h:1170
-msgid "Lampedusa"
-msgstr "Lampedusa"
+#~ msgid "Comodoro Rivadavia"
+#~ msgstr "Comodoro Rivadavia"
 
-#: my-evolution/Locations.h:1171
-msgid "Lanai"
-msgstr "Lanai"
+#~ msgid "Comox"
+#~ msgstr "Comox"
 
-#: my-evolution/Locations.h:1172
-msgid "Lancaster"
-msgstr "Lancaster"
+#~ msgid "Conceicao Do Araguaia"
+#~ msgstr "Conceicao Do Araguaia"
 
-#: my-evolution/Locations.h:1173
-msgid "Lander"
-msgstr "Lander"
+#~ msgid "Concepcion"
+#~ msgstr "Concepción"
 
-#: my-evolution/Locations.h:1174
-msgid "Langebaanweg"
-msgstr "Langebaanweg"
+#~ msgid "Concord"
+#~ msgstr "Concord"
 
-#: my-evolution/Locations.h:1175
-msgid "Langley AFB"
-msgstr "Langley AFB"
+#~ msgid "Concordia"
+#~ msgstr "Concordia"
 
-#: my-evolution/Locations.h:1176
-msgid "Lannion"
-msgstr "Lannion"
+#~ msgid "Connaught"
+#~ msgstr "Connaught"
 
-#: my-evolution/Locations.h:1177
-msgid "Lansing"
-msgstr "Lansing"
+#~ msgid "Connecticut"
+#~ msgstr "Conectica"
 
-#: my-evolution/Locations.h:1178
-msgid "Lanzhou"
-msgstr "Lanzhou"
+#~ msgid "Conroe"
+#~ msgstr "Conroe"
 
-#: my-evolution/Locations.h:1179
-msgid "La Paz"
-msgstr "La Paz"
+#~ msgid "Constantine"
+#~ msgstr "Constantine"
 
-#: my-evolution/Locations.h:1180
-msgid "La Paz/Alto"
-msgstr "La Paz/Alto"
+#~ msgid "Copper Harbor"
+#~ msgstr "Copper Harbor"
 
-#: my-evolution/Locations.h:1181
-msgid "Laramie"
-msgstr "Laramie"
+#~ msgid "Cordoba"
+#~ msgstr "Córdoba"
 
-#: my-evolution/Locations.h:1182
-msgid "Laredo"
-msgstr "Laredo"
+#~ msgid "Cordova"
+#~ msgstr "Cordova"
 
-#: my-evolution/Locations.h:1183
-msgid "Larnaka"
-msgstr "Larnaka"
+#~ msgid "Cork"
+#~ msgstr "Cork"
 
-#: my-evolution/Locations.h:1184
-msgid "La Romana"
-msgstr "La Romana"
+#~ msgid "Coro"
+#~ msgstr "Coro"
 
-#: my-evolution/Locations.h:1185
-msgid "Las Americas"
-msgstr "Las Américas"
+#~ msgid "Corona"
+#~ msgstr "Corona"
 
-#: my-evolution/Locations.h:1186
-msgid "Las Tunas"
-msgstr "Las Tunas"
+#~ msgid "Corpus Christi"
+#~ msgstr "Corpus Christi"
 
-#: my-evolution/Locations.h:1187
-msgid "Las Vegas"
-msgstr "Las Vegas"
+#~ msgid "Corpus Christi NAS"
+#~ msgstr "Corpus Christi NAS"
 
-#: my-evolution/Locations.h:1188
-msgid "Latina"
-msgstr "Latina"
+#~ msgid "Corrientes"
+#~ msgstr "Corrientes"
 
-#: my-evolution/Locations.h:1189
-msgid "Latrobe"
-msgstr "Latrobe"
+#~ msgid "Corsicana"
+#~ msgstr "Corsicana"
 
-#: my-evolution/Locations.h:1190
-msgid "Laughlin"
-msgstr "Laughlin"
+#~ msgid "Cortez"
+#~ msgstr "Cortez"
 
-#: my-evolution/Locations.h:1191
-msgid "Laurel"
-msgstr "Laurel"
+#~ msgid "Corumba"
+#~ msgstr "Corumba"
 
-#: my-evolution/Locations.h:1192
-msgid "La Verne"
-msgstr "La Verne"
+#~ msgid "Cotulla"
+#~ msgstr "Cotulla"
 
-#: my-evolution/Locations.h:1193
-msgid "Lawrence"
-msgstr "Lawrence"
+#~ msgid "Council Bluffs"
+#~ msgstr "Council Bluffs"
 
-#: my-evolution/Locations.h:1194
-msgid "Lawton"
-msgstr "Lawton"
+#~ msgid "Coventry"
+#~ msgstr "Coventry"
 
-#: my-evolution/Locations.h:1195
-msgid "Leadville"
-msgstr "Leadville"
+#~ msgid "Covington"
+#~ msgstr "Covington"
 
-#: my-evolution/Locations.h:1196
-msgid "Learmouth"
-msgstr "Learmouth"
+#~ msgid "Cozumel"
+#~ msgstr "Cozumel"
 
-#: my-evolution/Locations.h:1198
-msgid "Lecce"
-msgstr "Lecce"
+#~ msgid "Craig"
+#~ msgstr "Craig"
 
-#: my-evolution/Locations.h:1199
-msgid "Leeds and Bradford"
-msgstr "Leeds y Bradford"
+#~ msgid "Cranfield"
+#~ msgstr "Cranfield"
 
-#: my-evolution/Locations.h:1200
-msgid "Leesburg"
-msgstr "Leesburg"
+#~ msgid "Crescent City"
+#~ msgstr "Crescent City"
 
-#: my-evolution/Locations.h:1201
-msgid "Leeuwarden"
-msgstr "Leeuwarden"
+#~ msgid "Creston"
+#~ msgstr "Creston"
 
-#: my-evolution/Locations.h:1202
-msgid "Le Havre-Octeville"
-msgstr "Le Havre-Octeville"
+#~ msgid "Crestview"
+#~ msgstr "Crestview"
 
-#: my-evolution/Locations.h:1203
-msgid "Leipzig-Schkeuditz"
-msgstr "Leipzig-Schkeuditz"
+#~ msgid "Cross City"
+#~ msgstr "Cross City"
 
-#: my-evolution/Locations.h:1204
-msgid "Leknes"
-msgstr "Leknes"
+#~ msgid "Crossville"
+#~ msgstr "Crossville"
 
-#: my-evolution/Locations.h:1205
-msgid "Le Mans"
-msgstr "Le Mans"
+#~ msgid "Crotone"
+#~ msgstr "Crotone"
 
-#: my-evolution/Locations.h:1206
-msgid "Le Marine"
-msgstr "Le Marine"
+#~ msgid "Cuba Awrs"
+#~ msgstr "Cuba Awrs"
 
-#: my-evolution/Locations.h:1207
-msgid "Lemmon"
-msgstr "Lemmon"
+#~ msgid "Cuernavaca"
+#~ msgstr "Cuernavaca"
 
-#: my-evolution/Locations.h:1208
-msgid "Lemoore"
-msgstr "Lemoore"
+#~ msgid "Cuiaba"
+#~ msgstr "Cuiaba"
 
-#: my-evolution/Locations.h:1209
-msgid "Leticia/Vasquez Cobo"
-msgstr "Leticia/Vasquez Cobo"
+#~ msgid "Culdrose"
+#~ msgstr "Culdrose"
 
-#: my-evolution/Locations.h:1210
-msgid "Le Touquet"
-msgstr "Le Touquet"
+#~ msgid "Culiacan"
+#~ msgstr "Culiacan"
 
-#: my-evolution/Locations.h:1211
-msgid "Leuchars"
-msgstr "Leuchars"
+#~ msgid "Cumana"
+#~ msgstr "Cumana"
 
-#: my-evolution/Locations.h:1212
-msgid "Lewisburg"
-msgstr "Lewisburg"
+#~ msgid "Cumberland"
+#~ msgstr "Cumberland"
 
-#: my-evolution/Locations.h:1213
-msgid "Lewiston"
-msgstr "Lewiston"
+#~ msgid "Curitiba"
+#~ msgstr "Curitiba"
 
-#: my-evolution/Locations.h:1214
-msgid "Lewistown"
-msgstr "Lewistown"
+#~ msgid "Curitiba Apt"
+#~ msgstr "Curitiba Apt"
 
-#: my-evolution/Locations.h:1215
-msgid "Lexington"
-msgstr "Lexington"
+#~ msgid "Custer"
+#~ msgstr "Custer"
 
-#: my-evolution/Locations.h:1216
-msgid "Liberal"
-msgstr "Liberal"
+#~ msgid "Cut Bank"
+#~ msgstr "Cut Bank"
 
-#: my-evolution/Locations.h:1218
-msgid "Libya"
-msgstr "Libia"
+#~ msgid "Cuzco"
+#~ msgstr "Cuzco"
 
-#: my-evolution/Locations.h:1219
-msgid "Lichtenburg"
-msgstr "Lichtenburg"
+#~ msgid "Dagali"
+#~ msgstr "Dagali"
 
-#: my-evolution/Locations.h:1220
-msgid "Lidgerwood"
-msgstr "Lidgerwood"
+#~ msgid "Daggett"
+#~ msgstr "Daggett"
 
-#: my-evolution/Locations.h:1221
-msgid "Liege"
-msgstr "Liege"
+#~ msgid "Dalhart"
+#~ msgstr "Dalhart"
 
-#: my-evolution/Locations.h:1222
-msgid "Lihue"
-msgstr "Lithue"
+#~ msgid "Dalian"
+#~ msgstr "Dalian"
 
-#: my-evolution/Locations.h:1223
-msgid "Lille-Lesquin"
-msgstr "Lille-Lesquin"
+#~ msgid "Dallas-Addison"
+#~ msgstr "Dallas-Addison"
 
-#: my-evolution/Locations.h:1224
-msgid "Lima-Callao"
-msgstr "Lima-Callao"
+#~ msgid "Dallas-Fort Worth"
+#~ msgstr "Dallas-Fort Worth"
 
-#: my-evolution/Locations.h:1225
-msgid "Limnos"
-msgstr "Limnos"
+#~ msgid "Dallas-Love Field"
+#~ msgstr "Dallas-Love Field"
 
-#: my-evolution/Locations.h:1226
-msgid "Limoges"
-msgstr "Limoges"
+#~ msgid "Dallas-Redbird"
+#~ msgstr "Dallas-Redbird"
 
-#: my-evolution/Locations.h:1227
-msgid "Limon"
-msgstr "Limon"
+#~ msgid "Da Nang"
+#~ msgstr "Da Nang"
 
-#: my-evolution/Locations.h:1228
-msgid "Lincoln"
-msgstr "Lincoln"
+#~ msgid "Danbury"
+#~ msgstr "Danbury"
 
-#: my-evolution/Locations.h:1229
-msgid "Linz"
-msgstr "Linz"
+#~ msgid "Danville"
+#~ msgstr "Danville"
 
-#: my-evolution/Locations.h:1230
-msgid "Lisboa"
-msgstr "Lisboa"
+#~ msgid "Dar-El-Beida"
+#~ msgstr "Dar-El-Beida"
 
-#: my-evolution/Locations.h:1231
-msgid "Lista"
-msgstr "Lista"
+#~ msgid "Davenport"
+#~ msgstr "Davenport"
 
-#: my-evolution/Locations.h:1232
-msgid "Litchfield"
-msgstr "Litchfield"
+#~ msgid "David"
+#~ msgstr "David"
 
-#: my-evolution/Locations.h:1234
-msgid "Little Rock"
-msgstr "Little Rock"
+#~ msgid "Dawadmi"
+#~ msgstr "Dawadmi"
 
-#: my-evolution/Locations.h:1235
-msgid "Little Rock AFB"
-msgstr "Little Rock AFB"
+#~ msgid "Dayton"
+#~ msgstr "Daiton"
 
-#: my-evolution/Locations.h:1236
-msgid "Livermore"
-msgstr "Livermore"
+#~ msgid "Daytona Beach"
+#~ msgstr "Playa de Daitona"
 
-#: my-evolution/Locations.h:1237
-msgid "Liverpool"
-msgstr "Liverpool"
+#~ msgid "Dayton-Fairborn"
+#~ msgstr "Dayton-Fairborn"
 
-#: my-evolution/Locations.h:1238
-msgid "Livingston"
-msgstr "Livingston"
+#~ msgid "Dayton-South Airport"
+#~ msgstr "Dayton-South Airport"
 
-#: my-evolution/Locations.h:1239
-msgid "Ljubljana"
-msgstr "Ljubljana"
+#~ msgid "Dead Horse"
+#~ msgstr "Dead Horse"
 
-#: my-evolution/Locations.h:1240
-msgid "Logan"
-msgstr "Logan"
+#~ msgid "Deauville-Saint-Gatien"
+#~ msgstr "Deauville-Saint-Gatien"
 
-#: my-evolution/Locations.h:1241
-msgid "Lolland Falster"
-msgstr "Lolland Falster"
+#~ msgid "Decatur"
+#~ msgstr "Decatur"
 
-#: my-evolution/Locations.h:1242
-msgid "Lompoc"
-msgstr "Lompoc"
+#~ msgid "Decimomannu"
+#~ msgstr "Decimomannu"
 
-#: my-evolution/Locations.h:1243
-msgid "London"
-msgstr "Londres"
+#~ msgid "Decorah"
+#~ msgstr "Decorah"
 
-#: my-evolution/Locations.h:1244
-msgid "London/City"
-msgstr "Londres/Ciudad"
+#~ msgid "Deelen"
+#~ msgstr "Deelen"
 
-#: my-evolution/Locations.h:1245
-msgid "London/Gatwick"
-msgstr "Londres/Gatwick"
+#~ msgid "Dekalb/Peachtree"
+#~ msgstr "Dekalb/Peachtree"
 
-#: my-evolution/Locations.h:1246
-msgid "London/Heathrow"
-msgstr "Londres/Heathrow"
+#~ msgid "Delaware"
+#~ msgstr "Delaware"
 
-#: my-evolution/Locations.h:1247
-msgid "London/Stansted"
-msgstr "Londres/Stansted"
+#~ msgid "Del Bajio"
+#~ msgstr "Del Bajio"
 
-#: my-evolution/Locations.h:1248
-msgid "Londrina"
-msgstr "Londrina"
+#~ msgid "Del Rio"
+#~ msgstr "Del Río"
 
-#: my-evolution/Locations.h:1249
-msgid "Lone Rock"
-msgstr "Lone Rock"
+#~ msgid "Delta"
+#~ msgstr "Delta"
 
-#: my-evolution/Locations.h:1250
-msgid "Long Beach"
-msgstr "Long Beach"
+#~ msgid "Deming"
+#~ msgstr "Deming"
 
-#: my-evolution/Locations.h:1251
-msgid "Longview"
-msgstr "Longview"
+#~ msgid "Den Helder/De Kooy"
+#~ msgstr "Den Helder/De Kooy"
 
-#: my-evolution/Locations.h:1252
-msgid "Lorient-Lann-Bihoue"
-msgstr "Lorient-Lann-Bihoue"
+#~ msgid "Denison"
+#~ msgstr "Denison"
 
-#: my-evolution/Locations.h:1253
-msgid "Los Alamos"
-msgstr "Los Álamos"
+#~ msgid "Denton"
+#~ msgstr "Denton"
 
-#: my-evolution/Locations.h:1254
-msgid "Los Angeles"
-msgstr "Los Ángeles"
+#~ msgid "Denver"
+#~ msgstr "Denver"
 
-#: my-evolution/Locations.h:1255
-msgid "Los Mochis"
-msgstr "Los Mochis"
+#~ msgid "Denver-Aurora"
+#~ msgstr "Denver-Aurora"
 
-#: my-evolution/Locations.h:1256
-msgid "Lossiemouth"
-msgstr "Lossiemouth"
+#~ msgid "Denver-Broomfield"
+#~ msgstr "Denver-Broomfield"
 
-#: my-evolution/Locations.h:1257
-msgid "Louisville"
-msgstr "Louisville"
+#~ msgid "Denver-Cherry Knolls"
+#~ msgstr "Denver-Cherry Knolls"
 
-#: my-evolution/Locations.h:1258
-msgid "Louisville-Standiford Field"
-msgstr "Louisville-Standiford Field"
+#~ msgid "Desert Rock"
+#~ msgstr "Desert Rock"
 
-#: my-evolution/Locations.h:1259
-msgid "Lousiana"
-msgstr "Luisiana"
+#~ msgid "Des Moines"
+#~ msgstr "Des Moines"
 
-#: my-evolution/Locations.h:1260
-msgid "Lovelock"
-msgstr "Lovelock"
+#~ msgid "Destin"
+#~ msgstr "Destin"
 
-#: my-evolution/Locations.h:1261
-msgid "Lubbock"
-msgstr "Lubbock"
+#~ msgid "Detroit"
+#~ msgstr "Detroit"
 
-#: my-evolution/Locations.h:1262
-msgid "Lubeck-Blankensee"
-msgstr "Lubeck-Blankensee"
+#~ msgid "Detroit Lakes"
+#~ msgstr "Detroit Lakes"
 
-#: my-evolution/Locations.h:1263
-msgid "Lufkin"
-msgstr "Lufkin"
+#~ msgid "Detroit-Taylor"
+#~ msgstr "Detroit-Taylor"
 
-#: my-evolution/Locations.h:1264
-msgid "Lugano"
-msgstr "Lugano"
+#~ msgid "Detroit/Ypsilanti"
+#~ msgstr "Detroit/Ypsilanti"
 
-#: my-evolution/Locations.h:1265
-msgid "Luqa"
-msgstr "Luqa"
+#~ msgid "Devils Lake"
+#~ msgstr "Devils Lake"
 
-#: my-evolution/Locations.h:1266
-msgid "Luton"
-msgstr "Luton"
+#~ msgid "Devils Lake (2)"
+#~ msgstr "Devils Lake (2)"
 
-#: my-evolution/Locations.h:1268
-msgid "Luxeuil"
-msgstr "Luxeuil"
+#~ msgid "Dhahran"
+#~ msgstr "Dhahran"
 
-#: my-evolution/Locations.h:1269
-msgid "Luxor"
-msgstr "Luxor"
+#~ msgid "Dickinson"
+#~ msgstr "Dickinson"
 
-#: my-evolution/Locations.h:1270
-msgid "Lviv"
-msgstr "Lviv"
+#~ msgid "Dijon"
+#~ msgstr "Dijon"
 
-#: my-evolution/Locations.h:1271
-msgid "Lynchburg"
-msgstr "Lynchburg"
+#~ msgid "Dillingham"
+#~ msgstr "Dillingham"
 
-#: my-evolution/Locations.h:1272
-msgid "Lyneham"
-msgstr "Lyneham"
+#~ msgid "Dillon"
+#~ msgstr "Dillon"
 
-#: my-evolution/Locations.h:1273
-msgid "Lyon-Bron"
-msgstr "Lyon-Bron"
+#~ msgid "Dinard"
+#~ msgstr "Dinard"
 
-#: my-evolution/Locations.h:1274
-msgid "Lyon-Satolas"
-msgstr "Lyon-Satolas"
+#~ msgid "District of Columbia"
+#~ msgstr "Distrito de Columbia"
 
-#: my-evolution/Locations.h:1275
-msgid "Maastricht"
-msgstr "Mastricht"
+#~ msgid "Diyarbakir"
+#~ msgstr "Diyarbakir"
 
-#: my-evolution/Locations.h:1276
-msgid "Macae"
-msgstr "Macae"
+#~ msgid "Dnipropetrovsk"
+#~ msgstr "Dnipropetrovsk"
 
-#: my-evolution/Locations.h:1277
-msgid "Macapa"
-msgstr "Macapa"
+#~ msgid "Dobbiaco"
+#~ msgstr "Dobbiaco"
 
-#: my-evolution/Locations.h:1278
-msgid "Maceio"
-msgstr "Maceio"
+#~ msgid "Dodge City"
+#~ msgstr "Dodge City"
 
-#: my-evolution/Locations.h:1279
-msgid "Macon"
-msgstr "Macon"
+#~ msgid "Doha"
+#~ msgstr "Doha"
 
-#: my-evolution/Locations.h:1280
-msgid "Madinah"
-msgstr "Madinah"
+#~ msgid "Dole"
+#~ msgstr "Dole"
 
-#: my-evolution/Locations.h:1281
-msgid "Madison"
-msgstr "Mádison"
+#~ msgid "Donetsk"
+#~ msgstr "Donetsk"
 
-#: my-evolution/Locations.h:1282
-msgid "Madras/Minambakkam"
-msgstr "Madras/Minambakkam"
+#~ msgid "Dongsha"
+#~ msgstr "Dongsha"
 
-#: my-evolution/Locations.h:1283
-msgid "Madrid (Barajas)"
-msgstr "Madrid (Barajas)"
+#~ msgid "Dongshi"
+#~ msgstr "Dongshi"
 
-#: my-evolution/Locations.h:1284
-msgid "Madrid (Cuatro Vientos)"
-msgstr "Madrid (Cuatro Vientos)"
+#~ msgid "Don Torcuato"
+#~ msgstr "Don Torcuato"
 
-#: my-evolution/Locations.h:1285
-msgid "Magadan"
-msgstr "Magadan"
+#~ msgid "Dortmund-Wickede"
+#~ msgstr "Dortmund-Wickede"
 
-#: my-evolution/Locations.h:1286
-msgid "Magdalena"
-msgstr "Magdalena"
+#~ msgid "Dothan"
+#~ msgstr "Dothan"
 
-#: my-evolution/Locations.h:1287
-msgid "Maine"
-msgstr "Maine"
+#~ msgid "Douglas"
+#~ msgstr "Douglas"
 
-#: my-evolution/Locations.h:1288
-msgid "Makhachkala"
-msgstr "Makhachkala"
+#~ msgid "Dover"
+#~ msgstr "Dover"
 
-#: my-evolution/Locations.h:1289
-msgid "Makkah"
-msgstr "Makkah"
+#~ msgid "Dresden-Klotzsche"
+#~ msgstr "Dresden-Klotzsche"
 
-#: my-evolution/Locations.h:1290
-msgid "Makung"
-msgstr "Makung"
+#~ msgid "Drummond"
+#~ msgstr "Drummond"
 
-#: my-evolution/Locations.h:1291
-msgid "Malad City"
-msgstr "Malad City"
+#~ msgid "Dubai"
+#~ msgstr "Dubai"
 
-#: my-evolution/Locations.h:1292
-msgid "Malaga"
-msgstr "Málaga"
+#~ msgid "Dubbo"
+#~ msgstr "Dubbo"
 
-#: my-evolution/Locations.h:1293
-msgid "Malatya"
-msgstr "Malatya"
+#~ msgid "Dublin"
+#~ msgstr "Dublín"
 
-#: my-evolution/Locations.h:1294
-msgid "Maldonado/Punta Est"
-msgstr "Maldonado/Punta Est"
+#~ msgid "Du Bois"
+#~ msgstr "Du Bois"
 
-#: my-evolution/Locations.h:1295
-msgid "Malmo/Sturup"
-msgstr "Malmo/Sturup"
+#~ msgid "Dubrovnik"
+#~ msgstr "Dubrovnik"
 
-#: my-evolution/Locations.h:1297
-msgid "Mammoth Lakes"
-msgstr "Mammoth Lakes"
+#~ msgid "Dubuque"
+#~ msgstr "Dubuque"
 
-#: my-evolution/Locations.h:1298
-msgid "Managua"
-msgstr "Managua"
+#~ msgid "Dugway"
+#~ msgstr "Dugway"
 
-#: my-evolution/Locations.h:1299
-msgid "Manassas"
-msgstr "Manassas"
+#~ msgid "Duluth"
+#~ msgstr "Duluth"
 
-#: my-evolution/Locations.h:1300
-msgid "Manaus"
-msgstr "Manao"
+#~ msgid "Dundee"
+#~ msgstr "Dundee"
 
-#: my-evolution/Locations.h:1301
-msgid "Manchester"
-msgstr "Mánchester"
+#~ msgid "Durango"
+#~ msgstr "Durango"
 
-#: my-evolution/Locations.h:1302
-msgid "Mangilsan Ab"
-msgstr "Mangilsan Ab"
+#~ msgid "Durango Awrs"
+#~ msgstr "Durango Awrs"
 
-#: my-evolution/Locations.h:1303
-msgid "Manhattan"
-msgstr "Manhattan"
+#~ msgid "Durazno"
+#~ msgstr "Durazno"
 
-#: my-evolution/Locations.h:1304
-msgid "Manisa"
-msgstr "Manisa"
+#~ msgid "Durban Louis Botha "
+#~ msgstr "Durban Louis Botha "
 
-#: my-evolution/Locations.h:1305
-msgid "Manistee"
-msgstr "Manistee"
+#~ msgid "Dusseldorf"
+#~ msgstr "Dusseldorf"
 
-#: my-evolution/Locations.h:1306
-msgid "Manitoba"
-msgstr "Manitoba"
+#~ msgid "Dutch Harbor"
+#~ msgstr "Dutch Harbor"
 
-#: my-evolution/Locations.h:1307
-msgid "Manitowoc"
-msgstr "Manitowoc"
+#~ msgid "Dyersburg"
+#~ msgstr "Dyersburg"
 
-#: my-evolution/Locations.h:1308
-msgid "Mankato"
-msgstr "Mankato"
+#~ msgid "Eagle"
+#~ msgstr "Eagle"
 
-#: my-evolution/Locations.h:1309
-msgid "Mansfield"
-msgstr "Mansfield"
+#~ msgid "Eagle Range"
+#~ msgstr "Eagle Range"
 
-#: my-evolution/Locations.h:1310
-msgid "Manta"
-msgstr "Manta"
+#~ msgid "East London"
+#~ msgstr "Londres este"
 
-#: my-evolution/Locations.h:1311
-msgid "Manzanillo"
-msgstr "Manzanillo"
+#~ msgid "East Midlands"
+#~ msgstr "East Midlands"
 
-#: my-evolution/Locations.h:1312
-msgid "Maraba"
-msgstr "Maraba"
+#~ msgid "East St Louis"
+#~ msgstr "East St Louis"
 
-#: my-evolution/Locations.h:1313
-msgid "Maracaibo-La Chinita"
-msgstr "Maracaibo-La Chinita"
+#~ msgid "Eau Claire"
+#~ msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:1314
-msgid "Maracay-B.A.Sucre"
-msgstr "Maracay-B.A.Sucre"
+#~ msgid "Edinburgh"
+#~ msgstr "Edimburgo"
 
-#: my-evolution/Locations.h:1315
-msgid "Marathon"
-msgstr "Marathon"
+#~ msgid "Edmonton"
+#~ msgstr "Edmonton"
 
-#: my-evolution/Locations.h:1316
-msgid "Mar Del Plata"
-msgstr "Mar Del Plata"
+#~ msgid "Edmonton/Villeneuve"
+#~ msgstr "Edmonton/Villeneuve"
 
-#: my-evolution/Locations.h:1317
-msgid "Margarita"
-msgstr "Margarita"
+#~ msgid "Eduardo Gomes International"
+#~ msgstr "Eduardo Gomes International"
 
-#: my-evolution/Locations.h:1318
-msgid "Marianna"
-msgstr "Marianna"
+#~ msgid "Edwards AFB"
+#~ msgstr "Edwards AFB"
 
-#: my-evolution/Locations.h:1319
-msgid "Marib"
-msgstr "Marib"
+#~ msgid "Egilsstadir"
+#~ msgstr "Egilsstadir"
 
-#: my-evolution/Locations.h:1320
-msgid "Maribor"
-msgstr "Maribor"
+#~ msgid "Eglin"
+#~ msgstr "Eglin"
 
-#: my-evolution/Locations.h:1321
-msgid "Marietta"
-msgstr "Marietta"
+#~ msgid "Eglington/Londonderry"
+#~ msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:1322
-msgid "Marino di Ravenna"
-msgstr "Marino di Ravenna"
+#~ msgid "Eindhoven"
+#~ msgstr "Eindhoven"
 
-#: my-evolution/Locations.h:1323
-msgid "Marion"
-msgstr "Marion"
+#~ msgid "Ekofisk"
+#~ msgstr "Ekofisk"
 
-#: my-evolution/Locations.h:1324
-msgid "Marion-Wytheville"
-msgstr "Marion-Wytheville"
+#~ msgid "Elazig"
+#~ msgstr "Elazig"
 
-#: my-evolution/Locations.h:1325
-msgid "Marseille-Provence"
-msgstr "Marseille-Provence"
+#~ msgid "El Centro"
+#~ msgstr "El Centro"
 
-#: my-evolution/Locations.h:1326
-msgid "Marseilles"
-msgstr "Marseilles"
+#~ msgid "El Dorado"
+#~ msgstr "El Dorado"
 
-#: my-evolution/Locations.h:1327
-msgid "Marshall"
-msgstr "Marshall"
+#~ msgid "Elefsis"
+#~ msgstr "Elefsis"
 
-#: my-evolution/Locations.h:1328
-msgid "Marshalltown"
-msgstr "Marshalltown"
+#~ msgid "Elfin Cove"
+#~ msgstr "Elfin Cove"
 
-#: my-evolution/Locations.h:1329
-msgid "Marshfield"
-msgstr "Marshfield"
+#~ msgid "Elizabeth City"
+#~ msgstr "Elizabeth City"
 
-#: my-evolution/Locations.h:1330
-msgid "Marte"
-msgstr "Marte"
+#~ msgid "Elk City"
+#~ msgstr "Elk City"
 
-#: my-evolution/Locations.h:1331
-msgid "Marthas Vineyard"
-msgstr "Marthas Vineyard"
+#~ msgid "Elkhart"
+#~ msgstr "Elkhart"
 
-#: my-evolution/Locations.h:1332
-msgid "Martinsburg"
-msgstr "Martinsburg"
+#~ msgid "Elkins"
+#~ msgstr "Elkins"
 
-#: my-evolution/Locations.h:1333
-msgid "Martinsville"
-msgstr "Martinsville"
+#~ msgid "Elko"
+#~ msgstr "Elko"
 
-#: my-evolution/Locations.h:1334
-msgid "Maryland"
-msgstr "Maryland"
+#~ msgid "Elmira"
+#~ msgstr "Elmira"
 
-#: my-evolution/Locations.h:1335
-msgid "Marysville"
-msgstr "Marysville"
+#~ msgid "El Monte"
+#~ msgstr "El Monte"
 
-#: my-evolution/Locations.h:1336
-msgid "Marysville-Beale AFB"
-msgstr "Marysville-Beale AFB"
+#~ msgid "El Paso"
+#~ msgstr "El Paso"
 
-#: my-evolution/Locations.h:1337
-msgid "Mashhad"
-msgstr "Mashhad"
+#~ msgid "El Salvador Int."
+#~ msgstr "El Salvador Int."
 
-#: my-evolution/Locations.h:1338
-msgid "Masirah"
-msgstr "Masirah"
+#~ msgid "Elsenborn"
+#~ msgstr "Elsenborn"
 
-#: my-evolution/Locations.h:1339
-msgid "Mason City"
-msgstr "Mason City"
+#~ msgid "Ely"
+#~ msgstr "Ely"
 
-#: my-evolution/Locations.h:1340
-msgid "Massachusetts"
-msgstr "Massachusetts"
+#~ msgid "Emmonak"
+#~ msgstr "Emmonak"
 
-#: my-evolution/Locations.h:1341
-msgid "Massena"
-msgstr "Massena"
+#~ msgid "Emporia"
+#~ msgstr "Emporia"
 
-#: my-evolution/Locations.h:1342
-msgid "Matamoros"
-msgstr "Matamoros"
+#~ msgid "Enid"
+#~ msgstr "Enid"
 
-#: my-evolution/Locations.h:1343
-msgid "Matsumoto Airport"
-msgstr "Matsumoto Airport"
+#~ msgid "Enid/Woodring"
+#~ msgstr "Enid/Woodring"
 
-#: my-evolution/Locations.h:1344
-msgid "Matsushima Ab"
-msgstr "Matsushima Ab"
+#~ msgid "Enosburg Falls"
+#~ msgstr "Enosburg Falls"
 
-#: my-evolution/Locations.h:1345
-msgid "Matsuyama Airport"
-msgstr "Matsuyama Airport"
+#~ msgid "Ephrata"
+#~ msgstr "Ephrata"
 
-#: my-evolution/Locations.h:1346
-msgid "Mattoon"
-msgstr "Mattoon"
+#~ msgid "Ercan"
+#~ msgstr "Ercan"
 
-#: my-evolution/Locations.h:1347
-msgid "Mayaguez"
-msgstr "Mayaguez"
+#~ msgid "Erie"
+#~ msgstr "Erie"
 
-#: my-evolution/Locations.h:1348
-msgid "Mayport"
-msgstr "Mayport"
+#~ msgid "Erzurum"
+#~ msgstr "Erzurum"
 
-#: my-evolution/Locations.h:1349
-msgid "Mazatlan"
-msgstr "Mazatlan"
+#~ msgid "Esbjerg"
+#~ msgstr "Esbjerg"
 
-#: my-evolution/Locations.h:1350
-msgid "Mazu"
-msgstr "Mazu"
+#~ msgid "Escanaba"
+#~ msgstr "Escanaba"
 
-#: my-evolution/Locations.h:1351
-msgid "McAlester"
-msgstr "McAlester"
+#~ msgid "Esfahan"
+#~ msgstr "Esfahan"
 
-#: my-evolution/Locations.h:1352
-msgid "McAllen"
-msgstr "McAllen"
+#~ msgid "Eskisehir"
+#~ msgstr "Eskisehir"
 
-#: my-evolution/Locations.h:1353
-msgid "McCall"
-msgstr "McCall"
+#~ msgid "Estherville"
+#~ msgstr "Estherville"
 
-#: my-evolution/Locations.h:1354
-msgid "McCarthy"
-msgstr "McCarthy"
+#~ msgid "Eugene"
+#~ msgstr "Eugene"
 
-#: my-evolution/Locations.h:1355
-msgid "McClellan"
-msgstr "McClellan"
+#~ msgid "Eureka"
+#~ msgstr "Eureka"
 
-#: my-evolution/Locations.h:1356
-msgid "McComb"
-msgstr "McComb"
+#~ msgid "Europe"
+#~ msgstr "Europa"
 
-#: my-evolution/Locations.h:1357
-msgid "McCook"
-msgstr "McCook"
+#~ msgid "Evanston"
+#~ msgstr "Evanston"
 
-#: my-evolution/Locations.h:1358
-msgid "McGrath"
-msgstr "McGrath"
+#~ msgid "Evansville"
+#~ msgstr "Evansville"
 
-#: my-evolution/Locations.h:1359
-msgid "Mc Gregor"
-msgstr "Mc Gregor"
+#~ msgid "Everett"
+#~ msgstr "Everett"
 
-#: my-evolution/Locations.h:1360
-msgid "Meacham"
-msgstr "Meacham"
+#~ msgid "Evergreen"
+#~ msgstr "Evergreen"
 
-#: my-evolution/Locations.h:1361
-msgid "Medford"
-msgstr "Medford"
+#~ msgid "Evreux-Fauville"
+#~ msgstr "Evreux-Fauville"
 
-#: my-evolution/Locations.h:1362
-msgid "Medicine Lodge"
-msgstr "Medicine Lodge"
+#~ msgid "Exeter"
+#~ msgstr "Exeter"
 
-#: my-evolution/Locations.h:1363
-msgid "Mehamn"
-msgstr "Mehamn"
+#~ msgid "Ezeiza"
+#~ msgstr "Ezeiza"
 
-#: my-evolution/Locations.h:1364
-msgid "Mekoryuk"
-msgstr "Mekoryuk"
+#~ msgid "Fagernes"
+#~ msgstr "Fagernes"
 
-#: my-evolution/Locations.h:1365
-msgid "Melbourne"
-msgstr "Melbourne"
+#~ msgid "Fairbanks"
+#~ msgstr "Fairbanks"
 
-#: my-evolution/Locations.h:1366
-msgid "Melfa"
-msgstr "Melfa"
+#~ msgid "Fairchild"
+#~ msgstr "Fairchild"
 
-#: my-evolution/Locations.h:1367
-msgid "Melilla"
-msgstr "Melilla"
+#~ msgid "Fairfield"
+#~ msgstr "Fairfield"
 
-#: my-evolution/Locations.h:1368
-msgid "Memambetsu Airport"
-msgstr "Memambetsu Airport"
+#~ msgid "Fairmont"
+#~ msgstr "Fairmont"
 
-#: my-evolution/Locations.h:1369
-msgid "Memphis"
-msgstr "Memphis"
+#~ msgid "Fallon"
+#~ msgstr "Fallon"
 
-#: my-evolution/Locations.h:1370
-msgid "Memphis-NAS"
-msgstr "Memphis-NAS"
+#~ msgid "Falls City"
+#~ msgstr "Falls City"
 
-#: my-evolution/Locations.h:1371
-msgid "Mendoza"
-msgstr "Mendoza"
+#~ msgid "Falmouth-Otis AFB"
+#~ msgstr "Falmouth-Otis AFB"
 
-#: my-evolution/Locations.h:1372
-msgid "Mene Grande"
-msgstr "Mene Grande"
+#~ msgid "Farbanks/Eielson AFB"
+#~ msgstr "Farbanks/Eielson AFB"
 
-#: my-evolution/Locations.h:1373
-msgid "Menominee"
-msgstr "Menominee"
+#~ msgid "Fargo"
+#~ msgstr "Fargo"
 
-#: my-evolution/Locations.h:1374
-msgid "Menorca"
-msgstr "Menorca"
+#~ msgid "Farmingdale"
+#~ msgstr "Farmingdale"
 
-#: my-evolution/Locations.h:1375
-msgid "Merced"
-msgstr "Merced"
+#~ msgid "Farmington"
+#~ msgstr "Farmington"
 
-#: my-evolution/Locations.h:1376
-msgid "Merida"
-msgstr "Mérida"
+#~ msgid "Farmville"
+#~ msgstr "Farmville"
 
-#: my-evolution/Locations.h:1377
-msgid "Meridian"
-msgstr "Meridian"
+#~ msgid "Faro"
+#~ msgstr "Faro"
 
-#: my-evolution/Locations.h:1378
-msgid "Meridian-Lauderdale"
-msgstr "Meridian-Lauderdale"
+#~ msgid "Fayetteville"
+#~ msgstr "Fayetteville"
 
-#: my-evolution/Locations.h:1379
-msgid "Merril Field"
-msgstr "Merril Field"
+#~ msgid "Feng Nin"
+#~ msgstr "Feng Nin"
 
-#: my-evolution/Locations.h:1380
-msgid "Mersa Matruh"
-msgstr "Mersa Matruh"
+#~ msgid "Fergus Falls"
+#~ msgstr "Fergus Falls"
 
-#: my-evolution/Locations.h:1381
-msgid "Mesa-Falcon Field"
-msgstr "Mesa-Falcon Field"
+#~ msgid "Fernando De Noronha"
+#~ msgstr "Fernando De Noronha"
 
-#: my-evolution/Locations.h:1382
-msgid "Metabaru Ab"
-msgstr "Metabaru Ab"
+#~ msgid "Ferrara"
+#~ msgstr "Ferrara"
 
-#: my-evolution/Locations.h:1383
-msgid "Metz-Frescaty"
-msgstr "Metz-Frescaty"
+#~ msgid "Figari"
+#~ msgstr "Figari"
 
-#: my-evolution/Locations.h:1384
-msgid "Mexicali"
-msgstr "Mexicali"
+#~ msgid "Findlay"
+#~ msgstr "Findlay"
 
-#: my-evolution/Locations.h:1386
-msgid "Miami"
-msgstr "Miami"
+#~ msgid "Firenze"
+#~ msgstr "Firenze"
 
-#: my-evolution/Locations.h:1387
-msgid "Miami-Kendall"
-msgstr "Miami-Kendall"
+#~ msgid "Fitchburg"
+#~ msgstr "Fitchburg"
 
-#: my-evolution/Locations.h:1388
-msgid "Miami-Opa Locka"
-msgstr "Miami-Opa Locka"
+#~ msgid "Flagstaff"
+#~ msgstr "Flagstaff"
 
-#: my-evolution/Locations.h:1389
-msgid "Michigan"
-msgstr "Míchigan"
+#~ msgid "Flint"
+#~ msgstr "Flint"
 
-#: my-evolution/Locations.h:1390
-msgid "Middle East"
-msgstr "Oriente Medio"
+#~ msgid "Flippin"
+#~ msgstr "Flippin"
 
-#: my-evolution/Locations.h:1391
-msgid "Middleton Island"
-msgstr "Middleton Island"
+#~ msgid "Florence"
+#~ msgstr "Florencia"
 
-#: my-evolution/Locations.h:1392
-msgid "Middletown"
-msgstr "Middletown"
+#~ msgid "Florennes"
+#~ msgstr "Florennes"
 
-#: my-evolution/Locations.h:1393
-msgid "Midland"
-msgstr "Midland"
+#~ msgid "Flores"
+#~ msgstr "Flores"
 
-#: my-evolution/Locations.h:1394
-msgid "Miho Ab"
-msgstr "Miho Ab"
+#~ msgid "Florianopolis"
+#~ msgstr "Florianopolis"
 
-#: my-evolution/Locations.h:1395
-msgid "Milano/Linate"
-msgstr "Milán/Linate"
+#~ msgid "Florida"
+#~ msgstr "Florida"
 
-#: my-evolution/Locations.h:1396
-msgid "Milano/Malpensa"
-msgstr "Milán/Malpensa"
+#~ msgid "Floro"
+#~ msgstr "Floro"
 
-#: my-evolution/Locations.h:1397
-msgid "Miles City"
-msgstr "Miles City"
+#~ msgid "Fond Du Lac"
+#~ msgstr "Fond Du Lac"
 
-#: my-evolution/Locations.h:1398
-msgid "Milford"
-msgstr "Milford"
+#~ msgid "Forde/Bringeland"
+#~ msgstr "Forde/Bringeland"
 
-#: my-evolution/Locations.h:1399
-msgid "Millinocket"
-msgstr "Millinocket"
+#~ msgid "Forli"
+#~ msgstr "Forli"
 
-#: my-evolution/Locations.h:1400
-msgid "Millville"
-msgstr "Millville"
+#~ msgid "Formosa"
+#~ msgstr "Formosa"
 
-#: my-evolution/Locations.h:1401
-msgid "Milton"
-msgstr "Milton"
+#~ msgid "Fortaleza"
+#~ msgstr "Fortaleza"
 
-#: my-evolution/Locations.h:1402
-msgid "Milwaukee"
-msgstr "Milwaukee"
+#~ msgid "Fort Belvoir"
+#~ msgstr "Fuerte Belvoir"
 
-#: my-evolution/Locations.h:1403
-msgid "Milwaukee-Timmerman"
-msgstr "Milwaukee-Timmerman"
+#~ msgid "Fort Benning"
+#~ msgstr "Fuerte Benning"
 
-#: my-evolution/Locations.h:1404
-msgid "Minamitorishima"
-msgstr "Minamitorishima"
+#~ msgid "Fort Bragg"
+#~ msgstr "Fuerte Bragg"
 
-#: my-evolution/Locations.h:1405
-msgid "Minatitlan"
-msgstr "Minatitlan"
+#~ msgid "Fort Campbell"
+#~ msgstr "Fuerte Campbell"
 
-#: my-evolution/Locations.h:1406
-msgid "Minchumina"
-msgstr "Minchumina"
+#~ msgid "Fort Carson"
+#~ msgstr "Fuerte Carson"
 
-#: my-evolution/Locations.h:1407
-msgid "Mineralnye Vody"
-msgstr "Mineralnye Vody"
+#~ msgid "Fort Collins"
+#~ msgstr "Fuerte Collins"
 
-#: my-evolution/Locations.h:1408
-msgid "Mineral Wells"
-msgstr "Mineral Wells"
+#~ msgid "Fort Collins/Lovel"
+#~ msgstr "Fuerte Collins/Lovel"
 
-#: my-evolution/Locations.h:1409
-msgid "Minneapolis"
-msgstr "Mineápolis"
+#~ msgid "Fort Dodge"
+#~ msgstr "Fuerte Dodge"
 
-#: my-evolution/Locations.h:1410
-msgid "Minneapolis [2]"
-msgstr "Mineápolis [2]"
+#~ msgid "Fort Drum"
+#~ msgstr "Fuerte Drum"
 
-#: my-evolution/Locations.h:1411
-msgid "Minneapolis [3]"
-msgstr "Mineápolis [3]"
+#~ msgid "Fort Eustis"
+#~ msgstr "Fuerte Eustis"
 
-#: my-evolution/Locations.h:1412
-msgid "Minnesota"
-msgstr "Minesota"
+#~ msgid "Fort Greely/Allen AAF"
+#~ msgstr "Fuerte Greely/Allen AAF"
 
-#: my-evolution/Locations.h:1413
-msgid "Minocqua"
-msgstr "Minocqua"
+#~ msgid "Fort Huachuca"
+#~ msgstr "Fuerte Huachuca"
 
-#: my-evolution/Locations.h:1414
-msgid "Minot"
-msgstr "Minot"
+#~ msgid "Fort Knox"
+#~ msgstr "Fuerte Knox"
 
-#: my-evolution/Locations.h:1415
-msgid "Minot AFB"
-msgstr "Minot AFB"
+#~ msgid "Fort Lauderdale"
+#~ msgstr "Fuerte Lauderdale"
 
-#: my-evolution/Locations.h:1416
-msgid "Misawa Ab"
-msgstr "Misawa Ab"
+#~ msgid "Fort Lauderdale (International)"
+#~ msgstr "Fuerte Lauderdale (International)"
 
-#: my-evolution/Locations.h:1417
-msgid "Mississippi"
-msgstr "Misisipi"
+#~ msgid "Fort Leonard"
+#~ msgstr "Fuerte Leonard"
 
-#: my-evolution/Locations.h:1418
-msgid "Missoula"
-msgstr "Missoula"
+#~ msgid "Fort Lewis"
+#~ msgstr "Fuerte Lewis"
 
-#: my-evolution/Locations.h:1419
-msgid "Missouri"
-msgstr "Missouri"
+#~ msgid "Fort Madison"
+#~ msgstr "Fuerte Madison"
 
-#: my-evolution/Locations.h:1420
-msgid "Mitchell"
-msgstr "Mitchell"
+#~ msgid "Fort Meade"
+#~ msgstr "Fuerte Meade"
 
-#: my-evolution/Locations.h:1421
-msgid "Mitilini"
-msgstr "Mitilini"
+#~ msgid "Fort Myers (Page Field)"
+#~ msgstr "Fuerte Myers (Page Field)"
 
-#: my-evolution/Locations.h:1422
-msgid "Miyakejima Airport"
-msgstr "Miyakejima Airport"
+#~ msgid "Fort Myers (Southwest Florida International)"
+#~ msgstr "Fuerte Myers (Southwest Florida International)"
 
-#: my-evolution/Locations.h:1423
-msgid "Miyazaki Airport"
-msgstr "Miyazaki Airport"
+#~ msgid "Fort Polk-Leesville"
+#~ msgstr "Fuerte Polk-Leesville"
 
-#: my-evolution/Locations.h:1424
-msgid "Moa"
-msgstr "Moa"
+#~ msgid "Fort Riley"
+#~ msgstr "Fuerte Riley"
 
-#: my-evolution/Locations.h:1425
-msgid "Mobile Downtown"
-msgstr "Mobile Downtown"
+#~ msgid "Fort Sill"
+#~ msgstr "Fuerte Sill"
 
-#: my-evolution/Locations.h:1426
-msgid "Mobile Regional Airport"
-msgstr "Mobile Regional Airport"
+#~ msgid "Fort Smith"
+#~ msgstr "Fuerte Smith"
 
-#: my-evolution/Locations.h:1427
-msgid "Mobridge"
-msgstr "Mobridge"
+#~ msgid "Fort Stewart"
+#~ msgstr "Fuerte Stewart"
 
-#: my-evolution/Locations.h:1428
-msgid "Modesto"
-msgstr "Modesto"
+#~ msgid "Fort Stockton"
+#~ msgstr "Fuerte Stockton"
 
-#: my-evolution/Locations.h:1429
-msgid "Mo I Rana"
-msgstr "Mo I Rana"
+#~ msgid "Fort Wayne"
+#~ msgstr "Fuerte Wayne"
 
-#: my-evolution/Locations.h:1430
-msgid "Mojave"
-msgstr "Mojave"
+#~ msgid "Fort Worth-Alliance"
+#~ msgstr "Fuerte Worth-Alliance"
 
-#: my-evolution/Locations.h:1431
-msgid "Molde"
-msgstr "Molde"
+#~ msgid "Fort Worth-Meacham"
+#~ msgstr "Fuerte Worth-Meacham"
 
-#: my-evolution/Locations.h:1432
-msgid "Moldova"
-msgstr "Moldova"
+#~ msgid "Fort Worth NAS"
+#~ msgstr "Fuerte Worth NAS"
 
-#: my-evolution/Locations.h:1433
-msgid "Moline-Quad Cities"
-msgstr "Moline-Quad Cities"
+#~ msgid "Fourchon"
+#~ msgstr "Fourchon"
 
-#: my-evolution/Locations.h:1434
-msgid "Molokai"
-msgstr "Molokai"
+#~ msgid "Foz Do Iguacu"
+#~ msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:1435
-msgid "Mombetsu Airport"
-msgstr "Mombetsu Airport"
+#~ msgid "Frankfort"
+#~ msgstr "Frankfurt"
 
-#: my-evolution/Locations.h:1436
-msgid "Monchengladbach"
-msgstr "Monchengladbach"
+#~ msgid "Frankfurt/Main"
+#~ msgstr "Frankfurt/Main"
 
-#: my-evolution/Locations.h:1437
-msgid "Monclova"
-msgstr "Monclova"
+#~ msgid "Franklin"
+#~ msgstr "Franklin"
 
-#: my-evolution/Locations.h:1438
-msgid "Moncton"
-msgstr "Moncton"
+#~ msgid "Fredericton"
+#~ msgstr "Fredericton"
 
-#: my-evolution/Locations.h:1439
-msgid "Monida"
-msgstr "Monida"
+#~ msgid "Freeport"
+#~ msgstr "Freeport"
 
-#: my-evolution/Locations.h:1440
-msgid "Monpellier-Mediterrannee"
-msgstr "Monpellier-Mediterrannee"
+#~ msgid "Frenchville"
+#~ msgstr "Frenchville"
 
-#: my-evolution/Locations.h:1441
-msgid "Monroe"
-msgstr "Monroe"
+#~ msgid "Fresno"
+#~ msgstr "Fresno"
 
-#: my-evolution/Locations.h:1442
-msgid "Montague"
-msgstr "Montague"
+#~ msgid "Fresno-Chandler"
+#~ msgstr "Fresno-Chandler"
 
-#: my-evolution/Locations.h:1443
-msgid "Montana"
-msgstr "Montana"
+#~ msgid "Friday Harbor"
+#~ msgstr "Friday Harbor"
 
-#: my-evolution/Locations.h:1444
-msgid "Mont-de-Marsan"
-msgstr "Mont-de-Marsan"
+#~ msgid "Friedrichshafen"
+#~ msgstr "Friedrichshafen"
 
-#: my-evolution/Locations.h:1445
-msgid "Monte Argentario"
-msgstr "Monte Argentario"
+#~ msgid "Frigg"
+#~ msgstr "Frigg"
 
-#: my-evolution/Locations.h:1446
-msgid "Monte Bisbino"
-msgstr "Monte Bisbino"
+#~ msgid "Frontone"
+#~ msgstr "Frontone"
 
-#: my-evolution/Locations.h:1447
-msgid "Monte Calamita"
-msgstr "Monte Calamita"
+#~ msgid "Frosinone"
+#~ msgstr "Frosinone"
 
-#: my-evolution/Locations.h:1448
-msgid "Monte Cimone"
-msgstr "Monte Cimone"
+#~ msgid "Fryeburg"
+#~ msgstr "Fryeburg"
 
-#: my-evolution/Locations.h:1449
-msgid "Montego Bay"
-msgstr "Montego Bay"
+#~ msgid "Fujairah"
+#~ msgstr "Fujairah"
 
-#: my-evolution/Locations.h:1450
-msgid "Monte Malanotte"
-msgstr "Monte Malanotte"
+#~ msgid "Fuji Ab"
+#~ msgstr "Fuji Ab"
 
-#: my-evolution/Locations.h:1451
-msgid "Monterey"
-msgstr "Monterey"
+#~ msgid "Fukue Airport"
+#~ msgstr "Aeropuerto de Fukue"
 
-#: my-evolution/Locations.h:1452
-msgid "Monterrey"
-msgstr "Monterrey"
+#~ msgid "Fukui Airport"
+#~ msgstr "Aeropuerto de Fukui"
 
-#: my-evolution/Locations.h:1453
-msgid "Monte Scuro"
-msgstr "Monte Scuro"
+#~ msgid "Fukuoka Airport"
+#~ msgstr "Aeropuerto de Fukuoka"
 
-#: my-evolution/Locations.h:1454
-msgid "Monte Terminillo"
-msgstr "Monte Terminillo"
+#~ msgid "Fullerton"
+#~ msgstr "Fullerton"
 
-#: my-evolution/Locations.h:1455
-msgid "Montevideo/Carrasco"
-msgstr "Montevideo/Carrasco"
+#~ msgid "Funchal"
+#~ msgstr "Funchal"
 
-#: my-evolution/Locations.h:1456
-msgid "Montgomery"
-msgstr "Montgomery"
+#~ msgid "FYR Macedonia"
+#~ msgstr "FYR Macedonia"
 
-#: my-evolution/Locations.h:1457
-msgid "Montgomery-Maxwell AFB"
-msgstr "Montgomery-Maxwell AFB"
+#~ msgid "Gadsden"
+#~ msgstr "Gadsden"
 
-#: my-evolution/Locations.h:1458
-msgid "Monticello"
-msgstr "Monticello"
+#~ msgid "Gage"
+#~ msgstr "Gage"
 
-#: my-evolution/Locations.h:1459
-msgid "Montpelier"
-msgstr "Montpelier"
+#~ msgid "Gainesville"
+#~ msgstr "Gainesville"
 
-#: my-evolution/Locations.h:1460
-msgid "Montreal Dorval"
-msgstr "Montreal Dorval"
+#~ msgid "Galax-Hillsville"
+#~ msgstr "Galax-Hillsville"
 
-#: my-evolution/Locations.h:1461
-msgid "Montreal Mirabel"
-msgstr "Montreal Mirabel"
+#~ msgid "Galbraith Lake"
+#~ msgstr "Lago Galbraith"
 
-#: my-evolution/Locations.h:1462
-msgid "Montreal Saint-Hubert"
-msgstr "Montreal Saint-Hubert"
+#~ msgid "Galeao"
+#~ msgstr "Galeao"
 
-#: my-evolution/Locations.h:1463
-msgid "Montrose"
-msgstr "Montrose"
+#~ msgid "Galena"
+#~ msgstr "Galena"
 
-#: my-evolution/Locations.h:1464
-msgid "Montrose (2)"
-msgstr "Montrose (2)"
+#~ msgid "Galesburg"
+#~ msgstr "Galesburg"
 
-#: my-evolution/Locations.h:1465
-msgid "Morelia"
-msgstr "Morelia"
+#~ msgid "Gallup"
+#~ msgstr "Gallup"
 
-#: my-evolution/Locations.h:1466
-msgid "Morgantown"
-msgstr "Morgantown"
+#~ msgid "Galveston"
+#~ msgstr "Galveston"
 
-#: my-evolution/Locations.h:1467
-msgid "Moriarty"
-msgstr "Moriarty"
+#~ msgid "Gambell"
+#~ msgstr "Gambell"
 
-#: my-evolution/Locations.h:1469
-msgid "Morristown"
-msgstr "Morristown"
+#~ msgid "Gander"
+#~ msgstr "Gander"
 
-#: my-evolution/Locations.h:1470
-msgid "Moscow Domodedovo"
-msgstr "Moscú Domodedovo"
+#~ msgid "Garden City"
+#~ msgstr "Garden City"
 
-#: my-evolution/Locations.h:1471
-msgid "Moscow Sheremetyevo"
-msgstr "Moscú Sheremetyevo"
+#~ msgid "Gary"
+#~ msgstr "Gary"
 
-#: my-evolution/Locations.h:1472
-msgid "Moses Lake"
-msgstr "Moses Lake"
+#~ msgid "Gassim"
+#~ msgstr "Gassim"
 
-#: my-evolution/Locations.h:1473
-msgid "Mosinee"
-msgstr "Mosinee"
+#~ msgid "Gatineau"
+#~ msgstr "Gatineau"
 
-#: my-evolution/Locations.h:1474
-msgid "Mosjoen"
-msgstr "Mosjoen"
+#~ msgid "Gaziantep"
+#~ msgstr "Gaziantep"
 
-#: my-evolution/Locations.h:1475
-msgid "Moultrie"
-msgstr "Moultrie"
+#~ msgid "Gdansk"
+#~ msgstr "Gdansk"
 
-#: my-evolution/Locations.h:1476
-msgid "Mountain Home"
-msgstr "Mountain Home"
+#~ msgid "Geneve"
+#~ msgstr "Geneve"
 
-#: my-evolution/Locations.h:1477
-msgid "Mountain View"
-msgstr "Mountain View"
+#~ msgid "Genova"
+#~ msgstr "Génova"
 
-#: my-evolution/Locations.h:1478
-msgid "Mount Clemens"
-msgstr "Mount Clemens"
+#~ msgid "George Airport"
+#~ msgstr "Aeropuerto de George"
 
-#: my-evolution/Locations.h:1479
-msgid "Mount Holly"
-msgstr "Mount Holly"
+#~ msgid "Georgetown"
+#~ msgstr "Georgetown"
 
-#: my-evolution/Locations.h:1480
-msgid "Mount Shasta"
-msgstr "Mount Shasta"
+#~ msgid "Ghardaia"
+#~ msgstr "Ghardaia"
 
-#: my-evolution/Locations.h:1481
-msgid "Mount Vernon"
-msgstr "Mount Vernon"
+#~ msgid "Ghedi"
+#~ msgstr "Ghedi"
 
-#: my-evolution/Locations.h:1482
-msgid "Mount Wilson"
-msgstr "Mount Wilson"
+#~ msgid "Gifu Ab"
+#~ msgstr "Gifu Ab"
 
-#: my-evolution/Locations.h:1483
-msgid "Mt Washington"
-msgstr "Mt Washington"
+#~ msgid "Gila Bend"
+#~ msgstr "Gila Bend"
 
-#: my-evolution/Locations.h:1484
-msgid "Mugla/Dalaman"
-msgstr "Mugla/Dalaman"
+#~ msgid "Gillette"
+#~ msgstr "Gillette"
 
-#: my-evolution/Locations.h:1485
-msgid "Muir"
-msgstr "Muir"
+#~ msgid "Gilze-Rijen"
+#~ msgstr "Gilze-Rijen"
 
-#: my-evolution/Locations.h:1486
-msgid "Mullan"
-msgstr "Mullan"
+#~ msgid "Gioia del Colle"
+#~ msgstr "Gioia del Colle"
 
-#: my-evolution/Locations.h:1487
-msgid "Mullen"
-msgstr "Mullen"
+#~ msgid "Girona"
+#~ msgstr "Gerona"
 
-#: my-evolution/Locations.h:1488
-msgid "Munchen"
-msgstr "Munchen"
+#~ msgid "Gizan"
+#~ msgstr "Gizan"
 
-#: my-evolution/Locations.h:1489
-msgid "Muncie"
-msgstr "Muncie"
+#~ msgid "Glasgow"
+#~ msgstr "Glasgow"
 
-#: my-evolution/Locations.h:1490
-msgid "Munster/Osnabruck"
-msgstr "Munster/Osnabruck"
+#~ msgid "Glendive"
+#~ msgstr "Glendive"
 
-#: my-evolution/Locations.h:1491
-msgid "Murcia"
-msgstr "Murcia"
+#~ msgid "Glens Falls"
+#~ msgstr "Glens Falls"
 
-#: my-evolution/Locations.h:1492
-msgid "Murmansk"
-msgstr "Murmansk"
+#~ msgid "Goiania"
+#~ msgstr "Goiania"
 
-#: my-evolution/Locations.h:1493
-msgid "Mus"
-msgstr "Mus"
+#~ msgid "Goldsboro"
+#~ msgstr "Goldsboro"
 
-#: my-evolution/Locations.h:1494
-msgid "Muscatine"
-msgstr "Muscaline"
+#~ msgid "Goodland"
+#~ msgstr "Goodland"
 
-#: my-evolution/Locations.h:1495
-msgid "Muscle Shoals"
-msgstr "Muscle Shoals"
+#~ msgid "Goose Bay"
+#~ msgstr "Goose Bay"
 
-#: my-evolution/Locations.h:1496
-msgid "Muskegon"
-msgstr "Muskegon"
+#~ msgid "Goteborg (Landvetter)"
+#~ msgstr "Goteborg (Landvetter)"
 
-#: my-evolution/Locations.h:1497
-msgid "Mykonos"
-msgstr "Mykonos"
+#~ msgid "Goteborg (Save)"
+#~ msgstr "Goteborg (Save)"
 
-#: my-evolution/Locations.h:1498
-msgid "Myrtle Beach"
-msgstr "Myrtle Beach"
+#~ msgid "Granada"
+#~ msgstr "Granada"
 
-#: my-evolution/Locations.h:1499
-msgid "Nabesna/Devil Mt."
-msgstr "Nabesna/Devil Mt."
+#~ msgid "Grand Canyon"
+#~ msgstr "Gran Cañón"
 
-#: my-evolution/Locations.h:1500
-msgid "Nacogdoches"
-msgstr "Nacogdoches"
+#~ msgid "Grand Cayman"
+#~ msgstr "Grand Cayman"
 
-#: my-evolution/Locations.h:1501
-msgid "Nagasaki Airport"
-msgstr "Nagasaki Airport"
+#~ msgid "Grand Forks"
+#~ msgstr "Grand Forks"
 
-#: my-evolution/Locations.h:1502
-msgid "Nagoya Airport"
-msgstr "Nagoya Airport"
+#~ msgid "Grand Island"
+#~ msgstr "Grand Island"
 
-#: my-evolution/Locations.h:1503
-msgid "Nagpur Sonegaon"
-msgstr "Nagpur Sonegaon"
+#~ msgid "Grand Isle"
+#~ msgstr "Grand Isle"
 
-#: my-evolution/Locations.h:1504
-msgid "Naha Airport"
-msgstr "Naha Airport"
+#~ msgid "Grand Junction"
+#~ msgstr "Grand Junction"
 
-#: my-evolution/Locations.h:1505
-msgid "Najran"
-msgstr "Najran"
+#~ msgid "Grand Marais"
+#~ msgstr "Grand Marais"
 
-#: my-evolution/Locations.h:1506
-msgid "Nakashibetsu Airport"
-msgstr "Nakashibetsu Airport"
+#~ msgid "Grand Rapids"
+#~ msgstr "Grand Rapids"
 
-#: my-evolution/Locations.h:1507
-msgid "Nalchik"
-msgstr "Nalchik"
+#~ msgid "Grandview"
+#~ msgstr "Grandview"
 
-#: my-evolution/Locations.h:1508
-msgid "Namsos"
-msgstr "Namsos"
+#~ msgid "Grangeville"
+#~ msgstr "Grangeville"
 
-#: my-evolution/Locations.h:1509
-msgid "Nancy-Essey"
-msgstr "Nancy-Essey"
+#~ msgid "Grants"
+#~ msgstr "Grants"
 
-#: my-evolution/Locations.h:1510
-msgid "Nancy-Ochey"
-msgstr "Nancy-Ochey"
+#~ msgid "Graz"
+#~ msgstr "Graz"
 
-#: my-evolution/Locations.h:1511
-msgid "Nankishirahama Airport"
-msgstr "Nankishirahama Airport"
+#~ msgid "Great Falls"
+#~ msgstr "Great Falls"
 
-#: my-evolution/Locations.h:1512
-msgid "Nanning"
-msgstr "Nanning"
+#~ msgid "Greeley"
+#~ msgstr "Greeley"
 
-#: my-evolution/Locations.h:1513
-msgid "Nantes Adlantique"
-msgstr "Nantes Adlantique"
+#~ msgid "Green Bay"
+#~ msgstr "Green Bay"
 
-#: my-evolution/Locations.h:1514
-msgid "Nantucket"
-msgstr "Nantucket"
+#~ msgid "Green River"
+#~ msgstr "Green River"
 
-#: my-evolution/Locations.h:1515
-msgid "Napa"
-msgstr "Napa"
+#~ msgid "Greensboro"
+#~ msgstr "Greensboro"
 
-#: my-evolution/Locations.h:1516
-msgid "Naples"
-msgstr "Nápoles"
+#~ msgid "Greenville"
+#~ msgstr "Greenville"
 
-#: my-evolution/Locations.h:1517
-msgid "Napoli"
-msgstr "Napoli"
+#~ msgid "Greenville-Spartanburg"
+#~ msgstr "Greenville-Spartanburg"
 
-#: my-evolution/Locations.h:1518
-msgid "Narvik"
-msgstr "Narvik"
+#~ msgid "Greenwood"
+#~ msgstr "Greenwood"
 
-#: my-evolution/Locations.h:1519
-msgid "Nasa Shuttle"
-msgstr "Nasa Shuttle"
+#~ msgid "Grenoble-Saint-Geoirs"
+#~ msgstr "Grenoble-Saint-Geoirs"
 
-#: my-evolution/Locations.h:1520
-msgid "Nashua"
-msgstr "Nashua"
+#~ msgid "Griffiss AFB"
+#~ msgstr "Griffiss AFB"
 
-#: my-evolution/Locations.h:1521
-msgid "Nashville"
-msgstr "Nashville"
+#~ msgid "Groningen"
+#~ msgstr "Groningen"
 
-#: my-evolution/Locations.h:1522
-msgid "Nassau"
-msgstr "Nassau"
+#~ msgid "Grosseto"
+#~ msgstr "Grosseto"
 
-#: my-evolution/Locations.h:1523
-msgid "Natal"
-msgstr "Natal"
+#~ msgid "Groton"
+#~ msgstr "Groton"
 
-#: my-evolution/Locations.h:1524
-msgid "Natchez"
-msgstr "Natchez"
+#~ msgid "Guadalajara"
+#~ msgstr "Guadalajara"
 
-#: my-evolution/Locations.h:1525
-msgid "Nawabshah"
-msgstr "Nawabshah"
+#~ msgid "Guadalupe Pass"
+#~ msgstr "Paso de Guadalupe"
 
-#: my-evolution/Locations.h:1526
-msgid "Nebraska"
-msgstr "Nebraska"
+#~ msgid "Guanare"
+#~ msgstr "Guanare"
 
-#: my-evolution/Locations.h:1527
-msgid "Needles"
-msgstr "Needles"
+#~ msgid "Guangzhou"
+#~ msgstr "Guangzhou"
 
-#: my-evolution/Locations.h:1528
-msgid "Nenana"
-msgstr "Nenana"
+#~ msgid "Guantanamo"
+#~ msgstr "Guantánamo"
 
-#: my-evolution/Locations.h:1530
-msgid "Neuquen"
-msgstr "Neuquen"
+#~ msgid "Guarany"
+#~ msgstr "Guaraní"
 
-#: my-evolution/Locations.h:1531
-msgid "Nevada"
-msgstr "Nevada"
+#~ msgid "Guaratingueta"
+#~ msgstr "Guarantingueta"
 
-#: my-evolution/Locations.h:1532
-msgid "Newark"
-msgstr "Newark"
+#~ msgid "Guarulhos"
+#~ msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:1533
-msgid "New Bedford"
-msgstr "New Bedford"
+#~ msgid "Guayaquil/Simon Bolivar"
+#~ msgstr "Guayaquil/Simon Bolivar"
 
-#: my-evolution/Locations.h:1534
-msgid "New Bern"
-msgstr "New Bern"
+#~ msgid "Guaymas"
+#~ msgstr "Guaymas"
 
-#: my-evolution/Locations.h:1535
-msgid "New Braunfels"
-msgstr "New Braunfels"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
 
-#: my-evolution/Locations.h:1536
-msgid "New Brunswick"
-msgstr "New Brunswick"
+#~ msgid "Guidonia"
+#~ msgstr "Guidonia"
 
-#: my-evolution/Locations.h:1537
-msgid "Newburgh"
-msgstr "Newburgh"
+#~ msgid "Gulfport"
+#~ msgstr "Gulfport"
 
-#: my-evolution/Locations.h:1538
-msgid "Newcastle"
-msgstr "Newcastle"
+#~ msgid "Gulkana"
+#~ msgstr "Gulkana"
 
-#: my-evolution/Locations.h:1539
-msgid "New Delhi/Palam"
-msgstr "New Delhi/Palam"
+#~ msgid "Gullfax C"
+#~ msgstr "Gullfax C"
 
-#: my-evolution/Locations.h:1540
-msgid "Newfoundland"
-msgstr "Newfoundland"
+#~ msgid "Gunnison"
+#~ msgstr "Gunnison"
 
-#: my-evolution/Locations.h:1541
-msgid "New Hampshire"
-msgstr "New Hampshire"
+#~ msgid "Gunnison (2)"
+#~ msgstr "Gunnison (2)"
 
-#: my-evolution/Locations.h:1542
-msgid "New Haven"
-msgstr "New Haven"
+#~ msgid "Guriat"
+#~ msgstr "Guriat"
 
-#: my-evolution/Locations.h:1543
-msgid "New Iberia"
-msgstr "New Iberia"
+#~ msgid "Gustavus"
+#~ msgstr "Gustavus"
 
-#: my-evolution/Locations.h:1544
-msgid "New Jersey"
-msgstr "Nueva Jersey"
+#~ msgid "Guymon"
+#~ msgstr "Guymon"
 
-#: my-evolution/Locations.h:1545
-msgid "New Mexico"
-msgstr "Nuevo México"
+#~ msgid "Habana"
+#~ msgstr "La Habana"
 
-#: my-evolution/Locations.h:1546
-msgid "New Orleans"
-msgstr "Nueva Orleans"
+#~ msgid "Hachijojima Airport"
+#~ msgstr "Hachijojima Airport"
 
-#: my-evolution/Locations.h:1547
-msgid "New Orleans-Lakefront"
-msgstr "Nueva Orleans-Lakefront"
+#~ msgid "Hachinohe Ab"
+#~ msgstr "Hachinohe Ab"
 
-#: my-evolution/Locations.h:1548
-msgid "New Orleans NAS"
-msgstr "Nueva Orleans NAS"
+#~ msgid "Hafr Al-Batin"
+#~ msgstr "Hafr Al-Batin"
 
-#: my-evolution/Locations.h:1549
-msgid "Newport"
-msgstr "Newport"
+#~ msgid "Hagerstown"
+#~ msgstr "Hagerstown"
 
-#: my-evolution/Locations.h:1550
-msgid "Newport News"
-msgstr "Newport News"
+#~ msgid "Hail"
+#~ msgstr "Granizo"
 
-#: my-evolution/Locations.h:1551
-msgid "New Port Richey"
-msgstr "New Port Richey"
+#~ msgid "Hailey-Sun Valley"
+#~ msgstr "Hailey-Sun Valley"
 
-#: my-evolution/Locations.h:1552
-msgid "New River"
-msgstr "New River"
+#~ msgid "Haines"
+#~ msgstr "Haines"
 
-#: my-evolution/Locations.h:1553
-msgid "New Tokyo International Airport"
-msgstr "New Tokyo International Airport"
+#~ msgid "Hakodate Airport"
+#~ msgstr "Aeropuerto Hakodate"
 
-#: my-evolution/Locations.h:1554
-msgid "Newton"
-msgstr "Newton"
+#~ msgid "Halifax"
+#~ msgstr "Halifax"
 
-#: my-evolution/Locations.h:1555
-msgid "New York"
-msgstr "Nueva York"
+#~ msgid "Hamamatsu Ab"
+#~ msgstr "Hamamatsu Ab"
 
-#: my-evolution/Locations.h:1556
-msgid "New York-JFK Arpt"
-msgstr "New York-JFK Arpt"
+#~ msgid "Hamburg"
+#~ msgstr "Hamburg"
 
-#: my-evolution/Locations.h:1557
-msgid "New York-La Guardia"
-msgstr "New York-La Guardia"
+#~ msgid "Hamburg-Finkenwerder"
+#~ msgstr "Hamburg-Finkenwerder"
 
-#: my-evolution/Locations.h:1559
-msgid "Niagara Falls"
-msgstr "Cataratas del Niágara"
+#~ msgid "Hamilton"
+#~ msgstr "Hamilton"
 
-#: my-evolution/Locations.h:1561
-msgid "Nice-Cote d'Azur"
-msgstr "Niza-Costa Azul"
+#~ msgid "Hammerfest"
+#~ msgstr "Hammerfest"
 
-#: my-evolution/Locations.h:1562
-msgid "Niigata Airport"
-msgstr "Niigata Airport"
+#~ msgid "Hampton"
+#~ msgstr "Hampton"
 
-#: my-evolution/Locations.h:1563
-msgid "Nimes-Garons"
-msgstr "Nimes-Garons"
+#~ msgid "Hanamaki Airport"
+#~ msgstr "Aeropuerto Hanamaki"
 
-#: my-evolution/Locations.h:1564
-msgid "Nipawin"
-msgstr "Nipawin"
+#~ msgid "Hancock"
+#~ msgstr "Hancock"
 
-#: my-evolution/Locations.h:1565
-msgid "Nis"
-msgstr "Nis"
+#~ msgid "Hangzhou"
+#~ msgstr "Hangzhou"
 
-#: my-evolution/Locations.h:1566
-msgid "Nizhny Novgorod"
-msgstr "Nizhny Novgorod"
+#~ msgid "Hanksville"
+#~ msgstr "Hanksville"
 
-#: my-evolution/Locations.h:1567
-msgid "N Las Vegas"
-msgstr "N Las Vegas"
+#~ msgid "Hannover"
+#~ msgstr "Hannover"
 
-#: my-evolution/Locations.h:1568
-msgid "N Myrtle Beach"
-msgstr "N Myrtle Beach"
+#~ msgid "Ha Noi"
+#~ msgstr "Hanoi"
 
-#: my-evolution/Locations.h:1569
-msgid "Nogales"
-msgstr "Nogales"
+#~ msgid "Harbor Beach"
+#~ msgstr "Harbor Beach"
 
-#: my-evolution/Locations.h:1570
-msgid "Nome"
-msgstr "Nome"
+#~ msgid "Harlingen"
+#~ msgstr "Harlingen"
 
-#: my-evolution/Locations.h:1571
-msgid "Norfolk"
-msgstr "Norfolk"
+#~ msgid "Harlowton"
+#~ msgstr "Harlowton"
 
-#: my-evolution/Locations.h:1573
-msgid "Norfolk NAS"
-msgstr "Norfolk NAS"
+#~ msgid "Harrisburg"
+#~ msgstr "Harrisburg"
 
-#: my-evolution/Locations.h:1574
-msgid "Norrkoping"
-msgstr "Norrkoping"
+#~ msgid "Harrison"
+#~ msgstr "Harrison"
 
-#: my-evolution/Locations.h:1575
-msgid "North Adams"
-msgstr "North Adams"
+#~ msgid "Harstad/Narvik/Evenes"
+#~ msgstr "Harstad/Narvik/Evenes"
 
-#: my-evolution/Locations.h:1576
-msgid "North Bend"
-msgstr "North Bend"
+#~ msgid "Hartford"
+#~ msgstr "Hartford"
 
-#: my-evolution/Locations.h:1577
-msgid "North Carolina"
-msgstr "Carolina del Norte"
+#~ msgid "Hassi-Messaoud"
+#~ msgstr "Hassi-Messaoud"
 
-#: my-evolution/Locations.h:1578
-msgid "North Conway"
-msgstr "North Conway"
+#~ msgid "Hastings"
+#~ msgstr "Hastings"
 
-#: my-evolution/Locations.h:1579
-msgid "North Dakota"
-msgstr "Dakota del Norte"
+#~ msgid "Haugesund"
+#~ msgstr "Haugesund"
 
-#: my-evolution/Locations.h:1580
-msgid "Northeast Philadelphia"
-msgstr "Northeast Philadelphia"
+#~ msgid "Havre"
+#~ msgstr "Havre"
 
-#: my-evolution/Locations.h:1581
-msgid "North Kingstown"
-msgstr "North Kingstown"
+#~ msgid "Hawaii"
+#~ msgstr "Hawaii"
 
-#: my-evolution/Locations.h:1582
-msgid "North Platte"
-msgstr "North Platte"
+#~ msgid "Hawthorne"
+#~ msgstr "Hawthorne"
 
-#: my-evolution/Locations.h:1583
-msgid "Northway"
-msgstr "Northway"
+#~ msgid "Hayden"
+#~ msgstr "Hayden"
 
-#: my-evolution/Locations.h:1584
-msgid "Northwest Territories"
-msgstr "Northwest Territories"
+#~ msgid "Hayes River"
+#~ msgstr "Hayes River"
 
-#: my-evolution/Locations.h:1586
-msgid "Norwich"
-msgstr "Norwich"
+#~ msgid "Hays"
+#~ msgstr "Hays"
 
-#: my-evolution/Locations.h:1587
-msgid "Norwood"
-msgstr "Norwood"
+#~ msgid "Hayward"
+#~ msgstr "Hayward"
 
-#: my-evolution/Locations.h:1588
-msgid "Notodden"
-msgstr "Notodden"
+#~ msgid "Healy River"
+#~ msgstr "Healy River"
 
-#: my-evolution/Locations.h:1589
-msgid "Novara/Cameri"
-msgstr "Novara/Cameri"
+#~ msgid "Helena"
+#~ msgstr "Helena"
 
-#: my-evolution/Locations.h:1590
-msgid "Nova Scotia"
-msgstr "Nueva Escocia"
+#~ msgid "Helsinki"
+#~ msgstr "Helsinki"
 
-#: my-evolution/Locations.h:1591
-msgid "Novosibirsk"
-msgstr "Novosibirsk"
+#~ msgid "Henderson"
+#~ msgstr "Henderson"
 
-#: my-evolution/Locations.h:1592
-msgid "Nueva Gerona"
-msgstr "Nueva Gerona"
+#~ msgid "Hengchun"
+#~ msgstr "Hengchun"
 
-#: my-evolution/Locations.h:1593
-msgid "Nueva Ocotepeque"
-msgstr "Nueva Ocotepeque"
+#~ msgid "Hermosillo"
+#~ msgstr "Hermosillo"
 
-#: my-evolution/Locations.h:1594
-msgid "Nuevo Laredo"
-msgstr "Nuevo Laredo"
+#~ msgid "Hibbing"
+#~ msgstr "Hibbing"
 
-#: my-evolution/Locations.h:1595
-msgid "Nurnberg"
-msgstr "Nurnberg"
+#~ msgid "Hickory"
+#~ msgstr "Hickory"
 
-#: my-evolution/Locations.h:1596
-msgid "Nyutabaru Ab"
-msgstr "Nyutabaru Ab"
+#~ msgid "Hill City"
+#~ msgstr "Hill City"
 
-#: my-evolution/Locations.h:1597
-msgid "Oahu"
-msgstr "Oahu"
+#~ msgid "Hillsboro"
+#~ msgstr "Hillsboro"
 
-#: my-evolution/Locations.h:1598
-msgid "Oak Harbor"
-msgstr "Oak Harbor"
+#~ msgid "Hilo"
+#~ msgstr "Hilo"
 
-#: my-evolution/Locations.h:1599
-msgid "Oakland"
-msgstr "Oakland"
+#~ msgid "Hinesville"
+#~ msgstr "Hinesville"
 
-#: my-evolution/Locations.h:1600
-msgid "Oaxaca"
-msgstr "Oaxaca"
+#~ msgid "Hiroshima Airport"
+#~ msgstr "Aeropuerto de Hiroshima"
 
-#: my-evolution/Locations.h:1601
-msgid "Oberpfaffenhofen"
-msgstr "Oberpfaffenhofen"
+#~ msgid "Hobart"
+#~ msgstr "Hobart"
 
-#: my-evolution/Locations.h:1602
-msgid "Obihiro Airport"
-msgstr "Obihiro Airport"
+#~ msgid "Hobbs"
+#~ msgstr "Hobbs"
 
-#: my-evolution/Locations.h:1603
-msgid "Ocala"
-msgstr "Ocala"
+#~ msgid "Ho Chi Minh"
+#~ msgstr "Ho Chi Minh"
 
-#: my-evolution/Locations.h:1604
-msgid "Oceanside"
-msgstr "Oceanside"
+#~ msgid "Hodeidah"
+#~ msgstr "Hodeidah"
 
-#: my-evolution/Locations.h:1605
-msgid "Odense"
-msgstr "Odense"
+#~ msgid "Hof"
+#~ msgstr "Hof"
 
-#: my-evolution/Locations.h:1606
-msgid "Odesa"
-msgstr "Odesa"
+#~ msgid "Hoffman"
+#~ msgstr "Hoffman"
 
-#: my-evolution/Locations.h:1607
-msgid "Oelwen"
-msgstr "Oelwen"
+#~ msgid "Hofu Ab"
+#~ msgstr "Hofu Ab"
 
-#: my-evolution/Locations.h:1608
-msgid "Ogden"
-msgstr "Ogden"
+#~ msgid "Hohenems"
+#~ msgstr "Hohenems"
 
-#: my-evolution/Locations.h:1609
-msgid "Ogden-Hill AFB"
-msgstr "Ogden-Hill AFB"
+#~ msgid "Holguin"
+#~ msgstr "Holguin"
 
-#: my-evolution/Locations.h:1610
-msgid "Ogdensburg"
-msgstr "Ogdensburg"
+#~ msgid "Homer"
+#~ msgstr "Homer"
 
-#: my-evolution/Locations.h:1611
-msgid "Ohio"
-msgstr "Ohio"
+#~ msgid "Homestead AFB"
+#~ msgstr "Homestead AFB"
 
-#: my-evolution/Locations.h:1612
-msgid "Ohrid"
-msgstr "Ohrid"
+#~ msgid "Hondo"
+#~ msgstr "Hondo"
 
-#: my-evolution/Locations.h:1613
-msgid "Oita Airport"
-msgstr "Oita Airport"
+#~ msgid "Honningsvag"
+#~ msgstr "Honningsvag"
 
-#: my-evolution/Locations.h:1614
-msgid "Ojika Island"
-msgstr "Ojika Island"
+#~ msgid "Honolulu"
+#~ msgstr "Honolulú"
 
-#: my-evolution/Locations.h:1615
-msgid "Okayama Airport"
-msgstr "Okayama Airport"
+#~ msgid "Hoonah"
+#~ msgstr "Hoonah"
 
-#: my-evolution/Locations.h:1616
-msgid "Oki Airport"
-msgstr "Oki Airport"
+#~ msgid "Hoquiam"
+#~ msgstr "Hoquiam"
 
-#: my-evolution/Locations.h:1617
-msgid "Okinoerabu"
-msgstr "Okinoerabu"
+#~ msgid "Hot Springs"
+#~ msgstr "Hot Springs"
 
-#: my-evolution/Locations.h:1618
-msgid "Oklahoma"
-msgstr "Oklahoma"
+#~ msgid "Houghton Lake"
+#~ msgstr "Houghton Lake"
 
-#: my-evolution/Locations.h:1619
-msgid "Oklahoma City"
-msgstr "Oklahoma City"
+#~ msgid "Houlton"
+#~ msgstr "Houlton"
 
-#: my-evolution/Locations.h:1620
-msgid "Oklahoma City-Bethany"
-msgstr "Oklahoma City-Bethany"
+#~ msgid "Houma"
+#~ msgstr "Houma"
 
-#: my-evolution/Locations.h:1621
-msgid "Oklahoma City-Midwest City"
-msgstr "Oklahoma City-Midwest City"
+#~ msgid "Houston-Bush"
+#~ msgstr "Houston-Bush"
 
-#: my-evolution/Locations.h:1622
-msgid "Okushiri Island"
-msgstr "Isla Okushiri"
+#~ msgid "Houston-Clover"
+#~ msgstr "Houston-Clover"
 
-#: my-evolution/Locations.h:1623
-msgid "Olathe"
-msgstr "Olathe"
+#~ msgid "Houston-Ellington Field"
+#~ msgstr "Houston-Ellington Field"
 
-#: my-evolution/Locations.h:1624
-msgid "Olathe/Ind."
-msgstr "Olathe/Ind."
+#~ msgid "Houston-Hobby"
+#~ msgstr "Houston-Hobby"
 
-#: my-evolution/Locations.h:1625
-msgid "Olbia"
-msgstr "Olbia"
+#~ msgid "Houston-Hooks"
+#~ msgstr "Houston-Hooks"
 
-#: my-evolution/Locations.h:1626
-msgid "Olympia"
-msgstr "Olympia"
+#~ msgid "Howard AFB"
+#~ msgstr "Howard AFB"
 
-#: my-evolution/Locations.h:1627
-msgid "Omaha"
-msgstr "Omaha"
+#~ msgid "Hsinchu"
+#~ msgstr "Hsinchu"
 
-#: my-evolution/Locations.h:1628
-msgid "Omaha-Bellevue"
-msgstr "Omaha-Bellevue"
+#~ msgid "Huanuco"
+#~ msgstr "Huanuco"
 
-#: my-evolution/Locations.h:1629
-msgid "Omak"
-msgstr "Omak"
+#~ msgid "Huehuetenango"
+#~ msgstr "Huehuetenango"
 
-#: my-evolution/Locations.h:1631
-msgid "Ominato Ab"
-msgstr "Ominato Ab"
+#~ msgid "Hulien"
+#~ msgstr "Hulien"
 
-#: my-evolution/Locations.h:1632
-msgid "Omsk"
-msgstr "Omsk"
+#~ msgid "Humberside"
+#~ msgstr "Humberside"
 
-#: my-evolution/Locations.h:1633
-msgid "O'Neill"
-msgstr "O'Neill"
+#~ msgid "Huntington"
+#~ msgstr "Huntington"
 
-#: my-evolution/Locations.h:1634
-msgid "Ontario"
-msgstr "Ontario"
+#~ msgid "Huntsville"
+#~ msgstr "Huntsville"
 
-#: my-evolution/Locations.h:1635
-msgid "Oostende"
-msgstr "Oostende"
+#~ msgid "Hurlburt"
+#~ msgstr "Hurlburt"
 
-#: my-evolution/Locations.h:1636
-msgid "Oran"
-msgstr "Orán"
+#~ msgid "Huron"
+#~ msgstr "Huron"
 
-#: my-evolution/Locations.h:1637
-msgid "Oran/Es Senia"
-msgstr "Orán/Es Senia"
+#~ msgid "Hutchinson"
+#~ msgstr "Hutchinson"
 
-#: my-evolution/Locations.h:1638
-msgid "Orange"
-msgstr "Orange"
+#~ msgid "Hyakuri Ab"
+#~ msgstr "Hyakuri Ab"
 
-#: my-evolution/Locations.h:1639
-msgid "Orange City"
-msgstr "Orange City"
+#~ msgid "Hyannis"
+#~ msgstr "Hyannis"
 
-#: my-evolution/Locations.h:1640
-msgid "Ord-Sharp"
-msgstr "Ord-Sharp"
+#~ msgid "Hyderabad"
+#~ msgstr "Hyderabad"
 
-#: my-evolution/Locations.h:1641
-msgid "Oregon"
-msgstr "Oregón"
+#~ msgid "Hyeres-Le Palyvestre"
+#~ msgstr "Hyeres-Le Palyvestre"
 
-#: my-evolution/Locations.h:1642
-msgid "Orenburg"
-msgstr "Orenburg"
+#~ msgid "Iasi"
+#~ msgstr "Iasi"
 
-#: my-evolution/Locations.h:1643
-msgid "Orland"
-msgstr "Orland"
+#~ msgid "Ibiza"
+#~ msgstr "Ibiza"
 
-#: my-evolution/Locations.h:1644
-msgid "Orlando"
-msgstr "Orlando"
+#~ msgid "Ichikawa"
+#~ msgstr "Ichikawa"
 
-#: my-evolution/Locations.h:1645
-msgid "Orlando (Orlando International)"
-msgstr "Orlando (Orlando International)"
+#~ msgid "Idaho"
+#~ msgstr "Idaho"
 
-#: my-evolution/Locations.h:1646
-msgid "Orsta-Volda"
-msgstr "Orsta-Volda"
+#~ msgid "Idaho Falls"
+#~ msgstr "Idaho Falls"
 
-#: my-evolution/Locations.h:1647
-msgid "Oruro"
-msgstr "Oruro"
+#~ msgid "Iguazu"
+#~ msgstr "Iguazú"
 
-#: my-evolution/Locations.h:1648
-msgid "Osaka International Airport"
-msgstr "Aeropuerto Internacional de Osaka"
+#~ msgid "Iki Airport"
+#~ msgstr "Aeropuerto de Iki"
 
-#: my-evolution/Locations.h:1649
-msgid "Osan Ab"
-msgstr "Osan Ab"
+#~ msgid "Ilan"
+#~ msgstr "Ilan"
 
-#: my-evolution/Locations.h:1650
-msgid "Oscoda"
-msgstr "Oscoda"
+#~ msgid "Iliamna"
+#~ msgstr "Iliamna"
 
-#: my-evolution/Locations.h:1651
-msgid "Oseberg A"
-msgstr "Oseberg A"
+#~ msgid "Illinois"
+#~ msgstr "Illinois"
 
-#: my-evolution/Locations.h:1652
-msgid "Oshima Airport"
-msgstr "Oshima Airport"
+#~ msgid "Imperial"
+#~ msgstr "Imperial"
 
-#: my-evolution/Locations.h:1653
-msgid "Oshkosh"
-msgstr "Oshkosh"
+#~ msgid "Imperial (2)"
+#~ msgstr "Imperial (2)"
 
-#: my-evolution/Locations.h:1654
-msgid "Oslo/Gardenmoen"
-msgstr "Oslo/Gardenmoen"
+#~ msgid "Imperial Beach"
+#~ msgstr "Imperial Beach"
 
-#: my-evolution/Locations.h:1655
-msgid "Ostrava"
-msgstr "Ostrava"
+#~ msgid "In Amenas"
+#~ msgstr "In Amenas"
 
-#: my-evolution/Locations.h:1656
-msgid "Ottawa"
-msgstr "Ottawa"
+#~ msgid "Indiana"
+#~ msgstr "Indiana"
 
-#: my-evolution/Locations.h:1657
-msgid "Ottumwa"
-msgstr "Ottumwa"
+#~ msgid "Indianapolis"
+#~ msgstr "Indianápolis"
 
-#: my-evolution/Locations.h:1658
-msgid "Owensboro"
-msgstr "Owensboro"
+#~ msgid "Indian Springs"
+#~ msgstr "Indian Springs"
 
-#: my-evolution/Locations.h:1659
-msgid "Owyhee"
-msgstr "Owyhee"
+#~ msgid "Innsbruck"
+#~ msgstr "Innsbruck"
 
-#: my-evolution/Locations.h:1660
-msgid "Oxford"
-msgstr "Oxford"
+#~ msgid "International Falls"
+#~ msgstr "International Falls"
 
-#: my-evolution/Locations.h:1661
-msgid "Oxnard"
-msgstr "Oxnard"
+#~ msgid "Intracoastal"
+#~ msgstr "Intracoastal"
 
-#: my-evolution/Locations.h:1662
-msgid "Ozark"
-msgstr "Ozark"
+#~ msgid "Inverness"
+#~ msgstr "Inverness"
 
-#: my-evolution/Locations.h:1663
-msgid "Ozuki Ab"
-msgstr "Ozuki Ab"
+#~ msgid "Inyokern"
+#~ msgstr "Inyokern"
 
-#: my-evolution/Locations.h:1664
-msgid "Paderborn-Haxterberg"
-msgstr "Paderborn-Haxterberg"
+#~ msgid "Iowa"
+#~ msgstr "Iowa"
 
-#: my-evolution/Locations.h:1665
-msgid "Padova"
-msgstr "Padova"
+#~ msgid "Iowa City"
+#~ msgstr "Iowa City"
 
-#: my-evolution/Locations.h:1666
-msgid "Paducah"
-msgstr "Paducah"
+#~ msgid "Iqaluit"
+#~ msgstr "Iqaluit"
 
-#: my-evolution/Locations.h:1667
-msgid "Paekado"
-msgstr "Paekado"
+#~ msgid "Iquique/Diego Arac"
+#~ msgstr "Iquique/Diego Arac"
 
-#: my-evolution/Locations.h:1668
-msgid "Paengnyongdo Ab"
-msgstr "Paengnyongdo Ab"
+#~ msgid "Iquitos"
+#~ msgstr "Iquitos"
 
-#: my-evolution/Locations.h:1669
-msgid "Paganella"
-msgstr "Paganella"
+#~ msgid "Iraklion"
+#~ msgstr "Iraklion"
 
-#: my-evolution/Locations.h:1672
-msgid "Pa Kuei/Bakuai"
-msgstr "Pa Kuei/Bakuai"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Irán, República Islámica de"
 
-#: my-evolution/Locations.h:1673
-msgid "Palacios"
-msgstr "Palacios"
+#~ msgid "Iron Mountain"
+#~ msgstr "Iron Mountain"
 
-#: my-evolution/Locations.h:1674
-msgid "Palermo"
-msgstr "Palermo"
+#~ msgid "Ironwood"
+#~ msgstr "Ironwood"
 
-#: my-evolution/Locations.h:1675
-msgid "Palma de Mallorca"
-msgstr "Palma de Mallorca"
+#~ msgid "Iruma Ab"
+#~ msgstr "Iruma Ab"
 
-#: my-evolution/Locations.h:1676
-msgid "Palmdale"
-msgstr "Palmdale"
+#~ msgid "Islamabad"
+#~ msgstr "Islamabad"
 
-#: my-evolution/Locations.h:1677
-msgid "Palmer"
-msgstr "Palmer"
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
 
-#: my-evolution/Locations.h:1678
-msgid "Palm Springs"
-msgstr "Palm Springs"
+#~ msgid "Islip"
+#~ msgstr "Islip"
 
-#: my-evolution/Locations.h:1679
-msgid "Palo Alto"
-msgstr "Palo Alto"
+#~ msgid "Istanbul"
+#~ msgstr "Estambul"
 
-#: my-evolution/Locations.h:1680
-msgid "Pamplona"
-msgstr "Pamplona"
+#~ msgid "Itaituba"
+#~ msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1682
-msgid "Panama City"
-msgstr "Ciudad de Panamá"
+#~ msgid "Ithaca"
+#~ msgstr "Ithaca"
 
-#: my-evolution/Locations.h:1683
-msgid "Pantelleria"
-msgstr "Pantelleria"
+#~ msgid "Ivano-Frankivsk"
+#~ msgstr "Ivano-Frankivsk"
 
-#: my-evolution/Locations.h:1684
-msgid "Papa"
-msgstr "Papa"
+#~ msgid "Iwakuni MCAS"
+#~ msgstr "Iwakuni MCAS"
 
-#: my-evolution/Locations.h:1685
-msgid "Paphos"
-msgstr "Paphos"
+#~ msgid "Iwojima"
+#~ msgstr "Iwojima"
 
-#: my-evolution/Locations.h:1687
-msgid "Paris"
-msgstr "París"
+#~ msgid "Ixtapa"
+#~ msgstr "Ixtapa"
 
-#: my-evolution/Locations.h:1688
-msgid "Paris/Charles De Gaulle"
-msgstr "París/Charles De Gaulle"
+#~ msgid "Izmir/Adnan Menderes"
+#~ msgstr "Izmir/Adnan Menderes"
 
-#: my-evolution/Locations.h:1689
-msgid "Paris/Le Bourget"
-msgstr "París/Le Bourget"
+#~ msgid "Izmir/Cigli"
+#~ msgstr "Izmir/Cigli"
 
-#: my-evolution/Locations.h:1690
-msgid "Paris/Orly"
-msgstr "París/Orly"
+#~ msgid "Izmit"
+#~ msgstr "Izmit"
 
-#: my-evolution/Locations.h:1691
-msgid "Parkersburg"
-msgstr "Parkersburg"
+#~ msgid "Izumo Airport"
+#~ msgstr "Aeropuesto Izumo"
 
-#: my-evolution/Locations.h:1692
-msgid "Pasco"
-msgstr "Pasco"
+#~ msgid "Jackson"
+#~ msgstr "Jackson"
 
-#: my-evolution/Locations.h:1693
-msgid "Paso De Los Libres"
-msgstr "Paso de los Libres"
+#~ msgid "Jacksonville"
+#~ msgstr "Jacksonville"
 
-#: my-evolution/Locations.h:1694
-msgid "Paso Robles"
-msgstr "Paso Robles"
+#~ msgid "Jacksonville-Craig Airport"
+#~ msgstr "Jacksonville-Craig Airport"
 
-#: my-evolution/Locations.h:1695
-msgid "Passo dei Giovi"
-msgstr "Passo dei Giovi"
+#~ msgid "Jacksonville NAS"
+#~ msgstr "Jacksonville NAS"
 
-#: my-evolution/Locations.h:1696
-msgid "Passo della Cisa"
-msgstr "Passo della Cisa"
+#~ msgid "Jaffrey"
+#~ msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1697
-msgid "Passo Resia"
-msgstr "Passo Resia"
+#~ msgid "Jamestown"
+#~ msgstr "Jamestown"
 
-#: my-evolution/Locations.h:1698
-msgid "Passo Rolle"
-msgstr "Passo Rolle"
+#~ msgid "Janesville"
+#~ msgstr "Janesville"
 
-#: my-evolution/Locations.h:1699
-msgid "Patna"
-msgstr "Patna"
+#~ msgid "Jan Smuts"
+#~ msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1700
-msgid "Patterson"
-msgstr "Patterson"
+#~ msgid "Jeddah King Abdul Aziz International Airport"
+#~ msgstr "Jeddah King Abdul Aziz International Airport"
 
-#: my-evolution/Locations.h:1701
-msgid "Patuxent River"
-msgstr "Patuxent River"
+#~ msgid "Jefferson City"
+#~ msgstr "Jefferson City"
 
-#: my-evolution/Locations.h:1702
-msgid "Pau/Pyrenees"
-msgstr "Pau/Pyrenees"
+#~ msgid "Jerez"
+#~ msgstr "Jerez"
 
-#: my-evolution/Locations.h:1703
-msgid "Paxson"
-msgstr "Paxson"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
 
-#: my-evolution/Locations.h:1704
-msgid "Paysandu"
-msgstr "Paysandu"
+#~ msgid "Jinotega"
+#~ msgstr "Jinotega"
 
-#: my-evolution/Locations.h:1705
-msgid "Payson"
-msgstr "Payson"
+#~ msgid "Johan A. Pengel"
+#~ msgstr "Johan A. Pengel"
 
-#: my-evolution/Locations.h:1706
-msgid "Pellston"
-msgstr "Pellston"
+#~ msgid "Johnstown"
+#~ msgstr "Johnstown"
 
-#: my-evolution/Locations.h:1707
-msgid "Pelotas"
-msgstr "Pelotas"
+#~ msgid "Jonesboro"
+#~ msgstr "Jonesboro"
 
-#: my-evolution/Locations.h:1708
-msgid "Pendleton"
-msgstr "Pendleton"
+#~ msgid "Jonkoping"
+#~ msgstr "Jonkoping"
 
-#: my-evolution/Locations.h:1709
-msgid "Pennsylvania"
-msgstr "Pennsilvania"
+#~ msgid "Joplin"
+#~ msgstr "Joplin"
 
-#: my-evolution/Locations.h:1710
-msgid "Penn Yan"
-msgstr "Penn Yan"
+#~ msgid "Juanjui"
+#~ msgstr "Juanjui"
 
-#: my-evolution/Locations.h:1711
-msgid "Pensacola"
-msgstr "Pensacola"
+#~ msgid "Juan Santamaria"
+#~ msgstr "Juan Santamaría"
 
-#: my-evolution/Locations.h:1712
-msgid "Pensacola NAS"
-msgstr "Pensacola NAS"
+#~ msgid "Juigalpa"
+#~ msgstr "Juigalpa"
 
-#: my-evolution/Locations.h:1713
-msgid "People's Republic of China"
-msgstr "República Popular de China"
+#~ msgid "Jujuy"
+#~ msgstr "Jujuy"
 
-#: my-evolution/Locations.h:1714
-msgid "Peoria"
-msgstr "Peoria"
+#~ msgid "Juliaca"
+#~ msgstr "Juliaca"
 
-#: my-evolution/Locations.h:1715
-msgid "Pequot Lakes"
-msgstr "Pequot Lakes"
+#~ msgid "Junction"
+#~ msgstr "Junction"
 
-#: my-evolution/Locations.h:1716
-msgid "Pereira/Matecana"
-msgstr "Pereira/Matecana"
+#~ msgid "Juneau"
+#~ msgstr "Juneau"
 
-#: my-evolution/Locations.h:1717
-msgid "Perm"
-msgstr "Perm"
+#~ msgid "Kadena Ab"
+#~ msgstr "Kadena Ab"
 
-#: my-evolution/Locations.h:1718
-msgid "Perpignan-Rivesaltes"
-msgstr "Perpignan-Rivesaltes"
+#~ msgid "Kagoshima Airport"
+#~ msgstr "Kagoshima Airport"
 
-#: my-evolution/Locations.h:1719
-msgid "Perry-Foley"
-msgstr "Perry-Foley"
+#~ msgid "Kahului"
+#~ msgstr "Kahului"
 
-#: my-evolution/Locations.h:1720
-msgid "Perth"
-msgstr "Perth"
+#~ msgid "Kailua-Kona"
+#~ msgstr "Kailua-Kona"
 
-#: my-evolution/Locations.h:1722
-msgid "Perugia"
-msgstr "Perugia"
+#~ msgid "Kake"
+#~ msgstr "Kake"
 
-#: my-evolution/Locations.h:1723
-msgid "Pescara"
-msgstr "Pescara"
+#~ msgid "Kalamata"
+#~ msgstr "Kalamata"
 
-#: my-evolution/Locations.h:1724
-msgid "Petersburg"
-msgstr "Petersburg"
+#~ msgid "Kalamazoo"
+#~ msgstr "Kalamazoo"
 
-#: my-evolution/Locations.h:1725
-msgid "Petropavlovsk-Kamchatsky"
-msgstr "Petropavlovsk-Kamchatsky"
+#~ msgid "Kalispell"
+#~ msgstr "Kalispell"
 
-#: my-evolution/Locations.h:1726
-msgid "Petrozavodsk"
-msgstr "Petrozavodsk"
+#~ msgid "Kamigoto"
+#~ msgstr "Kamigoto"
 
-#: my-evolution/Locations.h:1727
-msgid "Philadelphia"
-msgstr "Filadelfia"
+#~ msgid "Kaneohe"
+#~ msgstr "Kaneohe"
 
-#: my-evolution/Locations.h:1728
-msgid "Philip"
-msgstr "Philip"
+#~ msgid "Kangshan"
+#~ msgstr "Kangshan"
 
-#: my-evolution/Locations.h:1729
-msgid "Philipsburg"
-msgstr "Philipsburg"
+#~ msgid "Kanoya Ab"
+#~ msgstr "Kanoya Ab"
 
-#: my-evolution/Locations.h:1730
-msgid "Phillips"
-msgstr "Phillips"
+#~ msgid "Kansai International Airport"
+#~ msgstr "Kansai International Airport"
 
-#: my-evolution/Locations.h:1731
-msgid "Phoenix"
-msgstr "Phoenix"
+#~ msgid "Kansas"
+#~ msgstr "Kansas"
 
-#: my-evolution/Locations.h:1732
-msgid "Phoenix-Deer Valley"
-msgstr "Phoenix-Deer Valley"
+#~ msgid "Kansas City"
+#~ msgstr "Kansas City"
 
-#: my-evolution/Locations.h:1733
-msgid "Phoenix-Goodyear"
-msgstr "Phoenix-Goodyear"
+#~ msgid "Kansas City-Gladstone"
+#~ msgstr "Kansas City-Gladstone"
 
-#: my-evolution/Locations.h:1734
-msgid "Phoenix-Luke AFB"
-msgstr "Phoenix-Luke AFB"
+#~ msgid "Kaohsiung"
+#~ msgstr "Kaohsiung"
 
-#: my-evolution/Locations.h:1735
-msgid "Piacenza"
-msgstr "Piacenza"
+#~ msgid "Karachi"
+#~ msgstr "Karachi"
 
-#: my-evolution/Locations.h:1736
-msgid "Pian Rosa"
-msgstr "Pian Rosa"
+#~ msgid "Karup"
+#~ msgstr "Karup"
 
-#: my-evolution/Locations.h:1737
-msgid "Piedras Negras"
-msgstr "Piedras Negras"
+#~ msgid "Kassel-Calden"
+#~ msgstr "Kassel-Calden"
 
-#: my-evolution/Locations.h:1738
-msgid "Pierre"
-msgstr "Pierre"
+#~ msgid "Kasumigaura Ab"
+#~ msgstr "Kasumigaura Ab"
 
-#: my-evolution/Locations.h:1739
-msgid "Pietersburg"
-msgstr "Pietersburg"
+#~ msgid "Kasuminome Ab"
+#~ msgstr "Kasuminome Ab"
 
-#: my-evolution/Locations.h:1740
-msgid "Pikeville"
-msgstr "Pikeville"
+#~ msgid "Katowice"
+#~ msgstr "Katowice"
 
-#: my-evolution/Locations.h:1741
-msgid "Pine Bluff"
-msgstr "Pine Bluff"
+#~ msgid "Kavala"
+#~ msgstr "Kavala"
 
-#: my-evolution/Locations.h:1742
-msgid "Pingtung North"
-msgstr "Pingtung North"
+#~ msgid "Kayseri"
+#~ msgstr "Kayseri"
 
-#: my-evolution/Locations.h:1743
-msgid "Pingtung South"
-msgstr "Pingtung South"
+#~ msgid "Kazan"
+#~ msgstr "Kazan"
 
-#: my-evolution/Locations.h:1744
-msgid "Pirassununga"
-msgstr "Pirassununga"
+#~ msgid "Kearney"
+#~ msgstr "Kearney"
 
-#: my-evolution/Locations.h:1745
-msgid "Pisa"
-msgstr "Pisa"
+#~ msgid "Keene"
+#~ msgstr "Keene"
 
-#: my-evolution/Locations.h:1746
-msgid "Pisco"
-msgstr "Pisco"
+#~ msgid "Kefallinia"
+#~ msgstr "Kefallinia"
 
-#: my-evolution/Locations.h:1747
-msgid "Pittsburgh"
-msgstr "Pittsburgh"
+#~ msgid "Keflavik"
+#~ msgstr "Keflavik"
 
-#: my-evolution/Locations.h:1748
-msgid "Pittsburgh-West Mifflin"
-msgstr "Pittsburgh-West Mifflin"
+#~ msgid "Kenai"
+#~ msgstr "Kenai"
 
-#: my-evolution/Locations.h:1749
-msgid "Plattsburg"
-msgstr "Plattsburg"
+#~ msgid "Kenosha"
+#~ msgstr "Kenosha"
 
-#: my-evolution/Locations.h:1750
-msgid "Plovdiv"
-msgstr "Plovdiv"
+#~ msgid "Kentucky"
+#~ msgstr "Kentucky"
 
-#: my-evolution/Locations.h:1751
-msgid "Plymouth"
-msgstr "Plymouth"
+#~ msgid "Keokuk"
+#~ msgstr "Keokuk"
 
-#: my-evolution/Locations.h:1752
-msgid "Pocatello"
-msgstr "Pocatello"
+#~ msgid "Kerkira"
+#~ msgstr "Kerkira"
 
-#: my-evolution/Locations.h:1753
-msgid "Pocos De Caldas"
-msgstr "Pocos De Caldas"
+#~ msgid "Kerman"
+#~ msgstr "Kerman"
 
-#: my-evolution/Locations.h:1754
-msgid "Podgorica"
-msgstr "Podgorica"
+#~ msgid "Ketchikan"
+#~ msgstr "Ketchikan"
 
-#: my-evolution/Locations.h:1755
-msgid "Podgorica Titograd"
-msgstr "Podgorica Titograd"
+#~ msgid "Key West"
+#~ msgstr "Key West"
 
-#: my-evolution/Locations.h:1756
-msgid "Pohang Ab"
-msgstr "Pohang Ab"
+#~ msgid "Key West NAS"
+#~ msgstr "Key West NAS"
 
-#: my-evolution/Locations.h:1757
-msgid "Point Hope"
-msgstr "Point Hope"
+#~ msgid "Khabarovsk"
+#~ msgstr "Khabarovsk"
 
-#: my-evolution/Locations.h:1758
-msgid "Point Lay"
-msgstr "Point Lay"
+#~ msgid "Khamis Mushait"
+#~ msgstr "Khamis Mushait"
 
-#: my-evolution/Locations.h:1759
-msgid "Point Mugu"
-msgstr "Point Mugu"
+#~ msgid "Kharkiv"
+#~ msgstr "Kharkiv"
 
-#: my-evolution/Locations.h:1760
-msgid "Point Piedras Blanca"
-msgstr "Point Piedras Blanca"
+#~ msgid "Kikai Island"
+#~ msgstr "Isla Kikai"
 
-#: my-evolution/Locations.h:1761
-msgid "Poitiers"
-msgstr "Poitiers"
+#~ msgid "Killeen"
+#~ msgstr "Killeen"
 
-#: my-evolution/Locations.h:1763
-msgid "Pompano Beach"
-msgstr "Pompano Beach"
+#~ msgid "Killeen-Ft Hood"
+#~ msgstr "Killeen-Ft Hood"
 
-#: my-evolution/Locations.h:1764
-msgid "Ponca City"
-msgstr "Ciudad de Ponca"
+#~ msgid "Killeen-Gray AAF"
+#~ msgstr "Killeen-Gray AAF"
 
-#: my-evolution/Locations.h:1765
-msgid "Ponce"
-msgstr "Ponce"
+#~ msgid "King Khaled International Airport"
+#~ msgstr "King Khaled International Airport"
 
-#: my-evolution/Locations.h:1766
-msgid "Ponta Pora"
-msgstr "Ponta Pora"
+#~ msgid "Kingman"
+#~ msgstr "Kingman"
 
-#: my-evolution/Locations.h:1767
-msgid "Pontiac"
-msgstr "Pontiac"
+#~ msgid "King Salmon"
+#~ msgstr "King Salmon"
 
-#: my-evolution/Locations.h:1768
-msgid "Pope AFB"
-msgstr "Pope AFB"
+#~ msgid "Kingston"
+#~ msgstr "Kingston"
 
-#: my-evolution/Locations.h:1769
-msgid "Poplar Bluff"
-msgstr "Poplar Bluff"
+#~ msgid "Kingsville"
+#~ msgstr "Kingsville"
 
-#: my-evolution/Locations.h:1770
-msgid "Poprad"
-msgstr "Poprad"
+#~ msgid "Kinloss"
+#~ msgstr "Kinloss"
 
-#: my-evolution/Locations.h:1771
-msgid "Port Alexander"
-msgstr "Port Alexander"
+#~ msgid "Kinston"
+#~ msgstr "Kinston"
 
-#: my-evolution/Locations.h:1772
-msgid "Port Alsworth"
-msgstr "Port Alsworth"
+#~ msgid "Kirkenes"
+#~ msgstr "Kirkenes"
 
-#: my-evolution/Locations.h:1773
-msgid "Port Angeles"
-msgstr "Port Angeles"
+#~ msgid "Kirksville"
+#~ msgstr "Kirksville"
 
-#: my-evolution/Locations.h:1774
-msgid "Port-Au-Prince"
-msgstr "Port-Au-Prince"
+#~ msgid "Kiruna"
+#~ msgstr "Kiruna"
 
-#: my-evolution/Locations.h:1775
-msgid "Port Elizabeth"
-msgstr "Port Elizabeth"
+#~ msgid "Kisarazu Ab"
+#~ msgstr "Kisarazu Ab"
 
-#: my-evolution/Locations.h:1776
-msgid "Porterville"
-msgstr "Porterville"
+#~ msgid "Kishineu"
+#~ msgstr "Kishineu"
 
-#: my-evolution/Locations.h:1777
-msgid "Port Hardy"
-msgstr "Port Hardy"
+#~ msgid "Kitakyushu Airport"
+#~ msgstr "Kitakyushu Airport"
 
-#: my-evolution/Locations.h:1778
-msgid "Port Hedland"
-msgstr "Port Hedland"
+#~ msgid "Klagenfurt"
+#~ msgstr "Klagenfurt"
 
-#: my-evolution/Locations.h:1779
-msgid "Port Heiden"
-msgstr "Port Heiden"
+#~ msgid "Klamath Falls"
+#~ msgstr "Klamath Falls"
 
-#: my-evolution/Locations.h:1780
-msgid "Portland"
-msgstr "Portland"
+#~ msgid "Klawock"
+#~ msgstr "Klawock"
 
-#: my-evolution/Locations.h:1781
-msgid "Porto"
-msgstr "Porto"
+#~ msgid "Kleine Brogel"
+#~ msgstr "Kleine Brogel"
 
-#: my-evolution/Locations.h:1782
-msgid "Porto Alegre"
-msgstr "Puerto Alegre"
+#~ msgid "Kliningrad"
+#~ msgstr "Kliningrad"
 
-#: my-evolution/Locations.h:1783
-msgid "Porto Alegre Apt"
-msgstr "Puerto Alegre Apt"
+#~ msgid "Knoxville"
+#~ msgstr "Knoxville"
 
-#: my-evolution/Locations.h:1784
-msgid "Portoroz"
-msgstr "Portoroz"
+#~ msgid "Knoxville-Downtown"
+#~ msgstr "Knoxville-Downtown"
 
-#: my-evolution/Locations.h:1785
-msgid "Porto Santo"
-msgstr "Puerto Santo"
+#~ msgid "Kobenhavn/Kastrup"
+#~ msgstr "Kobenhavn/Kastrup"
 
-#: my-evolution/Locations.h:1786
-msgid "Porto Velho"
-msgstr "Porto Velho"
+#~ msgid "Kobenhavn/Roskilde"
+#~ msgstr "Kobenhavn/Roskilde"
 
-#: my-evolution/Locations.h:1787
-msgid "Port Said"
-msgstr "Puerto Said"
+#~ msgid "Kochi Airport"
+#~ msgstr "Kochi Airport"
 
-#: my-evolution/Locations.h:1788
-msgid "Portsmouth"
-msgstr "Portsmouth"
+#~ msgid "Kodiak"
+#~ msgstr "Kodiak"
 
-#: my-evolution/Locations.h:1790
-msgid "Posadas"
-msgstr "Posadas"
+#~ msgid "Kogalniceanu"
+#~ msgstr "Kogalniceanu"
 
-#: my-evolution/Locations.h:1791
-msgid "Potosi"
-msgstr "Potosi"
+#~ msgid "Kogalym"
+#~ msgstr "Kogalym"
 
-#: my-evolution/Locations.h:1792
-msgid "Poughkeepsie"
-msgstr "Poughkeepsie"
+#~ msgid "Koksijde"
+#~ msgstr "Koksijde"
 
-#: my-evolution/Locations.h:1793
-msgid "Pownal"
-msgstr "Pownal"
+#~ msgid "Kolding/Vandrup"
+#~ msgstr "Kolding/Vandrup"
 
-#: my-evolution/Locations.h:1794
-msgid "Poza Rica"
-msgstr "Poza Rica"
+#~ msgid "Koln/Bonn"
+#~ msgstr "Koln/Bonn"
 
-#: my-evolution/Locations.h:1795
-msgid "Poznan"
-msgstr "Poznan"
+#~ msgid "Komatsu Ab"
+#~ msgstr "Komatsu Ab"
 
-#: my-evolution/Locations.h:1796
-msgid "Praha"
-msgstr "Praha"
+#~ msgid "Komatsujima Ab"
+#~ msgstr "Komatsujima Ab"
 
-#: my-evolution/Locations.h:1797
-msgid "Pratica di Mare"
-msgstr "Pratica di Mare"
+#~ msgid "Konya"
+#~ msgstr "Konya"
 
-#: my-evolution/Locations.h:1798
-msgid "Prescott"
-msgstr "Prescott"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Corea, República Democrática Popular de"
 
-#: my-evolution/Locations.h:1799
-msgid "Presidente Prudente"
-msgstr "Presidente Prudente"
+#~ msgid "Korea, Republic of"
+#~ msgstr "República Coreana"
 
-#: my-evolution/Locations.h:1800
-msgid "Presque Isle"
-msgstr "Presque Isle"
+#~ msgid "Kos"
+#~ msgstr "Kos"
 
-#: my-evolution/Locations.h:1801
-msgid "Prestwick"
-msgstr "Prestwick"
+#~ msgid "Kotzebue"
+#~ msgstr "Kotzebue"
 
-#: my-evolution/Locations.h:1802
-msgid "Pretoria"
-msgstr "Pretória"
+#~ msgid "Kozani"
+#~ msgstr "Kozani"
 
-#: my-evolution/Locations.h:1803
-msgid "Preveza"
-msgstr "Preveza"
+#~ msgid "Krakow"
+#~ msgstr "Krakow"
 
-#: my-evolution/Locations.h:1804
-msgid "Price-Carbon"
-msgstr "Price-Carbon"
+#~ msgid "Krasnodar"
+#~ msgstr "Krasnodar"
 
-#: my-evolution/Locations.h:1805
-msgid "Pristina"
-msgstr "Prístina"
+#~ msgid "Krasnoyarsk"
+#~ msgstr "Krasnoyarsk"
 
-#: my-evolution/Locations.h:1806
-msgid "Providence"
-msgstr "Providence"
+#~ msgid "Kristiansand/Kjevik"
+#~ msgstr "Kristiansand/Kjevik"
 
-#: my-evolution/Locations.h:1807
-msgid "Provincetown"
-msgstr "Provincetown"
+#~ msgid "Kristiansund/Kvernberget"
+#~ msgstr "Kristiansund/Kvernberget"
 
-#: my-evolution/Locations.h:1808
-msgid "Provo"
-msgstr "Provo"
+#~ msgid "Kryviy Rig/Lozovatka"
+#~ msgstr "Kryviy Rig/Lozovatka"
 
-#: my-evolution/Locations.h:1809
-msgid "Pskov"
-msgstr "Pskov"
+#~ msgid "Kumamoto Airport"
+#~ msgstr "Kumamoto Airport"
 
-#: my-evolution/Locations.h:1810
-msgid "Pucallpa"
-msgstr "Pucallpa"
+#~ msgid "Kunming"
+#~ msgstr "Kunming"
 
-#: my-evolution/Locations.h:1811
-msgid "Pudahuel"
-msgstr "Pudahuel"
+#~ msgid "Kushiro Airport"
+#~ msgstr "Kushiro Airport"
 
-#: my-evolution/Locations.h:1812
-msgid "Puebla"
-msgstr "Puebla"
+#~ msgid "Kyiv/Boryspil"
+#~ msgstr "Kyiv/Boryspil"
 
-#: my-evolution/Locations.h:1813
-msgid "Pueblo"
-msgstr "Pueblo"
+#~ msgid "Kyiv/Zhulyany"
+#~ msgstr "Kyiv/Zhulyany"
 
-#: my-evolution/Locations.h:1814
-msgid "Puerto Barrios"
-msgstr "Puerto Barrios"
+#~ msgid "La Ceiba"
+#~ msgstr "La Ceiba"
 
-#: my-evolution/Locations.h:1815
-msgid "Puerto Cabezas"
-msgstr "Puerto Cabezas"
+#~ msgid "Laconia"
+#~ msgstr "Laconia"
 
-#: my-evolution/Locations.h:1816
-msgid "Puerto Escondido"
-msgstr "Puerto Escondido"
+#~ msgid "La Coruna"
+#~ msgstr "La Coruña"
 
-#: my-evolution/Locations.h:1817
-msgid "Puerto Lempira"
-msgstr "Puerto Lempira"
+#~ msgid "La Crosse"
+#~ msgstr "La Cruz"
 
-#: my-evolution/Locations.h:1818
-msgid "Puerto Limon"
-msgstr "Puerto Limón"
+#~ msgid "La Esperanza"
+#~ msgstr "La Esperanza"
 
-#: my-evolution/Locations.h:1819
-msgid "Puerto Maldonado"
-msgstr "Puerto Maldonado"
+#~ msgid "Lafayette"
+#~ msgstr "Lafayette"
 
-#: my-evolution/Locations.h:1820
-msgid "Puerto Montt"
-msgstr "Puerto Montt"
+#~ msgid "La Grande"
+#~ msgstr "La Grande"
 
-#: my-evolution/Locations.h:1821
-msgid "Puerto Plata"
-msgstr "Puerto Plata"
+#~ msgid "Lahaina"
+#~ msgstr "Lahaina"
 
-#: my-evolution/Locations.h:1823
-msgid "Puerto Suarez"
-msgstr "Puerto Suarez"
+#~ msgid "Lahore"
+#~ msgstr "Lahore"
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Vallarta"
-msgstr "Puerto Vallarta"
+#~ msgid "Lajes"
+#~ msgstr "Lajes"
 
-#: my-evolution/Locations.h:1825
-msgid "Pula"
-msgstr "Pula"
+#~ msgid "La Junta"
+#~ msgstr "La Junta"
 
-#: my-evolution/Locations.h:1826
-msgid "Pullman"
-msgstr "Pullman"
+#~ msgid "Lake Charles"
+#~ msgstr "Lago Charles"
 
-#: my-evolution/Locations.h:1827
-msgid "Punta Arenas"
-msgstr "Punta Arenas"
+#~ msgid "Lake Hood"
+#~ msgstr "Lago Hood"
 
-#: my-evolution/Locations.h:1828
-msgid "Punta Cana"
-msgstr "Punta Cana"
+#~ msgid "Lakehurst"
+#~ msgstr "Lakehurst"
 
-#: my-evolution/Locations.h:1829
-msgid "Punta Gorda"
-msgstr "Punta Gorda"
+#~ msgid "Lakeland"
+#~ msgstr "Lakeland"
 
-#: my-evolution/Locations.h:1830
-msgid "Puntilla Lake"
-msgstr "Puntilla Lake"
+#~ msgid "Lake Tahoe"
+#~ msgstr "Lago Tahoe"
 
-#: my-evolution/Locations.h:1831
-msgid "Pusan/Kimhae"
-msgstr "Pusan/Kimhae"
+#~ msgid "Lakeview"
+#~ msgstr "Lakeview"
 
-#: my-evolution/Locations.h:1832
-msgid "Pyongtaek Ab"
-msgstr "Pyongtaek Ab"
+#~ msgid "Lamar"
+#~ msgstr "Lamar"
 
-#: my-evolution/Locations.h:1833
-msgid "Pyongyang"
-msgstr "Pyongyang"
+#~ msgid "La Mesa"
+#~ msgstr "La Mesa"
 
-#: my-evolution/Locations.h:1835
-msgid "Quantico"
-msgstr "Quántico"
+#~ msgid "Lamezia"
+#~ msgstr "Lamezia"
 
-#: my-evolution/Locations.h:1836
-msgid "Quebec"
-msgstr "Quebec"
+#~ msgid "Lamoni"
+#~ msgstr "Lamoni"
 
-#: my-evolution/Locations.h:1837
-msgid "Quebec City"
-msgstr "Quebec City"
+#~ msgid "Lampedusa"
+#~ msgstr "Lampedusa"
 
-#: my-evolution/Locations.h:1838
-msgid "Queretaro"
-msgstr "Queretaro"
+#~ msgid "Lanai"
+#~ msgstr "Lanai"
 
-#: my-evolution/Locations.h:1839
-msgid "Quillayute"
-msgstr "Quillayute"
+#~ msgid "Lancaster"
+#~ msgstr "Lancaster"
 
-#: my-evolution/Locations.h:1840
-msgid "Quimper"
-msgstr "Quimper"
+#~ msgid "Lander"
+#~ msgstr "Lander"
 
-#: my-evolution/Locations.h:1841
-msgid "Quincy"
-msgstr "Quincy"
+#~ msgid "Langebaanweg"
+#~ msgstr "Langebaanweg"
 
-#: my-evolution/Locations.h:1842
-msgid "Quito/Mariscal Sucre"
-msgstr "Quito/Mariscal Sucre"
+#~ msgid "Langley AFB"
+#~ msgstr "Langley AFB"
 
-#: my-evolution/Locations.h:1843
-msgid "Rabat"
-msgstr "Rabat"
+#~ msgid "Lannion"
+#~ msgstr "Lannion"
 
-#: my-evolution/Locations.h:1844
-msgid "Raduzhny"
-msgstr "Raduzhny"
+#~ msgid "Lansing"
+#~ msgstr "Lansing"
 
-#: my-evolution/Locations.h:1845
-msgid "Rafha"
-msgstr "Rafha"
+#~ msgid "Lanzhou"
+#~ msgstr "Lanzhou"
 
-#: my-evolution/Locations.h:1846
-msgid "Raleigh-Durham"
-msgstr "Raleigh-Durham"
+#~ msgid "La Paz"
+#~ msgstr "La Paz"
 
-#: my-evolution/Locations.h:1847
-msgid "Randolph AFB"
-msgstr "Randolph AFB"
+#~ msgid "La Paz/Alto"
+#~ msgstr "La Paz/Alto"
 
-#: my-evolution/Locations.h:1848
-msgid "Rapid City"
-msgstr "Rapid City"
+#~ msgid "Laramie"
+#~ msgstr "Laramie"
 
-#: my-evolution/Locations.h:1849
-msgid "Rapid City-Ellsworth AFB"
-msgstr "Rapid City-Ellsworth AFB"
+#~ msgid "Laredo"
+#~ msgstr "Laredo"
 
-#: my-evolution/Locations.h:1850
-msgid "Ras Al Khaimah"
-msgstr "Ras Al Khaimah"
+#~ msgid "Larnaka"
+#~ msgstr "Larnaka"
 
-#: my-evolution/Locations.h:1851
-msgid "Rawlins"
-msgstr "Rawlins"
+#~ msgid "La Romana"
+#~ msgstr "La Romana"
 
-#: my-evolution/Locations.h:1852
-msgid "Reading"
-msgstr "Reading"
+#~ msgid "Las Americas"
+#~ msgstr "Las Américas"
 
-#: my-evolution/Locations.h:1853
-msgid "Rebun Island"
-msgstr "Isla Rebun"
+#~ msgid "Las Tunas"
+#~ msgstr "Las Tunas"
 
-#: my-evolution/Locations.h:1854
-msgid "Recife"
-msgstr "Recife"
+#~ msgid "Las Vegas"
+#~ msgstr "Las Vegas"
 
-#: my-evolution/Locations.h:1855
-msgid "Red Bluff"
-msgstr "Red Bluff"
+#~ msgid "Latina"
+#~ msgstr "Latina"
 
-#: my-evolution/Locations.h:1856
-msgid "Redding"
-msgstr "Redding"
+#~ msgid "Latrobe"
+#~ msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1857
-msgid "Redig"
-msgstr "Redig"
+#~ msgid "Laughlin"
+#~ msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1858
-msgid "Redmond"
-msgstr "Redmond"
+#~ msgid "Laurel"
+#~ msgstr "Laurel"
 
-#: my-evolution/Locations.h:1859
-msgid "Red Oak"
-msgstr "Red Oak"
+#~ msgid "La Verne"
+#~ msgstr "La Verne"
 
-#: my-evolution/Locations.h:1860
-msgid "Redwood Falls"
-msgstr "Redwood Falls"
+#~ msgid "Lawrence"
+#~ msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1861
-msgid "Reggio Calabria"
-msgstr "Reggio Calabria"
+#~ msgid "Lawton"
+#~ msgstr "Lawton"
 
-#: my-evolution/Locations.h:1862
-msgid "Regina"
-msgstr "Regina"
+#~ msgid "Leadville"
+#~ msgstr "Leadville"
 
-#: my-evolution/Locations.h:1863
-msgid "Reims-Champagne"
-msgstr "Reims-Champagne"
+#~ msgid "Learmouth"
+#~ msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1864
-msgid "Rennes"
-msgstr "Rennes"
+#~ msgid "Lecce"
+#~ msgstr "Lecce"
 
-#: my-evolution/Locations.h:1865
-msgid "Reno"
-msgstr "Reno"
+#~ msgid "Leeds and Bradford"
+#~ msgstr "Leeds y Bradford"
 
-#: my-evolution/Locations.h:1866
-msgid "Renton"
-msgstr "Renton"
+#~ msgid "Leesburg"
+#~ msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1867
-msgid "Resistencia"
-msgstr "Resistencia"
+#~ msgid "Leeuwarden"
+#~ msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1868
-msgid "Reus"
-msgstr "Reus"
+#~ msgid "Le Havre-Octeville"
+#~ msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1869
-msgid "Reyes"
-msgstr "Reyes"
+#~ msgid "Leipzig-Schkeuditz"
+#~ msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1870
-msgid "Reykjavik"
-msgstr "Reykjavik"
+#~ msgid "Leknes"
+#~ msgstr "Leknes"
 
-#: my-evolution/Locations.h:1871
-msgid "Reynosa"
-msgstr "Reinosa"
+#~ msgid "Le Mans"
+#~ msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1872
-msgid "Rhinelander"
-msgstr "Rhinelander"
+#~ msgid "Le Marine"
+#~ msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1873
-msgid "Rhode Island"
-msgstr "Isla de Rodas"
+#~ msgid "Lemmon"
+#~ msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1874
-msgid "Riberalta"
-msgstr "Riberalta"
+#~ msgid "Lemoore"
+#~ msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1875
-msgid "Richmond"
-msgstr "Richmond"
+#~ msgid "Leticia/Vasquez Cobo"
+#~ msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1876
-msgid "Rickenbacker"
-msgstr "Rickenbacker"
+#~ msgid "Le Touquet"
+#~ msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1877
-msgid "Rieti"
-msgstr "Rieti"
+#~ msgid "Leuchars"
+#~ msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1878
-msgid "Rifle"
-msgstr "Rifle"
+#~ msgid "Lewisburg"
+#~ msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1879
-msgid "Rijeka"
-msgstr "Rijeka"
+#~ msgid "Lewiston"
+#~ msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1880
-msgid "Rimini"
-msgstr "Rimini"
+#~ msgid "Lewistown"
+#~ msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1881
-msgid "Rio De Janeiro"
-msgstr "Río De Janeiro"
+#~ msgid "Lexington"
+#~ msgstr "Lexington"
 
-#: my-evolution/Locations.h:1882
-msgid "Rio Gallegos"
-msgstr "Río Gallegos"
+#~ msgid "Liberal"
+#~ msgstr "Liberal"
 
-#: my-evolution/Locations.h:1883
-msgid "Rio Grande"
-msgstr "Río Grande"
+#~ msgid "Libya"
+#~ msgstr "Libia"
 
-#: my-evolution/Locations.h:1884
-msgid "Rioja"
-msgstr "La Rioja"
+#~ msgid "Lichtenburg"
+#~ msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1885
-msgid "Rio / Jacarepagua"
-msgstr "Río / Jacarepagua"
+#~ msgid "Lidgerwood"
+#~ msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1886
-msgid "Rionegro/J.M.Cordova"
-msgstr "Rionegro/J.M.Cordova"
+#~ msgid "Liege"
+#~ msgstr "Liege"
 
-#: my-evolution/Locations.h:1887
-msgid "Rishiri Island"
-msgstr "Isla de Rishiri"
+#~ msgid "Lihue"
+#~ msgstr "Lithue"
 
-#: my-evolution/Locations.h:1888
-msgid "Rivas"
-msgstr "Rivas"
+#~ msgid "Lille-Lesquin"
+#~ msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1889
-msgid "Rivera"
-msgstr "Rivera"
+#~ msgid "Lima-Callao"
+#~ msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1890
-msgid "Riverside"
-msgstr "Riverside"
+#~ msgid "Limnos"
+#~ msgstr "Limnos"
 
-#: my-evolution/Locations.h:1891
-msgid "Riverside/March AFB"
-msgstr "Riverside/March AFB"
+#~ msgid "Limoges"
+#~ msgstr "Limoges"
 
-#: my-evolution/Locations.h:1892
-msgid "Riverton"
-msgstr "Riverton"
+#~ msgid "Limon"
+#~ msgstr "Limon"
 
-#: my-evolution/Locations.h:1893
-msgid "Rivne"
-msgstr "Rivne"
+#~ msgid "Lincoln"
+#~ msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1894
-msgid "Rivolto"
-msgstr "Rivolto"
+#~ msgid "Linz"
+#~ msgstr "Linz"
 
-#: my-evolution/Locations.h:1895
-msgid "Riyadh"
-msgstr "Riyadh"
+#~ msgid "Lisboa"
+#~ msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1896
-msgid "Roanoke"
-msgstr "Roanoke"
+#~ msgid "Lista"
+#~ msgstr "Lista"
 
-#: my-evolution/Locations.h:1897
-msgid "Roatan"
-msgstr "Roatan"
+#~ msgid "Litchfield"
+#~ msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1898
-msgid "Robore"
-msgstr "Robore"
+#~ msgid "Little Rock"
+#~ msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1899
-msgid "Rochester"
-msgstr "Rochester"
+#~ msgid "Little Rock AFB"
+#~ msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1900
-msgid "Rockford"
-msgstr "Rockford"
+#~ msgid "Livermore"
+#~ msgstr "Livermore"
 
-#: my-evolution/Locations.h:1901
-msgid "Rockland"
-msgstr "Rockland"
+#~ msgid "Liverpool"
+#~ msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1902
-msgid "Rockport"
-msgstr "Rockport"
+#~ msgid "Livingston"
+#~ msgstr "Livingston"
 
-#: my-evolution/Locations.h:1903
-msgid "Rock Springs"
-msgstr "Rock Springs"
+#~ msgid "Ljubljana"
+#~ msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1904
-msgid "Rocky Mount"
-msgstr "Rocky Mount"
+#~ msgid "Logan"
+#~ msgstr "Logan"
 
-#: my-evolution/Locations.h:1905
-msgid "Rodos"
-msgstr "Rodos"
+#~ msgid "Lolland Falster"
+#~ msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1906
-msgid "Rogers"
-msgstr "Rogers"
+#~ msgid "Lompoc"
+#~ msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1907
-msgid "Roma/Ciampino"
-msgstr "Roma/Ciampino"
+#~ msgid "London"
+#~ msgstr "Londres"
 
-#: my-evolution/Locations.h:1908
-msgid "Roma/Fiumicino"
-msgstr "Roma/Fiumicino"
+#~ msgid "London/City"
+#~ msgstr "Londres/Ciudad"
 
-#: my-evolution/Locations.h:1910
-msgid "Roma/Urbe"
-msgstr "Roma/Urbe"
+#~ msgid "London/Gatwick"
+#~ msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1911
-msgid "Rome-Russell"
-msgstr "Rome-Russell"
+#~ msgid "London/Heathrow"
+#~ msgstr "Londres/Heathrow"
 
-#: my-evolution/Locations.h:1912
-msgid "Ronchi de' Legionari"
-msgstr "Ronchi de' Legionari"
+#~ msgid "London/Stansted"
+#~ msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1913
-msgid "Ronneby"
-msgstr "Ronneby"
+#~ msgid "Londrina"
+#~ msgstr "Londrina"
 
-#: my-evolution/Locations.h:1914
-msgid "Roosevelt"
-msgstr "Roosevelt"
+#~ msgid "Lone Rock"
+#~ msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1915
-msgid "Roros"
-msgstr "Roros"
+#~ msgid "Long Beach"
+#~ msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1916
-msgid "Rorvik/Ryum"
-msgstr "Rorvik/Ryum"
+#~ msgid "Longview"
+#~ msgstr "Longview"
 
-#: my-evolution/Locations.h:1917
-msgid "Rosario"
-msgstr "Rosario"
+#~ msgid "Lorient-Lann-Bihoue"
+#~ msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1918
-msgid "Roseburg"
-msgstr "Roseburg"
+#~ msgid "Los Alamos"
+#~ msgstr "Los Álamos"
 
-#: my-evolution/Locations.h:1919
-msgid "Roseglen"
-msgstr "Roseglen"
+#~ msgid "Los Angeles"
+#~ msgstr "Los Ángeles"
 
-#: my-evolution/Locations.h:1920
-msgid "Rost"
-msgstr "Rost"
+#~ msgid "Los Mochis"
+#~ msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1921
-msgid "Rostov-Na-Donu"
-msgstr "Rostov-Na-Donu"
+#~ msgid "Lossiemouth"
+#~ msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1922
-msgid "Roswell"
-msgstr "Roswell"
+#~ msgid "Louisville"
+#~ msgstr "Louisville"
 
-#: my-evolution/Locations.h:1923
-msgid "Rotterdam"
-msgstr "Rotterdam"
+#~ msgid "Louisville-Standiford Field"
+#~ msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1924
-msgid "Rouen-Valle de Seine"
-msgstr "Rouen-Valle de Seine"
+#~ msgid "Lousiana"
+#~ msgstr "Luisiana"
 
-#: my-evolution/Locations.h:1925
-msgid "Ruidoso-Sierra Blanca"
-msgstr "Ruidoso-Sierra Blanca"
+#~ msgid "Lovelock"
+#~ msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1926
-msgid "Rurrenabaque"
-msgstr "Rurrenabaque"
+#~ msgid "Lubbock"
+#~ msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1927
-msgid "Russell"
-msgstr "Russell"
+#~ msgid "Lubeck-Blankensee"
+#~ msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1928
-msgid "Russia"
-msgstr "Rusia"
+#~ msgid "Lufkin"
+#~ msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1929
-msgid "Rutland"
-msgstr "Rutland"
+#~ msgid "Lugano"
+#~ msgstr "Lugano"
 
-#: my-evolution/Locations.h:1930
-msgid "Rygge"
-msgstr "Rygge"
+#~ msgid "Luqa"
+#~ msgstr "Luqa"
 
-#: my-evolution/Locations.h:1931
-msgid "Rzeszow"
-msgstr "Rzeszow"
+#~ msgid "Luton"
+#~ msgstr "Luton"
 
-#: my-evolution/Locations.h:1932
-msgid "Saarbrucken"
-msgstr "Saarbrucken"
+#~ msgid "Luxeuil"
+#~ msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1933
-msgid "Sabine Pass"
-msgstr "Sabine Pass"
+#~ msgid "Luxor"
+#~ msgstr "Luxor"
 
-#: my-evolution/Locations.h:1934
-msgid "Sacramento"
-msgstr "Sacramento"
+#~ msgid "Lviv"
+#~ msgstr "Lviv"
 
-#: my-evolution/Locations.h:1935
-msgid "Sacramento-Woodland"
-msgstr "Sacramento-Woodland"
+#~ msgid "Lynchburg"
+#~ msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1936
-msgid "Safford-Municipal Airport"
-msgstr "Safford-Municipal Airport"
+#~ msgid "Lyneham"
+#~ msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1937
-msgid "Saginaw"
-msgstr "Saginaw"
+#~ msgid "Lyon-Bron"
+#~ msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1938
-msgid "Saint Anthony"
-msgstr "Saint Anthony"
+#~ msgid "Lyon-Satolas"
+#~ msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1939
-msgid "Saint-Brieuc-Armor"
-msgstr "Saint-Brieuc-Armor"
+#~ msgid "Maastricht"
+#~ msgstr "Mastricht"
 
-#: my-evolution/Locations.h:1940
-msgid "Saint-Dizier-Robinson"
-msgstr "Saint-Dizier-Robinson"
+#~ msgid "Macae"
+#~ msgstr "Macae"
 
-#: my-evolution/Locations.h:1941
-msgid "Saint-Etienne-Boutheon"
-msgstr "Saint-Etienne-Boutheon"
+#~ msgid "Macapa"
+#~ msgstr "Macapa"
 
-#: my-evolution/Locations.h:1942
-msgid "Saint Mary's"
-msgstr "Saint Mary's"
+#~ msgid "Maceio"
+#~ msgstr "Maceio"
 
-#: my-evolution/Locations.h:1943
-msgid "Saint Mawgan"
-msgstr "Saint Mawgan"
+#~ msgid "Macon"
+#~ msgstr "Macon"
 
-#: my-evolution/Locations.h:1944
-msgid "Saint-Nazaire-Montoir"
-msgstr "Saint-Nazaire-Montoir"
+#~ msgid "Madinah"
+#~ msgstr "Madinah"
 
-#: my-evolution/Locations.h:1945
-msgid "Saint Paul"
-msgstr "Saint Paul"
+#~ msgid "Madison"
+#~ msgstr "Mádison"
 
-#: my-evolution/Locations.h:1946
-msgid "Saiq"
-msgstr "Saiq"
+#~ msgid "Madras/Minambakkam"
+#~ msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1947
-msgid "Salalah"
-msgstr "Salalah"
+#~ msgid "Madrid (Barajas)"
+#~ msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1948
-msgid "Salem"
-msgstr "Salem"
+#~ msgid "Madrid (Cuatro Vientos)"
+#~ msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1949
-msgid "Salida"
-msgstr "Salida"
+#~ msgid "Magadan"
+#~ msgstr "Magadan"
 
-#: my-evolution/Locations.h:1950
-msgid "Salida-Harriet"
-msgstr "Salida-Harriet"
+#~ msgid "Magdalena"
+#~ msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1951
-msgid "Salina"
-msgstr "Salina"
+#~ msgid "Maine"
+#~ msgstr "Maine"
 
-#: my-evolution/Locations.h:1952
-msgid "Salinas"
-msgstr "Salinas"
+#~ msgid "Makhachkala"
+#~ msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1953
-msgid "Salisbury"
-msgstr "Salisbury"
+#~ msgid "Makkah"
+#~ msgstr "Makkah"
 
-#: my-evolution/Locations.h:1954
-msgid "Salmon"
-msgstr "Salmon"
+#~ msgid "Makung"
+#~ msgstr "Makung"
 
-#: my-evolution/Locations.h:1955
-msgid "Salmon (2)"
-msgstr "Salmon (2)"
+#~ msgid "Malad City"
+#~ msgstr "Malad City"
 
-#: my-evolution/Locations.h:1956
-msgid "Salta"
-msgstr "Salta"
+#~ msgid "Malaga"
+#~ msgstr "Málaga"
 
-#: my-evolution/Locations.h:1957
-msgid "Saltillo"
-msgstr "Saltillo"
+#~ msgid "Malatya"
+#~ msgstr "Malatya"
 
-#: my-evolution/Locations.h:1958
-msgid "Salt Lake City"
-msgstr "Salt Lake City"
+#~ msgid "Maldonado/Punta Est"
+#~ msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1959
-msgid "Salto"
-msgstr "Salto"
+#~ msgid "Malmo/Sturup"
+#~ msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1960
-msgid "Salt point"
-msgstr "Salt point"
+#~ msgid "Mammoth Lakes"
+#~ msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1961
-msgid "Salvador"
-msgstr "El Salvador"
+#~ msgid "Managua"
+#~ msgstr "Managua"
 
-#: my-evolution/Locations.h:1962
-msgid "Salzburg"
-msgstr "Salzburg"
+#~ msgid "Manassas"
+#~ msgstr "Manassas"
 
-#: my-evolution/Locations.h:1963
-msgid "Samara"
-msgstr "Samara"
+#~ msgid "Manaus"
+#~ msgstr "Manao"
 
-#: my-evolution/Locations.h:1964
-msgid "Samos"
-msgstr "Samos"
+#~ msgid "Manchester"
+#~ msgstr "Mánchester"
 
-#: my-evolution/Locations.h:1965
-msgid "Samsun"
-msgstr "Samsun"
+#~ msgid "Mangilsan Ab"
+#~ msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1966
-msgid "Sana'A"
-msgstr "Sana'A"
+#~ msgid "Manhattan"
+#~ msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1967
-msgid "San Andres Isla/Sesquicentenario"
-msgstr "San Andres Isla/Sesquicentenario"
+#~ msgid "Manisa"
+#~ msgstr "Manisa"
 
-#: my-evolution/Locations.h:1968
-msgid "San Angelo"
-msgstr "San Angelo"
+#~ msgid "Manistee"
+#~ msgstr "Manistee"
 
-#: my-evolution/Locations.h:1969
-msgid "San Antonio"
-msgstr "San Antonio"
+#~ msgid "Manitoba"
+#~ msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1970
-msgid "San Antonio Del Tachira"
-msgstr "San Antonio Del Tachira"
+#~ msgid "Manitowoc"
+#~ msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1971
-msgid "San Antonio-Kelly AFB"
-msgstr "San Antonio-Kelly AFB"
+#~ msgid "Mankato"
+#~ msgstr "Mankato"
 
-#: my-evolution/Locations.h:1972
-msgid "San Antonio-Stinson"
-msgstr "San Antonio-Stinson"
+#~ msgid "Mansfield"
+#~ msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1973
-msgid "San Carlos"
-msgstr "San Carlos"
+#~ msgid "Manta"
+#~ msgstr "Manta"
 
-#: my-evolution/Locations.h:1974
-msgid "Sandane"
-msgstr "Sandane"
+#~ msgid "Manzanillo"
+#~ msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1975
-msgid "Sandberg"
-msgstr "Sandberg"
+#~ msgid "Maraba"
+#~ msgstr "Maraba"
 
-#: my-evolution/Locations.h:1976
-msgid "Sanderson"
-msgstr "Sanderson"
+#~ msgid "Maracaibo-La Chinita"
+#~ msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1977
-msgid "San Diego"
-msgstr "San Diego"
+#~ msgid "Maracay-B.A.Sucre"
+#~ msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1978
-msgid "San Diego-Brown"
-msgstr "San Diego-Brown"
+#~ msgid "Marathon"
+#~ msgstr "Marathon"
 
-#: my-evolution/Locations.h:1979
-msgid "San Diego-Miramar"
-msgstr "San Diego-Miramar"
+#~ msgid "Mar Del Plata"
+#~ msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1980
-msgid "San Diego-Montgomery"
-msgstr "San Diego-Montgomery"
+#~ msgid "Margarita"
+#~ msgstr "Margarita"
 
-#: my-evolution/Locations.h:1981
-msgid "San Diego-North Island"
-msgstr "San Diego-North Island"
+#~ msgid "Marianna"
+#~ msgstr "Marianna"
 
-#: my-evolution/Locations.h:1982
-msgid "San Diego-Santee"
-msgstr "San Diego-Santee"
+#~ msgid "Marib"
+#~ msgstr "Marib"
 
-#: my-evolution/Locations.h:1983
-msgid "Sandnessjoen/Stokka"
-msgstr "Sandnessjoen/Stokka"
+#~ msgid "Maribor"
+#~ msgstr "Maribor"
 
-#: my-evolution/Locations.h:1984
-msgid "Sand Point"
-msgstr "Sand Point"
+#~ msgid "Marietta"
+#~ msgstr "Marietta"
 
-#: my-evolution/Locations.h:1985
-msgid "San Fernando De Apure"
-msgstr "San Fernando de Apure"
+#~ msgid "Marino di Ravenna"
+#~ msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1986
-msgid "Sanford"
-msgstr "Sanford"
+#~ msgid "Marion"
+#~ msgstr "Marion"
 
-#: my-evolution/Locations.h:1987
-msgid "San Francisco"
-msgstr "San Francisco"
+#~ msgid "Marion-Wytheville"
+#~ msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1988
-msgid "Sangju"
-msgstr "Sangju"
+#~ msgid "Marseille-Provence"
+#~ msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1989
-msgid "San Ignacio De Velasco"
-msgstr "San Ignacio de Velasco"
+#~ msgid "Marseilles"
+#~ msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1990
-msgid "San Joaquin"
-msgstr "San Joaquín"
+#~ msgid "Marshall"
+#~ msgstr "Marshall"
 
-#: my-evolution/Locations.h:1991
-msgid "San Jose"
-msgstr "San Jose"
+#~ msgid "Marshalltown"
+#~ msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1992
-msgid "San Jose De Chiquitos"
-msgstr "San Jose De Chiquitos"
+#~ msgid "Marshfield"
+#~ msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1993
-msgid "San Jose del Cabo"
-msgstr "San Jose del Cabo"
+#~ msgid "Marte"
+#~ msgstr "Marte"
 
-#: my-evolution/Locations.h:1994
-msgid "San Jose-Santa Clara"
-msgstr "San Jose-Santa Clara"
+#~ msgid "Marthas Vineyard"
+#~ msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1995
-msgid "San Juan"
-msgstr "San Juan"
+#~ msgid "Martinsburg"
+#~ msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1996
-msgid "Sankt-Peterburg"
-msgstr "Sankt-Peterburg"
+#~ msgid "Martinsville"
+#~ msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1997
-msgid "Sanliurfa"
-msgstr "Sanliurfa"
+#~ msgid "Maryland"
+#~ msgstr "Maryland"
 
-#: my-evolution/Locations.h:1998
-msgid "San Luis Obispo"
-msgstr "San Luis Obispo"
+#~ msgid "Marysville"
+#~ msgstr "Marysville"
 
-#: my-evolution/Locations.h:1999
-msgid "San Luis Potosi"
-msgstr "San Luis Potosí"
+#~ msgid "Marysville-Beale AFB"
+#~ msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:2000
-msgid "San Miguel"
-msgstr "San Miguel"
+#~ msgid "Mashhad"
+#~ msgstr "Mashhad"
 
-#: my-evolution/Locations.h:2001
-msgid "San Nicholas Island"
-msgstr "Isla de San Nicholas"
+#~ msgid "Masirah"
+#~ msgstr "Masirah"
 
-#: my-evolution/Locations.h:2002
-msgid "San Salvador"
-msgstr "San Salvador"
+#~ msgid "Mason City"
+#~ msgstr "Mason City"
 
-#: my-evolution/Locations.h:2003
-msgid "San Sebastian"
-msgstr "San Sebastián"
+#~ msgid "Massachusetts"
+#~ msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:2004
-msgid "Santa Ana"
-msgstr "Santa Ana"
+#~ msgid "Massena"
+#~ msgstr "Massena"
 
-#: my-evolution/Locations.h:2005
-msgid "Santa Barbara"
-msgstr "Santa Barbara"
+#~ msgid "Matamoros"
+#~ msgstr "Matamoros"
 
-#: my-evolution/Locations.h:2006
-msgid "Santa Cruz"
-msgstr "Santa Cruz"
+#~ msgid "Matsumoto Airport"
+#~ msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:2007
-msgid "Santa Fe"
-msgstr "Santa Fe"
+#~ msgid "Matsushima Ab"
+#~ msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:2008
-msgid "Santa Maria"
-msgstr "Santa María"
+#~ msgid "Matsuyama Airport"
+#~ msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:2009
-msgid "Santa Marta/Simon Bolivar"
-msgstr "Santa Marta/Simón Bolivar"
+#~ msgid "Mattoon"
+#~ msgstr "Mattoon"
 
-#: my-evolution/Locations.h:2010
-msgid "Santa Monica"
-msgstr "Santa Mónica"
+#~ msgid "Mayaguez"
+#~ msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:2011
-msgid "Santander"
-msgstr "Santander"
+#~ msgid "Mazatlan"
+#~ msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:2012
-msgid "Santarem"
-msgstr "Santarem"
+#~ msgid "Mazu"
+#~ msgstr "Mazu"
 
-#: my-evolution/Locations.h:2013
-msgid "Santa Rosa"
-msgstr "Santa Rosa"
+#~ msgid "McAlester"
+#~ msgstr "McAlester"
 
-#: my-evolution/Locations.h:2014
-msgid "Santa Rosa de Copan"
-msgstr "Santa Rosa de Copan"
+#~ msgid "McAllen"
+#~ msgstr "McAllen"
 
-#: my-evolution/Locations.h:2015
-msgid "Santiago"
-msgstr "Santiago"
+#~ msgid "McCall"
+#~ msgstr "McCall"
 
-#: my-evolution/Locations.h:2016
-msgid "Santiago de Cuba"
-msgstr "Santiago de Cuba"
+#~ msgid "McCarthy"
+#~ msgstr "McCarthy"
 
-#: my-evolution/Locations.h:2017
-msgid "Santiago Del Estero"
-msgstr "Santiago Del Estero"
+#~ msgid "McClellan"
+#~ msgstr "McClellan"
 
-#: my-evolution/Locations.h:2018
-msgid "Santorini"
-msgstr "Santorini"
+#~ msgid "McComb"
+#~ msgstr "McComb"
 
-#: my-evolution/Locations.h:2019
-msgid "Santos"
-msgstr "Santos"
+#~ msgid "McCook"
+#~ msgstr "McCook"
 
-#: my-evolution/Locations.h:2020
-msgid "Sao Jose Dos Campo"
-msgstr "Sao Jose Dos Campo"
+#~ msgid "McGrath"
+#~ msgstr "McGrath"
 
-#: my-evolution/Locations.h:2021
-msgid "Sao Luiz"
-msgstr "Sao Luiz"
+#~ msgid "Mc Gregor"
+#~ msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:2022
-msgid "Sao Paulo"
-msgstr "Sao Paulo"
+#~ msgid "Meacham"
+#~ msgstr "Meacham"
 
-#: my-evolution/Locations.h:2023
-msgid "Sapporo Ab"
-msgstr "Sapporo Ab"
+#~ msgid "Medford"
+#~ msgstr "Medford"
 
-#: my-evolution/Locations.h:2024
-msgid "Sarajevo"
-msgstr "Sarajevo"
+#~ msgid "Medicine Lodge"
+#~ msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:2025
-msgid "Saranac Lake"
-msgstr "Saranac Lake"
+#~ msgid "Mehamn"
+#~ msgstr "Mehamn"
 
-#: my-evolution/Locations.h:2026
-msgid "Sarasota"
-msgstr "Sarasota"
+#~ msgid "Mekoryuk"
+#~ msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:2027
-msgid "Saratov"
-msgstr "Saratov"
+#~ msgid "Melbourne"
+#~ msgstr "Melbourne"
 
-#: my-evolution/Locations.h:2028
-msgid "Sarzana"
-msgstr "Sarzana"
+#~ msgid "Melfa"
+#~ msgstr "Melfa"
 
-#: my-evolution/Locations.h:2029
-msgid "Saskatchewan"
-msgstr "Saskatchewan"
+#~ msgid "Melilla"
+#~ msgstr "Melilla"
 
-#: my-evolution/Locations.h:2030
-msgid "Saskatoon"
-msgstr "Saskatoon"
+#~ msgid "Memambetsu Airport"
+#~ msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:2031
-msgid "Sauce Viejo"
-msgstr "Sauce Viejo"
+#~ msgid "Memphis"
+#~ msgstr "Memphis"
 
-#: my-evolution/Locations.h:2033
-msgid "Sault Ste Marie"
-msgstr "Sault Ste Marie"
+#~ msgid "Memphis-NAS"
+#~ msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:2034
-msgid "Savannah"
-msgstr "Savannah"
+#~ msgid "Mendoza"
+#~ msgstr "Mendoza"
 
-#: my-evolution/Locations.h:2035
-msgid "Savannah-Hunter AAF"
-msgstr "Savannah-Hunter AAF"
+#~ msgid "Mene Grande"
+#~ msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:2036
-msgid "Sawyer AFB"
-msgstr "Sawyer AF"
+#~ msgid "Menominee"
+#~ msgstr "Menominee"
 
-#: my-evolution/Locations.h:2037
-msgid "Sayun"
-msgstr "Sayun"
+#~ msgid "Menorca"
+#~ msgstr "Menorca"
 
-#: my-evolution/Locations.h:2038
-msgid "Scatsta"
-msgstr "Scatsta"
+#~ msgid "Merced"
+#~ msgstr "Merced"
 
-#: my-evolution/Locations.h:2039
-msgid "Schaffen"
-msgstr "Schaffen"
+#~ msgid "Merida"
+#~ msgstr "Mérida"
 
-#: my-evolution/Locations.h:2040
-msgid "Schenectady"
-msgstr "Schenectady"
+#~ msgid "Meridian"
+#~ msgstr "Meridian"
 
-#: my-evolution/Locations.h:2041
-msgid "Scilly Isles"
-msgstr "Scilly Isles"
+#~ msgid "Meridian-Lauderdale"
+#~ msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:2042
-msgid "Scottsbluff"
-msgstr "Scottsbluff"
+#~ msgid "Merril Field"
+#~ msgstr "Merril Field"
 
-#: my-evolution/Locations.h:2043
-msgid "Scottsdale"
-msgstr "Scottsdale"
+#~ msgid "Mersa Matruh"
+#~ msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:2044
-msgid "Scranton"
-msgstr "Scranton"
+#~ msgid "Mesa-Falcon Field"
+#~ msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:2045
-msgid "Seattle"
-msgstr "Seattle"
+#~ msgid "Metabaru Ab"
+#~ msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:2046
-msgid "Seattle-Boeing"
-msgstr "Seattle-Boeing"
+#~ msgid "Metz-Frescaty"
+#~ msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:2047
-msgid "Sedalia"
-msgstr "Sedalia"
+#~ msgid "Mexicali"
+#~ msgstr "Mexicali"
 
-#: my-evolution/Locations.h:2048
-msgid "Seeb"
-msgstr "Seeb"
+#~ msgid "Miami"
+#~ msgstr "Miami"
 
-#: my-evolution/Locations.h:2049
-msgid "Selanik"
-msgstr "Selanik"
+#~ msgid "Miami-Kendall"
+#~ msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:2050
-msgid "Sendai Airport"
-msgstr "Aeropuerto de Sendai"
+#~ msgid "Miami-Opa Locka"
+#~ msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:2051
-msgid "Seoul E Ab"
-msgstr "Seoul E Ab"
+#~ msgid "Michigan"
+#~ msgstr "Míchigan"
 
-#: my-evolution/Locations.h:2052
-msgid "Seoul/Kimp'O International Airport"
-msgstr "Aeropuerto Internacional de Seoul/Kimp'O"
+#~ msgid "Middle East"
+#~ msgstr "Oriente Medio"
 
-#: my-evolution/Locations.h:2053
-msgid "Seoul/Yongdungp'O Rokaf Wc"
-msgstr "Seoul/Yongdungp'O Rokaf Wc"
+#~ msgid "Middleton Island"
+#~ msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:2054
-msgid "Sept-Iles"
-msgstr "Sept-Iles"
+#~ msgid "Middletown"
+#~ msgstr "Middletown"
 
-#: my-evolution/Locations.h:2055
-msgid "Seul Choix Pt"
-msgstr "Seul Choix Pt"
+#~ msgid "Midland"
+#~ msgstr "Midland"
 
-#: my-evolution/Locations.h:2056
-msgid "Sevilla"
-msgstr "Sevilla"
+#~ msgid "Miho Ab"
+#~ msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:2057
-msgid "Seward"
-msgstr "Seward"
+#~ msgid "Milano/Linate"
+#~ msgstr "Milán/Linate"
 
-#: my-evolution/Locations.h:2058
-msgid "Sexton Summit"
-msgstr "Sexton Summit"
+#~ msgid "Milano/Malpensa"
+#~ msgstr "Milán/Malpensa"
 
-#: my-evolution/Locations.h:2059
-msgid "Shanghai"
-msgstr "Shanghai"
+#~ msgid "Miles City"
+#~ msgstr "Miles City"
 
-#: my-evolution/Locations.h:2060
-msgid "Shannon"
-msgstr "Shannon"
+#~ msgid "Milford"
+#~ msgstr "Milford"
 
-#: my-evolution/Locations.h:2061
-msgid "Sharjah"
-msgstr "Sharjah"
+#~ msgid "Millinocket"
+#~ msgstr "Millinocket"
 
-#: my-evolution/Locations.h:2062
-msgid "Sharm El Sheikhintl"
-msgstr "Sharm El Sheikhintl"
+#~ msgid "Millville"
+#~ msgstr "Millville"
 
-#: my-evolution/Locations.h:2063
-msgid "Sharurah"
-msgstr "Sharurah"
+#~ msgid "Milton"
+#~ msgstr "Milton"
 
-#: my-evolution/Locations.h:2064
-msgid "Shawbury"
-msgstr "Shawbury"
+#~ msgid "Milwaukee"
+#~ msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:2065
-msgid "Shearwater"
-msgstr "Shearwater"
+#~ msgid "Milwaukee-Timmerman"
+#~ msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:2066
-msgid "Sheboygan"
-msgstr "Sheboygan"
+#~ msgid "Minamitorishima"
+#~ msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:2067
-msgid "Sheldon"
-msgstr "Sheldon"
+#~ msgid "Minatitlan"
+#~ msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:2068
-msgid "Shelter Cove"
-msgstr "Shelter Cove"
+#~ msgid "Minchumina"
+#~ msgstr "Minchumina"
 
-#: my-evolution/Locations.h:2069
-msgid "Shelton"
-msgstr "Shelton"
+#~ msgid "Mineralnye Vody"
+#~ msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:2070
-msgid "Shenandoah"
-msgstr "Shenandoah"
+#~ msgid "Mineral Wells"
+#~ msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:2071
-msgid "Sheridan"
-msgstr "Sheridan"
+#~ msgid "Minneapolis"
+#~ msgstr "Mineápolis"
 
-#: my-evolution/Locations.h:2072
-msgid "Sherman-Denison"
-msgstr "Sherman-Denison"
+#~ msgid "Minneapolis [2]"
+#~ msgstr "Mineápolis [2]"
 
-#: my-evolution/Locations.h:2073
-msgid "Shimofusa Ab"
-msgstr "Shimofusa Ab"
+#~ msgid "Minneapolis [3]"
+#~ msgstr "Mineápolis [3]"
 
-#: my-evolution/Locations.h:2074
-msgid "Shingle Point"
-msgstr "Shingle Point"
+#~ msgid "Minnesota"
+#~ msgstr "Minesota"
 
-#: my-evolution/Locations.h:2075
-msgid "Shiraz"
-msgstr "Shiraz"
+#~ msgid "Minocqua"
+#~ msgstr "Minocqua"
 
-#: my-evolution/Locations.h:2076
-msgid "Shishmaref"
-msgstr "Shishmaref"
+#~ msgid "Minot"
+#~ msgstr "Minot"
 
-#: my-evolution/Locations.h:2077
-msgid "Shizuhama Ab"
-msgstr "Shizuhama Ab"
+#~ msgid "Minot AFB"
+#~ msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:2078
-msgid "Shoreham"
-msgstr "Shoreham"
+#~ msgid "Misawa Ab"
+#~ msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:2079
-msgid "Show Low"
-msgstr "Show Low"
+#~ msgid "Mississippi"
+#~ msgstr "Misisipi"
 
-#: my-evolution/Locations.h:2080
-msgid "Shreveport Downtown"
-msgstr "Shreveport Downtown"
+#~ msgid "Missoula"
+#~ msgstr "Missoula"
 
-#: my-evolution/Locations.h:2081
-msgid "Shreveport Regional"
-msgstr "Shreveport Regional"
+#~ msgid "Missouri"
+#~ msgstr "Missouri"
 
-#: my-evolution/Locations.h:2082
-msgid "Sidney"
-msgstr "Sidney"
+#~ msgid "Mitchell"
+#~ msgstr "Mitchell"
 
-#: my-evolution/Locations.h:2083
-msgid "Sigonella"
-msgstr "Sigonella"
+#~ msgid "Mitilini"
+#~ msgstr "Mitilini"
 
-#: my-evolution/Locations.h:2084
-msgid "Siloam Springs"
-msgstr "Siloam Springs"
+#~ msgid "Miyakejima Airport"
+#~ msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:2085
-msgid "Silver City"
-msgstr "Silver City"
+#~ msgid "Miyazaki Airport"
+#~ msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:2086
-msgid "Sindal"
-msgstr "Sindal"
+#~ msgid "Moa"
+#~ msgstr "Moa"
 
-#: my-evolution/Locations.h:2088
-msgid "Sioux City"
-msgstr "Sioux City"
+#~ msgid "Mobile Downtown"
+#~ msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:2089
-msgid "Sioux Falls"
-msgstr "Sioux Falls"
+#~ msgid "Mobile Regional Airport"
+#~ msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:2090
-msgid "Sitka"
-msgstr "Sitka"
+#~ msgid "Mobridge"
+#~ msgstr "Mobridge"
 
-#: my-evolution/Locations.h:2091
-msgid "Sivas"
-msgstr "Sivas"
+#~ msgid "Modesto"
+#~ msgstr "Modesto"
 
-#: my-evolution/Locations.h:2092
-msgid "Sivrihisar"
-msgstr "Sivrihisar"
+#~ msgid "Mo I Rana"
+#~ msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:2093
-msgid "Skagway"
-msgstr "Skagway"
+#~ msgid "Mojave"
+#~ msgstr "Mojave"
 
-#: my-evolution/Locations.h:2094
-msgid "Skiathos"
-msgstr "Skiathos"
+#~ msgid "Molde"
+#~ msgstr "Molde"
 
-#: my-evolution/Locations.h:2095
-msgid "Skien/Geiteryggen"
-msgstr "Skien/Geiteryggen"
+#~ msgid "Moldova"
+#~ msgstr "Moldova"
 
-#: my-evolution/Locations.h:2096
-msgid "Skive"
-msgstr "Skive"
+#~ msgid "Moline-Quad Cities"
+#~ msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:2097
-msgid "Skopje"
-msgstr "Skopje"
+#~ msgid "Molokai"
+#~ msgstr "Molokai"
 
-#: my-evolution/Locations.h:2098
-msgid "Skwentna"
-msgstr "Skwentna"
+#~ msgid "Mombetsu Airport"
+#~ msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:2099
-msgid "Slana"
-msgstr "Slana"
+#~ msgid "Monchengladbach"
+#~ msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:2102
-msgid "Smithers"
-msgstr "Smithers"
+#~ msgid "Monclova"
+#~ msgstr "Monclova"
 
-#: my-evolution/Locations.h:2103
-msgid "Smyrna"
-msgstr "Smyrna"
+#~ msgid "Moncton"
+#~ msgstr "Moncton"
 
-#: my-evolution/Locations.h:2104
-msgid "Snowshoe Lake"
-msgstr "Lago Snowshoe"
+#~ msgid "Monida"
+#~ msgstr "Monida"
 
-#: my-evolution/Locations.h:2105
-msgid "Sochi"
-msgstr "Sochi"
+#~ msgid "Monpellier-Mediterrannee"
+#~ msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:2106
-msgid "Socorro"
-msgstr "Socorro"
+#~ msgid "Monroe"
+#~ msgstr "Monroe"
 
-#: my-evolution/Locations.h:2107
-msgid "Socotra"
-msgstr "Socotra"
+#~ msgid "Montague"
+#~ msgstr "Montague"
 
-#: my-evolution/Locations.h:2108
-msgid "Soda Springs"
-msgstr "Soda Springs"
+#~ msgid "Montana"
+#~ msgstr "Montana"
 
-#: my-evolution/Locations.h:2109
-msgid "Sofia"
-msgstr "Sofía"
+#~ msgid "Mont-de-Marsan"
+#~ msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:2110
-msgid "Sogndal"
-msgstr "Sogndal"
+#~ msgid "Monte Argentario"
+#~ msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:2111
-msgid "Soldotna"
-msgstr "Soldotna"
+#~ msgid "Monte Bisbino"
+#~ msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:2112
-msgid "Somerset"
-msgstr "Somerset"
+#~ msgid "Monte Calamita"
+#~ msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:2113
-msgid "Sonderborg"
-msgstr "Sonderborg"
+#~ msgid "Monte Cimone"
+#~ msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:2114
-msgid "Songmu Ab"
-msgstr "Songmu Ab"
+#~ msgid "Montego Bay"
+#~ msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:2115
-msgid "Sorkjosen"
-msgstr "Sorkjosen"
+#~ msgid "Monte Malanotte"
+#~ msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:2117
-msgid "Southampton"
-msgstr "Southampton"
+#~ msgid "Monterey"
+#~ msgstr "Monterey"
 
-#: my-evolution/Locations.h:2118
-msgid "South Bend"
-msgstr "South Bend"
+#~ msgid "Monterrey"
+#~ msgstr "Monterrey"
 
-#: my-evolution/Locations.h:2119
-msgid "South Carolina"
-msgstr "Carolina del Sur"
+#~ msgid "Monte Scuro"
+#~ msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:2120
-msgid "South Dakota"
-msgstr "Dakota del Sur"
+#~ msgid "Monte Terminillo"
+#~ msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:2121
-msgid "Southend"
-msgstr "Southend"
+#~ msgid "Montevideo/Carrasco"
+#~ msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:2122
-msgid "South Marsh Island"
-msgstr "South Marsh Island"
+#~ msgid "Montgomery"
+#~ msgstr "Montgomery"
 
-#: my-evolution/Locations.h:2123
-msgid "South Timbalier"
-msgstr "South Timbalier"
+#~ msgid "Montgomery-Maxwell AFB"
+#~ msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:2125
-msgid "Sparrevohn"
-msgstr "Sparrevohn"
+#~ msgid "Monticello"
+#~ msgstr "Monticello"
 
-#: my-evolution/Locations.h:2126
-msgid "Spencer"
-msgstr "Spencer"
+#~ msgid "Montpelier"
+#~ msgstr "Montpelier"
 
-#: my-evolution/Locations.h:2127
-msgid "Spickard"
-msgstr "Spickard"
+#~ msgid "Montreal Dorval"
+#~ msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:2128
-msgid "Split"
-msgstr "Split"
+#~ msgid "Montreal Mirabel"
+#~ msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:2129
-msgid "Spokane"
-msgstr "Spokane"
+#~ msgid "Montreal Saint-Hubert"
+#~ msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:2130
-msgid "Spokane-Parkwater"
-msgstr "Spokane-Parkwater"
+#~ msgid "Montrose"
+#~ msgstr "Montrose"
 
-#: my-evolution/Locations.h:2131
-msgid "Springbok"
-msgstr "Springbok"
+#~ msgid "Montrose (2)"
+#~ msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:2132
-msgid "Springfield"
-msgstr "Springfield"
+#~ msgid "Morelia"
+#~ msgstr "Morelia"
 
-#: my-evolution/Locations.h:2133
-msgid "Stampede Pass"
-msgstr "Stampede Pass"
+#~ msgid "Morgantown"
+#~ msgstr "Morgantown"
 
-#: my-evolution/Locations.h:2134
-msgid "State College"
-msgstr "State College"
+#~ msgid "Moriarty"
+#~ msgstr "Moriarty"
 
-#: my-evolution/Locations.h:2135
-msgid "Stauning"
-msgstr "Stauning"
+#~ msgid "Morristown"
+#~ msgstr "Morristown"
 
-#: my-evolution/Locations.h:2136
-msgid "Staunton"
-msgstr "Staunton"
+#~ msgid "Moscow Domodedovo"
+#~ msgstr "Moscú Domodedovo"
 
-#: my-evolution/Locations.h:2137
-msgid "Stavanger/Sola"
-msgstr "Stavanger/Sola"
+#~ msgid "Moscow Sheremetyevo"
+#~ msgstr "Moscú Sheremetyevo"
 
-#: my-evolution/Locations.h:2138
-msgid "Staverton"
-msgstr "Staverton"
+#~ msgid "Moses Lake"
+#~ msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:2139
-msgid "Stavropol"
-msgstr "Stavropol"
+#~ msgid "Mosinee"
+#~ msgstr "Mosinee"
 
-#: my-evolution/Locations.h:2140
-msgid "St Cloud"
-msgstr "St Cloud"
+#~ msgid "Mosjoen"
+#~ msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:2141
-msgid "Steamboat Springs"
-msgstr "Steamboat Springs"
+#~ msgid "Moultrie"
+#~ msgstr "Moultrie"
 
-#: my-evolution/Locations.h:2142
-msgid "Stephenville"
-msgstr "Stephenville"
+#~ msgid "Mountain Home"
+#~ msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:2143
-msgid "St. George"
-msgstr "St. George"
+#~ msgid "Mountain View"
+#~ msgstr "Mountain View"
 
-#: my-evolution/Locations.h:2144
-msgid "Stillwater"
-msgstr "Stillwater"
+#~ msgid "Mount Clemens"
+#~ msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:2145
-msgid "St. John's"
-msgstr "St. John's"
+#~ msgid "Mount Holly"
+#~ msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:2146
-msgid "St Johnsbury"
-msgstr "San Johnsbury"
+#~ msgid "Mount Shasta"
+#~ msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:2147
-msgid "St Joseph"
-msgstr "San Joseph"
+#~ msgid "Mount Vernon"
+#~ msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:2148
-msgid "St Louis"
-msgstr "San Luis"
+#~ msgid "Mount Wilson"
+#~ msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:2149
-msgid "St Louis-Spirit"
-msgstr "Espíritu de San Luis"
+#~ msgid "Mt Washington"
+#~ msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:2150
-msgid "Stockholm (Arlanda)"
-msgstr "Stockholmo (Arlanda)"
+#~ msgid "Mugla/Dalaman"
+#~ msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:2151
-msgid "Stockholm (Bromma)"
-msgstr "Stockholmo (Bromma)"
+#~ msgid "Muir"
+#~ msgstr "Muir"
 
-#: my-evolution/Locations.h:2152
-msgid "Stockton"
-msgstr "Stockton"
+#~ msgid "Mullan"
+#~ msgstr "Mullan"
 
-#: my-evolution/Locations.h:2153
-msgid "Stokmarknes/Skagen"
-msgstr "Stokmarknes/Skagen"
+#~ msgid "Mullen"
+#~ msgstr "Mullen"
 
-#: my-evolution/Locations.h:2154
-msgid "Stord/Sorstokken"
-msgstr "Stord/Sorstokken"
+#~ msgid "Munchen"
+#~ msgstr "Munchen"
 
-#: my-evolution/Locations.h:2155
-msgid "Storm Lake"
-msgstr "Lago Storm"
+#~ msgid "Muncie"
+#~ msgstr "Muncie"
 
-#: my-evolution/Locations.h:2156
-msgid "Stornoway"
-msgstr "Stornoway"
+#~ msgid "Munster/Osnabruck"
+#~ msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:2157
-msgid "St Paul"
-msgstr "San Paul"
+#~ msgid "Murcia"
+#~ msgstr "Murcia"
 
-#: my-evolution/Locations.h:2158
-msgid "St Petersburg"
-msgstr "San Petersburgo"
+#~ msgid "Murmansk"
+#~ msgstr "Murmansk"
 
-#: my-evolution/Locations.h:2159
-msgid "St Petersburg / Clearwater"
-msgstr "San Petersburgo / Clearwater"
+#~ msgid "Mus"
+#~ msgstr "Mus"
 
-#: my-evolution/Locations.h:2160
-msgid "Strasbourg"
-msgstr "Strasbourg"
+#~ msgid "Muscatine"
+#~ msgstr "Muscaline"
 
-#: my-evolution/Locations.h:2161
-msgid "Strevell"
-msgstr "Strevell"
+#~ msgid "Muscle Shoals"
+#~ msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:2162
-msgid "St Simon's Island"
-msgstr "Isla San Simón"
+#~ msgid "Muskegon"
+#~ msgstr "Muskegon"
 
-#: my-evolution/Locations.h:2163
-msgid "Stumpy Point"
-msgstr "Stumpy Point"
+#~ msgid "Mykonos"
+#~ msgstr "Mykonos"
 
-#: my-evolution/Locations.h:2164
-msgid "Sturgeon Bay"
-msgstr "Sturgeon Bay"
+#~ msgid "Myrtle Beach"
+#~ msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:2165
-msgid "Stuttgart"
-msgstr "Stuttgart"
+#~ msgid "Nabesna/Devil Mt."
+#~ msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:2166
-msgid "Sucre"
-msgstr "Sucre"
+#~ msgid "Nacogdoches"
+#~ msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:2167
-msgid "Sumburgh"
-msgstr "Sumburgh"
+#~ msgid "Nagasaki Airport"
+#~ msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:2168
-msgid "Sumter"
-msgstr "Sumter"
+#~ msgid "Nagoya Airport"
+#~ msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:2169
-msgid "Sumter (2)"
-msgstr "Sumter (2)"
+#~ msgid "Nagpur Sonegaon"
+#~ msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:2170
-msgid "Sundsvall-Harnosand"
-msgstr "Sundsvall-Harnosand"
+#~ msgid "Naha Airport"
+#~ msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:2171
-msgid "Sungshan/Taipei"
-msgstr "Sungshan/Taipei"
+#~ msgid "Najran"
+#~ msgstr "Najran"
 
-#: my-evolution/Locations.h:2172
-msgid "Superior"
-msgstr "Superior"
+#~ msgid "Nakashibetsu Airport"
+#~ msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:2174
-msgid "Sutton"
-msgstr "Sutton"
+#~ msgid "Nalchik"
+#~ msgstr "Nalchik"
 
-#: my-evolution/Locations.h:2175
-msgid "Suwon Ab"
-msgstr "Suwon Ab"
+#~ msgid "Namsos"
+#~ msgstr "Namsos"
 
-#: my-evolution/Locations.h:2176
-msgid "Svalbard"
-msgstr "Svalbard"
+#~ msgid "Nancy-Essey"
+#~ msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:2177
-msgid "Svolvaer/Helle"
-msgstr "Svolvaer/Helle"
+#~ msgid "Nancy-Ochey"
+#~ msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:2179
-msgid "Swift Current"
-msgstr "Swift Current"
+#~ msgid "Nankishirahama Airport"
+#~ msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:2181
-msgid "Sydney"
-msgstr "Sydney"
+#~ msgid "Nanning"
+#~ msgstr "Nanning"
 
-#: my-evolution/Locations.h:2182
-msgid "Syktyvkar"
-msgstr "Syktyvkar"
+#~ msgid "Nantes Adlantique"
+#~ msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:2183
-msgid "Sympheropol"
-msgstr "Sympheropol"
+#~ msgid "Nantucket"
+#~ msgstr "Nantucket"
 
-#: my-evolution/Locations.h:2184
-msgid "Syracuse"
-msgstr "Syracusa"
+#~ msgid "Napa"
+#~ msgstr "Napa"
 
-#: my-evolution/Locations.h:2185
-msgid "Szczecin"
-msgstr "Szczecin"
+#~ msgid "Naples"
+#~ msgstr "Nápoles"
 
-#: my-evolution/Locations.h:2186
-msgid "Szombathely"
-msgstr "Szombathely"
+#~ msgid "Napoli"
+#~ msgstr "Napoli"
 
-#: my-evolution/Locations.h:2187
-msgid "Tabatinga"
-msgstr "Tabatinga"
+#~ msgid "Narvik"
+#~ msgstr "Narvik"
 
-#: my-evolution/Locations.h:2188
-msgid "Tabriz"
-msgstr "Tabriz"
+#~ msgid "Nasa Shuttle"
+#~ msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:2189
-msgid "Tabuk"
-msgstr "Tabuk"
+#~ msgid "Nashua"
+#~ msgstr "Nashua"
 
-#: my-evolution/Locations.h:2190
-msgid "Tachikawa Ab"
-msgstr "Tachikawa Ab"
+#~ msgid "Nashville"
+#~ msgstr "Nashville"
 
-#: my-evolution/Locations.h:2191
-msgid "Tacna"
-msgstr "Tacna"
+#~ msgid "Nassau"
+#~ msgstr "Nassau"
 
-#: my-evolution/Locations.h:2192
-msgid "Tacoma"
-msgstr "Tacoma"
+#~ msgid "Natal"
+#~ msgstr "Natal"
 
-#: my-evolution/Locations.h:2193
-msgid "Tacoma-Lakewood"
-msgstr "Tacoma-Lakewood"
+#~ msgid "Natchez"
+#~ msgstr "Natchez"
 
-#: my-evolution/Locations.h:2194
-msgid "Tacuarembo"
-msgstr "Tacuarembo"
+#~ msgid "Nawabshah"
+#~ msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:2195
-msgid "Taegu"
-msgstr "Taegu"
+#~ msgid "Nebraska"
+#~ msgstr "Nebraska"
 
-#: my-evolution/Locations.h:2196
-msgid "Taegu Ab"
-msgstr "Taegu Ab"
+#~ msgid "Needles"
+#~ msgstr "Needles"
 
-#: my-evolution/Locations.h:2197
-msgid "Taejon"
-msgstr "Taejon"
+#~ msgid "Nenana"
+#~ msgstr "Nenana"
 
-#: my-evolution/Locations.h:2198
-msgid "Tahoe Valley"
-msgstr "Tahoe Valley"
+#~ msgid "Neuquen"
+#~ msgstr "Neuquen"
 
-#: my-evolution/Locations.h:2199
-msgid "Taichung"
-msgstr "Taichung"
+#~ msgid "Nevada"
+#~ msgstr "Nevada"
 
-#: my-evolution/Locations.h:2200
-msgid "Taif"
-msgstr "Taif"
+#~ msgid "Newark"
+#~ msgstr "Newark"
 
-#: my-evolution/Locations.h:2201
-msgid "Tainan"
-msgstr "Tainan"
+#~ msgid "New Bedford"
+#~ msgstr "New Bedford"
 
-#: my-evolution/Locations.h:2203
-msgid "Taiyuan"
-msgstr "Taiyuan"
+#~ msgid "New Bern"
+#~ msgstr "New Bern"
 
-#: my-evolution/Locations.h:2204
-msgid "Taiz"
-msgstr "Taiz"
+#~ msgid "New Braunfels"
+#~ msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:2205
-msgid "Tajima"
-msgstr "Tajima"
+#~ msgid "New Brunswick"
+#~ msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:2206
-msgid "Takamatsu Airport"
-msgstr "Aeropuerto de Takamatsu"
+#~ msgid "Newburgh"
+#~ msgstr "Newburgh"
 
-#: my-evolution/Locations.h:2207
-msgid "Talara"
-msgstr "Talara"
+#~ msgid "Newcastle"
+#~ msgstr "Newcastle"
 
-#: my-evolution/Locations.h:2208
-msgid "Talkeetna"
-msgstr "Talkeetna"
+#~ msgid "New Delhi/Palam"
+#~ msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:2209
-msgid "Tallahassee"
-msgstr "Tallahassee"
+#~ msgid "Newfoundland"
+#~ msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:2210
-msgid "Tallinn"
-msgstr "Tallinn"
+#~ msgid "New Hampshire"
+#~ msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:2211
-msgid "Tamanrasset"
-msgstr "Tamanrasset"
+#~ msgid "New Haven"
+#~ msgstr "New Haven"
 
-#: my-evolution/Locations.h:2212
-msgid "Tamanrasset/Aguenna"
-msgstr "Tamanrasset/Aguenna"
+#~ msgid "New Iberia"
+#~ msgstr "New Iberia"
 
-#: my-evolution/Locations.h:2213
-msgid "Tampa"
-msgstr "Tampa"
+#~ msgid "New Jersey"
+#~ msgstr "Nueva Jersey"
 
-#: my-evolution/Locations.h:2214
-msgid "Tampa-Macdill AFB"
-msgstr "Tampa-Macdill AFB"
+#~ msgid "New Mexico"
+#~ msgstr "Nuevo México"
 
-#: my-evolution/Locations.h:2215
-msgid "Tampere"
-msgstr "Tampere"
+#~ msgid "New Orleans"
+#~ msgstr "Nueva Orleans"
 
-#: my-evolution/Locations.h:2216
-msgid "Tampico"
-msgstr "Tampico"
+#~ msgid "New Orleans-Lakefront"
+#~ msgstr "Nueva Orleans-Lakefront"
 
-#: my-evolution/Locations.h:2217
-msgid "Tanana"
-msgstr "Tanana"
+#~ msgid "New Orleans NAS"
+#~ msgstr "Nueva Orleans NAS"
 
-#: my-evolution/Locations.h:2218
-msgid "Tanegashima Airport"
-msgstr "Aeropuerto de Tanegashima"
+#~ msgid "Newport"
+#~ msgstr "Newport"
 
-#: my-evolution/Locations.h:2219
-msgid "Taos"
-msgstr "Taos"
+#~ msgid "Newport News"
+#~ msgstr "Newport News"
 
-#: my-evolution/Locations.h:2220
-msgid "Taoyuan"
-msgstr "Taoyuan"
+#~ msgid "New Port Richey"
+#~ msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:2221
-msgid "Tapachula"
-msgstr "Tapachula"
+#~ msgid "New River"
+#~ msgstr "New River"
 
-#: my-evolution/Locations.h:2222
-msgid "Taranto"
-msgstr "Taranto"
+#~ msgid "New Tokyo International Airport"
+#~ msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:2223
-msgid "Tarbes"
-msgstr "Tarbes"
+#~ msgid "Newton"
+#~ msgstr "Newton"
 
-#: my-evolution/Locations.h:2224
-msgid "Tarija"
-msgstr "Tarija"
+#~ msgid "New York"
+#~ msgstr "Nueva York"
 
-#: my-evolution/Locations.h:2225
-msgid "Tarvisio"
-msgstr "Tarvisio"
+#~ msgid "New York-JFK Arpt"
+#~ msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:2226
-msgid "Tatalina"
-msgstr "Tatalina"
+#~ msgid "New York-La Guardia"
+#~ msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:2227
-msgid "Tateyama Ab"
-msgstr "Tateyama Ab"
+#~ msgid "Niagara Falls"
+#~ msgstr "Cataratas del Niágara"
 
-#: my-evolution/Locations.h:2228
-msgid "Taunton"
-msgstr "Taunton"
+#~ msgid "Nice-Cote d'Azur"
+#~ msgstr "Niza-Costa Azul"
 
-#: my-evolution/Locations.h:2229
-msgid "Tebessa"
-msgstr "Tebessa"
+#~ msgid "Niigata Airport"
+#~ msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:2230
-msgid "Tees-Side"
-msgstr "Tees-Side"
+#~ msgid "Nimes-Garons"
+#~ msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:2231
-msgid "Tegucigalpa"
-msgstr "Tegucigalpa"
+#~ msgid "Nipawin"
+#~ msgstr "Nipawin"
 
-#: my-evolution/Locations.h:2232
-msgid "Tehran-Mehrabad"
-msgstr "Tehran-Mehrabad"
+#~ msgid "Nis"
+#~ msgstr "Nis"
 
-#: my-evolution/Locations.h:2233
-msgid "Tela"
-msgstr "Tela"
+#~ msgid "Nizhny Novgorod"
+#~ msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:2234
-msgid "Temple"
-msgstr "Temple"
+#~ msgid "N Las Vegas"
+#~ msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:2235
-msgid "Tennessee"
-msgstr "Tennessee"
+#~ msgid "N Myrtle Beach"
+#~ msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:2236
-msgid "Tepic"
-msgstr "Tepic"
+#~ msgid "Nogales"
+#~ msgstr "Nogales"
 
-#: my-evolution/Locations.h:2237
-msgid "Teresina"
-msgstr "Teresina"
+#~ msgid "Nome"
+#~ msgstr "Nome"
 
-#: my-evolution/Locations.h:2238
-msgid "Terre Haute"
-msgstr "Terre Haute"
+#~ msgid "Norfolk"
+#~ msgstr "Norfolk"
 
-#: my-evolution/Locations.h:2239
-msgid "Terrell"
-msgstr "Terrell"
+#~ msgid "Norfolk NAS"
+#~ msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:2240
-msgid "Teterboro"
-msgstr "Teterboro"
+#~ msgid "Norrkoping"
+#~ msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:2241
-msgid "Texarkana"
-msgstr "Texarkana"
+#~ msgid "North Adams"
+#~ msgstr "North Adams"
 
-#: my-evolution/Locations.h:2242
-msgid "Texas"
-msgstr "Texas"
+#~ msgid "North Bend"
+#~ msgstr "North Bend"
 
-#: my-evolution/Locations.h:2243
-msgid "The Dalles"
-msgstr "The Dalles"
+#~ msgid "North Carolina"
+#~ msgstr "Carolina del Norte"
 
-#: my-evolution/Locations.h:2244
-msgid "Thessaloniki"
-msgstr "Tesalónica"
+#~ msgid "North Conway"
+#~ msgstr "North Conway"
 
-#: my-evolution/Locations.h:2245
-msgid "Thief River Falls"
-msgstr "Thief River Falls"
+#~ msgid "North Dakota"
+#~ msgstr "Dakota del Norte"
 
-#: my-evolution/Locations.h:2246
-msgid "Thiruvananthapuram"
-msgstr "Thiruvananthapuram"
+#~ msgid "Northeast Philadelphia"
+#~ msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:2247
-msgid "Thisted"
-msgstr "Thisted"
+#~ msgid "North Kingstown"
+#~ msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:2248
-msgid "Thompson Falls"
-msgstr "Thompson Falls"
+#~ msgid "North Platte"
+#~ msgstr "North Platte"
 
-#: my-evolution/Locations.h:2249
-msgid "Thumrait"
-msgstr "Thumrait"
+#~ msgid "Northway"
+#~ msgstr "Northway"
 
-#: my-evolution/Locations.h:2250
-msgid "Tianjin"
-msgstr "Tianjin"
+#~ msgid "Northwest Territories"
+#~ msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:2251
-msgid "Tijuana"
-msgstr "Tijuana"
+#~ msgid "Norwich"
+#~ msgstr "Norwich"
 
-#: my-evolution/Locations.h:2252
-msgid "Timisoara"
-msgstr "Timisoara"
+#~ msgid "Norwood"
+#~ msgstr "Norwood"
 
-#: my-evolution/Locations.h:2253
-msgid "Tin City"
-msgstr "Tin City"
+#~ msgid "Notodden"
+#~ msgstr "Notodden"
 
-#: my-evolution/Locations.h:2254
-msgid "Tirana"
-msgstr "Tirana"
+#~ msgid "Novara/Cameri"
+#~ msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:2255
-msgid "Tiree"
-msgstr "Tiree"
+#~ msgid "Nova Scotia"
+#~ msgstr "Nueva Escocia"
 
-#: my-evolution/Locations.h:2256
-msgid "Tirgu Mures"
-msgstr "Tirgu Mures"
+#~ msgid "Novosibirsk"
+#~ msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:2257
-msgid "Tiruchchirapalli"
-msgstr "Tiruchchirapalli"
+#~ msgid "Nueva Gerona"
+#~ msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:2258
-msgid "Titusville"
-msgstr "Titusville"
+#~ msgid "Nueva Ocotepeque"
+#~ msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:2259
-msgid "Tivat"
-msgstr "Tivat"
+#~ msgid "Nuevo Laredo"
+#~ msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:2260
-msgid "Tlemcen Zenata"
-msgstr "Tlemcen Zenata"
+#~ msgid "Nurnberg"
+#~ msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:2261
-msgid "Tobias Bolanos"
-msgstr "Tobias Bolanos"
+#~ msgid "Nyutabaru Ab"
+#~ msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:2262
-msgid "Tocumen"
-msgstr "Tocumen"
+#~ msgid "Oahu"
+#~ msgstr "Oahu"
 
-#: my-evolution/Locations.h:2263
-msgid "Togiak Village"
-msgstr "Togiak Village"
+#~ msgid "Oak Harbor"
+#~ msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:2264
-msgid "Tokachi GSDF"
-msgstr "Tokachi GSDF"
+#~ msgid "Oakland"
+#~ msgstr "Oakland"
 
-#: my-evolution/Locations.h:2265
-msgid "Tokunoshima Island"
-msgstr "Tokunoshima, isla de"
+#~ msgid "Oaxaca"
+#~ msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:2266
-msgid "Tokushima Ab"
-msgstr "Tokushima Ab"
+#~ msgid "Oberpfaffenhofen"
+#~ msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:2267
-msgid "Tokyo Heliport"
-msgstr "Tokyo Heliport"
+#~ msgid "Obihiro Airport"
+#~ msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:2268
-msgid "Tokyo International Airport"
-msgstr "Tokyo International Airport"
+#~ msgid "Ocala"
+#~ msgstr "Ocala"
 
-#: my-evolution/Locations.h:2269
-msgid "Tokyo New International Airport"
-msgstr "Tokyo New International Airport"
+#~ msgid "Oceanside"
+#~ msgstr "Oceanside"
 
-#: my-evolution/Locations.h:2270
-msgid "Toledo"
-msgstr "Toledo"
+#~ msgid "Odense"
+#~ msgstr "Odense"
 
-#: my-evolution/Locations.h:2271
-msgid "Toluca"
-msgstr "Toluca"
+#~ msgid "Odesa"
+#~ msgstr "Odesa"
 
-#: my-evolution/Locations.h:2272
-msgid "Tonopah"
-msgstr "Tonopah"
+#~ msgid "Oelwen"
+#~ msgstr "Oelwen"
 
-#: my-evolution/Locations.h:2273
-msgid "Topeka"
-msgstr "Topeka"
+#~ msgid "Ogden"
+#~ msgstr "Ogden"
 
-#: my-evolution/Locations.h:2274
-msgid "Topeka-Forbes Field"
-msgstr "Topeka-Forbes Field"
+#~ msgid "Ogden-Hill AFB"
+#~ msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:2275
-msgid "Torino/Bric Della Croce"
-msgstr "Torino/Bric Della Croce"
+#~ msgid "Ogdensburg"
+#~ msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:2276
-msgid "Torino/Caselle"
-msgstr "Torino/Caselle"
+#~ msgid "Ohio"
+#~ msgstr "Ohio"
 
-#: my-evolution/Locations.h:2277
-msgid "Toronto"
-msgstr "Toronto"
+#~ msgid "Ohrid"
+#~ msgstr "Ohrid"
 
-#: my-evolution/Locations.h:2278
-msgid "Torp"
-msgstr "Torp"
+#~ msgid "Oita Airport"
+#~ msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:2279
-msgid "Torrance"
-msgstr "Torrance"
+#~ msgid "Ojika Island"
+#~ msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:2280
-msgid "Torreon"
-msgstr "Torreon"
+#~ msgid "Okayama Airport"
+#~ msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:2281
-msgid "Tottori Airport"
-msgstr "Tottori, aeropuerto de"
+#~ msgid "Oki Airport"
+#~ msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:2282
-msgid "Toulouse"
-msgstr "Toulouse"
+#~ msgid "Okinoerabu"
+#~ msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:2283
-msgid "Toul-Rosieres"
-msgstr "Toul-Rosieres"
+#~ msgid "Oklahoma"
+#~ msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:2284
-msgid "Tours-St-Symphorien"
-msgstr "Tours-St-Symphorien"
+#~ msgid "Oklahoma City"
+#~ msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:2285
-msgid "Toussus-Le Noble"
-msgstr "Toussus-Le Noble"
+#~ msgid "Oklahoma City-Bethany"
+#~ msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:2286
-msgid "Townsville"
-msgstr "Townsville"
+#~ msgid "Oklahoma City-Midwest City"
+#~ msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:2287
-msgid "Toyama Airport"
-msgstr "Toyama Airport"
+#~ msgid "Okushiri Island"
+#~ msgstr "Isla Okushiri"
 
-#: my-evolution/Locations.h:2288
-msgid "Trabzon"
-msgstr "Trabzon"
+#~ msgid "Olathe"
+#~ msgstr "Olathe"
 
-#: my-evolution/Locations.h:2289
-msgid "Trapani"
-msgstr "Trapani"
+#~ msgid "Olathe/Ind."
+#~ msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:2290
-msgid "Traverse City"
-msgstr "Traverse City"
+#~ msgid "Olbia"
+#~ msgstr "Olbia"
 
-#: my-evolution/Locations.h:2291
-msgid "Trelew"
-msgstr "Trelew"
+#~ msgid "Olympia"
+#~ msgstr "Olympia"
 
-#: my-evolution/Locations.h:2292
-msgid "Trenton"
-msgstr "Trenton"
+#~ msgid "Omaha"
+#~ msgstr "Omaha"
 
-#: my-evolution/Locations.h:2293
-msgid "Trevico"
-msgstr "Trevico"
+#~ msgid "Omaha-Bellevue"
+#~ msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:2294
-msgid "Treviso/Istrana"
-msgstr "Treviso/Istrana"
+#~ msgid "Omak"
+#~ msgstr "Omak"
 
-#: my-evolution/Locations.h:2295
-msgid "Treviso/S.Angelo"
-msgstr "Treviso/S.Angelo"
+#~ msgid "Ominato Ab"
+#~ msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:2296
-msgid "Trieste"
-msgstr "Trieste"
+#~ msgid "Omsk"
+#~ msgstr "Omsk"
 
-#: my-evolution/Locations.h:2297
-msgid "Trinidad"
-msgstr "Trinidad"
+#~ msgid "O'Neill"
+#~ msgstr "O'Neill"
 
-#: my-evolution/Locations.h:2298
-msgid "Tripoli"
-msgstr "Tripoli"
+#~ msgid "Ontario"
+#~ msgstr "Ontario"
 
-#: my-evolution/Locations.h:2299
-msgid "Tromso/Langnes"
-msgstr "Tromso/Langnes"
+#~ msgid "Oostende"
+#~ msgstr "Oostende"
 
-#: my-evolution/Locations.h:2300
-msgid "Trondheim/Vaernes"
-msgstr "Trondheim/Vaernes"
+#~ msgid "Oran"
+#~ msgstr "Orán"
 
-#: my-evolution/Locations.h:2301
-msgid "Troutdale"
-msgstr "Troutdale"
+#~ msgid "Oran/Es Senia"
+#~ msgstr "Orán/Es Senia"
 
-#: my-evolution/Locations.h:2302
-msgid "Troyes/Barberey"
-msgstr "Troyes/Barberey"
+#~ msgid "Orange"
+#~ msgstr "Orange"
 
-#: my-evolution/Locations.h:2303
-msgid "Truckee"
-msgstr "Truckee"
+#~ msgid "Orange City"
+#~ msgstr "Orange City"
 
-#: my-evolution/Locations.h:2304
-msgid "Truth or Consequences"
-msgstr "Verdad o Consecuencias"
+#~ msgid "Ord-Sharp"
+#~ msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:2305
-msgid "Tsuiki Ab"
-msgstr "Tsuiki Ab"
+#~ msgid "Oregon"
+#~ msgstr "Oregón"
 
-#: my-evolution/Locations.h:2306
-msgid "Tsushima Airport"
-msgstr "Tsushima Airport"
+#~ msgid "Orenburg"
+#~ msgstr "Orenburg"
 
-#: my-evolution/Locations.h:2307
-msgid "Tucson"
-msgstr "Tucson"
+#~ msgid "Orland"
+#~ msgstr "Orland"
 
-#: my-evolution/Locations.h:2308
-msgid "Tucson-Davis AFB"
-msgstr "Tucson-Davis AFB"
+#~ msgid "Orlando"
+#~ msgstr "Orlando"
 
-#: my-evolution/Locations.h:2309
-msgid "Tucuman"
-msgstr "Tucuman"
+#~ msgid "Orlando (Orlando International)"
+#~ msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:2310
-msgid "Tucumcari"
-msgstr "Tucumcari"
+#~ msgid "Orsta-Volda"
+#~ msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:2311
-msgid "Tucurui"
-msgstr "Tucurui"
+#~ msgid "Oruro"
+#~ msgstr "Oruro"
 
-#: my-evolution/Locations.h:2312
-msgid "Tulancingo"
-msgstr "Tulancingo"
+#~ msgid "Osaka International Airport"
+#~ msgstr "Aeropuerto Internacional de Osaka"
 
-#: my-evolution/Locations.h:2313
-msgid "Tulcea"
-msgstr "Tulcea"
+#~ msgid "Osan Ab"
+#~ msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:2314
-msgid "Tulsa"
-msgstr "Tulsa"
+#~ msgid "Oscoda"
+#~ msgstr "Oscoda"
 
-#: my-evolution/Locations.h:2315
-msgid "Tupelo"
-msgstr "Tupelo"
+#~ msgid "Oseberg A"
+#~ msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:2316
-msgid "Turaif"
-msgstr "Turaif"
+#~ msgid "Oshima Airport"
+#~ msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:2317
-msgid "Turin"
-msgstr "Turín"
+#~ msgid "Oshkosh"
+#~ msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:2319
-msgid "Turku"
-msgstr "Turku"
+#~ msgid "Oslo/Gardenmoen"
+#~ msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:2320
-msgid "Tuscaloosa"
-msgstr "Tuscaloosa"
+#~ msgid "Ostrava"
+#~ msgstr "Ostrava"
 
-#: my-evolution/Locations.h:2321
-msgid "Tuxtla Gutierrez"
-msgstr "Tuxtla Gutierrez"
+#~ msgid "Ottawa"
+#~ msgstr "Ottawa"
 
-#: my-evolution/Locations.h:2322
-msgid "Twenthe"
-msgstr "Twenthe"
+#~ msgid "Ottumwa"
+#~ msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:2323
-msgid "Twentynine Palms"
-msgstr "Twentynine Palms"
+#~ msgid "Owensboro"
+#~ msgstr "Owensboro"
 
-#: my-evolution/Locations.h:2324
-msgid "Twin Falls"
-msgstr "Twin Falls"
+#~ msgid "Owyhee"
+#~ msgstr "Owyhee"
 
-#: my-evolution/Locations.h:2325
-msgid "Tyler"
-msgstr "Tyler"
+#~ msgid "Oxford"
+#~ msgstr "Oxford"
 
-#: my-evolution/Locations.h:2326
-msgid "Tyndall AFB"
-msgstr "Tyndall AFB"
+#~ msgid "Oxnard"
+#~ msgstr "Oxnard"
 
-#: my-evolution/Locations.h:2327
-msgid "Tyumen"
-msgstr "Tyumen"
+#~ msgid "Ozark"
+#~ msgstr "Ozark"
 
-#: my-evolution/Locations.h:2328
-msgid "Uberaba"
-msgstr "Uberaba"
+#~ msgid "Ozuki Ab"
+#~ msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:2329
-msgid "Ufa"
-msgstr "Ufa"
+#~ msgid "Paderborn-Haxterberg"
+#~ msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:2330
-msgid "Ukiah"
-msgstr "Ukiah"
+#~ msgid "Padova"
+#~ msgstr "Padova"
 
-#: my-evolution/Locations.h:2332
-msgid "Ulan-Ude"
-msgstr "Ulan-Ude"
+#~ msgid "Paducah"
+#~ msgstr "Paducah"
 
-#: my-evolution/Locations.h:2333
-msgid "Ulsan"
-msgstr "Ulsan"
+#~ msgid "Paekado"
+#~ msgstr "Paekado"
 
-#: my-evolution/Locations.h:2334
-msgid "Ulyanovsk"
-msgstr "Ulyanovsk"
+#~ msgid "Paengnyongdo Ab"
+#~ msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:2335
-msgid "Umea"
-msgstr "Umea"
+#~ msgid "Paganella"
+#~ msgstr "Paganella"
 
-#: my-evolution/Locations.h:2336
-msgid "Umiat"
-msgstr "Umiat"
+#~ msgid "Pa Kuei/Bakuai"
+#~ msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:2337
-msgid "Unalakleet"
-msgstr "Unalakleet"
+#~ msgid "Palacios"
+#~ msgstr "Palacios"
 
-#: my-evolution/Locations.h:2338
-msgid "United Arab Emirates "
-msgstr "Emiratos Árabes Unidos"
+#~ msgid "Palermo"
+#~ msgstr "Palermo"
 
-#: my-evolution/Locations.h:2341
-msgid "Unst"
-msgstr "Unst"
+#~ msgid "Palma de Mallorca"
+#~ msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:2342
-msgid "Upington"
-msgstr "Upington"
+#~ msgid "Palmdale"
+#~ msgstr "Palmdale"
 
-#: my-evolution/Locations.h:2343
-msgid "Uruapan"
-msgstr "Uruapan"
+#~ msgid "Palmer"
+#~ msgstr "Palmer"
 
-#: my-evolution/Locations.h:2344
-msgid "Uruguaiana"
-msgstr "Uruguaiana"
+#~ msgid "Palm Springs"
+#~ msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:2346
-msgid "Urumqi"
-msgstr "Urumqi"
+#~ msgid "Palo Alto"
+#~ msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:2347
-msgid "Utah"
-msgstr "Utah"
+#~ msgid "Pamplona"
+#~ msgstr "Pamplona"
 
-#: my-evolution/Locations.h:2348
-msgid "Utica"
-msgstr "Utica"
+#~ msgid "Panama City"
+#~ msgstr "Ciudad de Panamá"
 
-#: my-evolution/Locations.h:2349
-msgid "Utrecht/Soesterberg"
-msgstr "Utrecht/Soesterberg"
+#~ msgid "Pantelleria"
+#~ msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:2350
-msgid "Utsunomiya Ab"
-msgstr "Utsunomiya Ab"
+#~ msgid "Papa"
+#~ msgstr "Papa"
 
-#: my-evolution/Locations.h:2351
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
+#~ msgid "Paphos"
+#~ msgstr "Paphos"
 
-#: my-evolution/Locations.h:2352
-msgid "Vadso"
-msgstr "Vadso"
+#~ msgid "Paris"
+#~ msgstr "París"
 
-#: my-evolution/Locations.h:2353
-msgid "Vaerlose"
-msgstr "Vaerlose"
+#~ msgid "Paris/Charles De Gaulle"
+#~ msgstr "París/Charles De Gaulle"
 
-#: my-evolution/Locations.h:2354
-msgid "Vagar"
-msgstr "Vagar"
+#~ msgid "Paris/Le Bourget"
+#~ msgstr "París/Le Bourget"
 
-#: my-evolution/Locations.h:2355
-msgid "Valdez 2"
-msgstr "Valdez 2"
+#~ msgid "Paris/Orly"
+#~ msgstr "París/Orly"
 
-#: my-evolution/Locations.h:2356
-msgid "Valdosta"
-msgstr "Valdosta"
+#~ msgid "Parkersburg"
+#~ msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:2357
-msgid "Valdosta-Moody AFB"
-msgstr "Valdosta-Moody AFB"
+#~ msgid "Pasco"
+#~ msgstr "Pasco"
 
-#: my-evolution/Locations.h:2358
-msgid "Valencia"
-msgstr "Valencia"
+#~ msgid "Paso De Los Libres"
+#~ msgstr "Paso de los Libres"
 
-#: my-evolution/Locations.h:2359
-msgid "Valentine"
-msgstr "Valentine"
+#~ msgid "Paso Robles"
+#~ msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:2360
-msgid "Valera*"
-msgstr "Valera*"
+#~ msgid "Passo dei Giovi"
+#~ msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:2361
-msgid "Valkenburg"
-msgstr "Valkenburg"
+#~ msgid "Passo della Cisa"
+#~ msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:2362
-msgid "Valley"
-msgstr "Valley"
+#~ msgid "Passo Resia"
+#~ msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:2363
-msgid "Valparaiso"
-msgstr "Valparaiso"
+#~ msgid "Passo Rolle"
+#~ msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:2364
-msgid "Valparaiso-Eglin AFB"
-msgstr "Valparaiso-Eglin AFB"
+#~ msgid "Patna"
+#~ msgstr "Patna"
 
-#: my-evolution/Locations.h:2365
-msgid "Van"
-msgstr "Van"
+#~ msgid "Patterson"
+#~ msgstr "Patterson"
 
-#: my-evolution/Locations.h:2366
-msgid "Vancouver"
-msgstr "Vancouver"
+#~ msgid "Patuxent River"
+#~ msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:2367
-msgid "Vandel"
-msgstr "Vandel"
+#~ msgid "Pau/Pyrenees"
+#~ msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:2368
-msgid "Vandenberg AFB"
-msgstr "Vandenberg AFB"
+#~ msgid "Paxson"
+#~ msgstr "Paxson"
 
-#: my-evolution/Locations.h:2369
-msgid "Vandenberg Range"
-msgstr "Vandenberg Range"
+#~ msgid "Paysandu"
+#~ msgstr "Paysandu"
 
-#: my-evolution/Locations.h:2370
-msgid "Van Nuys"
-msgstr "Van Nuys"
+#~ msgid "Payson"
+#~ msgstr "Payson"
 
-#: my-evolution/Locations.h:2371
-msgid "Varadero"
-msgstr "Varadero"
+#~ msgid "Pellston"
+#~ msgstr "Pellston"
 
-#: my-evolution/Locations.h:2372
-msgid "Varanasi/Babatpur"
-msgstr "Varanasi/Babatpur"
+#~ msgid "Pelotas"
+#~ msgstr "Pelotas"
 
-#: my-evolution/Locations.h:2373
-msgid "Varna"
-msgstr "Varna"
+#~ msgid "Pendleton"
+#~ msgstr "Pendleton"
 
-#: my-evolution/Locations.h:2374
-msgid "Vasteras"
-msgstr "Vasteras"
+#~ msgid "Pennsylvania"
+#~ msgstr "Pennsilvania"
 
-#: my-evolution/Locations.h:2375
-msgid "Vaxjo"
-msgstr "Vaxjo"
+#~ msgid "Penn Yan"
+#~ msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:2376
-msgid "Venezia"
-msgstr "Venezia"
+#~ msgid "Pensacola"
+#~ msgstr "Pensacola"
 
-#: my-evolution/Locations.h:2378
-msgid "Venice"
-msgstr "Venecia"
+#~ msgid "Pensacola NAS"
+#~ msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:2379
-msgid "Veracruz"
-msgstr "Veracruz"
+#~ msgid "People's Republic of China"
+#~ msgstr "República Popular de China"
 
-#: my-evolution/Locations.h:2380
-msgid "Vermillion"
-msgstr "Vermillion"
+#~ msgid "Peoria"
+#~ msgstr "Peoria"
 
-#: my-evolution/Locations.h:2381
-msgid "Vermont"
-msgstr "Vermont"
+#~ msgid "Pequot Lakes"
+#~ msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:2382
-msgid "Vernal"
-msgstr "Vernal"
+#~ msgid "Pereira/Matecana"
+#~ msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:2383
-msgid "Vero Beach"
-msgstr "Vero Beach"
+#~ msgid "Perm"
+#~ msgstr "Perm"
 
-#: my-evolution/Locations.h:2384
-msgid "Vicenza"
-msgstr "Vicenza"
+#~ msgid "Perpignan-Rivesaltes"
+#~ msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:2385
-msgid "Vichy-Charmeil"
-msgstr "Vichy-Charmeil"
+#~ msgid "Perry-Foley"
+#~ msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:2386
-msgid "Vichy-Rolla"
-msgstr "Vichy-Rolla"
+#~ msgid "Perth"
+#~ msgstr "Perth"
 
-#: my-evolution/Locations.h:2387
-msgid "Vicksburg"
-msgstr "Vicksburg"
+#~ msgid "Perugia"
+#~ msgstr "Perugia"
 
-#: my-evolution/Locations.h:2388
-msgid "Victoria"
-msgstr "Victoria"
+#~ msgid "Pescara"
+#~ msgstr "Pescara"
 
-#: my-evolution/Locations.h:2390
-msgid "Vigo"
-msgstr "Vigo"
+#~ msgid "Petersburg"
+#~ msgstr "Petersburg"
 
-#: my-evolution/Locations.h:2391
-msgid "Vilhena"
-msgstr "Vilhena"
+#~ msgid "Petropavlovsk-Kamchatsky"
+#~ msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:2392
-msgid "Villacoublay"
-msgstr "Villacoublay"
+#~ msgid "Petrozavodsk"
+#~ msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:2393
-msgid "Villafranca"
-msgstr "Villafranca"
+#~ msgid "Philadelphia"
+#~ msgstr "Filadelfia"
 
-#: my-evolution/Locations.h:2394
-msgid "Villahermosa"
-msgstr "Villahermosa"
+#~ msgid "Philip"
+#~ msgstr "Philip"
 
-#: my-evolution/Locations.h:2395
-msgid "Villamontes"
-msgstr "Villamontes"
+#~ msgid "Philipsburg"
+#~ msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:2396
-msgid "Villa Reynolds"
-msgstr "Villa Reynolds"
+#~ msgid "Phillips"
+#~ msgstr "Phillips"
 
-#: my-evolution/Locations.h:2397
-msgid "Vilnius"
-msgstr "Vilnius"
+#~ msgid "Phoenix"
+#~ msgstr "Phoenix"
 
-#: my-evolution/Locations.h:2398
-msgid "Virginia"
-msgstr "Virginia"
+#~ msgid "Phoenix-Deer Valley"
+#~ msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:2399
-msgid "Virginia Beach"
-msgstr "Virginia Beach"
+#~ msgid "Phoenix-Goodyear"
+#~ msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:2400
-msgid "Virginia Tech Airport"
-msgstr "Virginia Tech Airport"
+#~ msgid "Phoenix-Luke AFB"
+#~ msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:2401
-msgid "Viru-Viru"
-msgstr "Viru-Viru"
+#~ msgid "Piacenza"
+#~ msgstr "Piacenza"
 
-#: my-evolution/Locations.h:2402
-msgid "Visalia"
-msgstr "Visalia"
+#~ msgid "Pian Rosa"
+#~ msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:2403
-msgid "Visby"
-msgstr "Visby"
+#~ msgid "Piedras Negras"
+#~ msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:2404
-msgid "Viterbo"
-msgstr "Viterbo"
+#~ msgid "Pierre"
+#~ msgstr "Pierre"
 
-#: my-evolution/Locations.h:2405
-msgid "Vitoria"
-msgstr "Vitoria"
+#~ msgid "Pietersburg"
+#~ msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:2406
-msgid "Vladikavkaz"
-msgstr "Vladikavkaz"
+#~ msgid "Pikeville"
+#~ msgstr "Pikeville"
 
-#: my-evolution/Locations.h:2407
-msgid "Vladivostok"
-msgstr "Vladivostok"
+#~ msgid "Pine Bluff"
+#~ msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:2408
-msgid "Vlieland"
-msgstr "Vlieland"
+#~ msgid "Pingtung North"
+#~ msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:2409
-msgid "Vojens/Skrydstrup"
-msgstr "Vojens/Skrydstrup"
+#~ msgid "Pingtung South"
+#~ msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:2410
-msgid "Volgograd"
-msgstr "Volgograd"
+#~ msgid "Pirassununga"
+#~ msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:2411
-msgid "Volkel"
-msgstr "Volkel"
+#~ msgid "Pisa"
+#~ msgstr "Pisa"
 
-#: my-evolution/Locations.h:2412
-msgid "Volk Field"
-msgstr "Volk Field"
+#~ msgid "Pisco"
+#~ msgstr "Pisco"
 
-#: my-evolution/Locations.h:2413
-msgid "Voronezh"
-msgstr "Voronezh"
+#~ msgid "Pittsburgh"
+#~ msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:2414
-msgid "Voslau"
-msgstr "Voslau"
+#~ msgid "Pittsburgh-West Mifflin"
+#~ msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:2415
-msgid "Waco"
-msgstr "Waco"
+#~ msgid "Plattsburg"
+#~ msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:2416
-msgid "Wadi Al Dawasser Airport"
-msgstr "Wadi Al Dawasser Airport"
+#~ msgid "Plovdiv"
+#~ msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:2417
-msgid "Wainwright"
-msgstr "Wainwright"
+#~ msgid "Plymouth"
+#~ msgstr "Plymouth"
 
-#: my-evolution/Locations.h:2418
-msgid "Wakefield"
-msgstr "Wakefield"
+#~ msgid "Pocatello"
+#~ msgstr "Pocatello"
 
-#: my-evolution/Locations.h:2419
-msgid "Wakkanai Airport"
-msgstr "Wakkanai Airport"
+#~ msgid "Pocos De Caldas"
+#~ msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:2420
-msgid "Walla Walla"
-msgstr "Walla Walla"
+#~ msgid "Podgorica"
+#~ msgstr "Podgorica"
 
-#: my-evolution/Locations.h:2421
-msgid "Wallops Island"
-msgstr "Wallops, isla de"
+#~ msgid "Podgorica Titograd"
+#~ msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:2422
-msgid "Walnut Ridge"
-msgstr "Walnut Ridge"
+#~ msgid "Pohang Ab"
+#~ msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:2423
-msgid "Warner Robins"
-msgstr "Warner Robins"
+#~ msgid "Point Hope"
+#~ msgstr "Point Hope"
 
-#: my-evolution/Locations.h:2424
-msgid "Warroad"
-msgstr "Warroad"
+#~ msgid "Point Lay"
+#~ msgstr "Point Lay"
 
-#: my-evolution/Locations.h:2425
-msgid "Warszawa"
-msgstr "Warszawa"
+#~ msgid "Point Mugu"
+#~ msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:2426
-msgid "Washington"
-msgstr "Washington"
+#~ msgid "Point Piedras Blanca"
+#~ msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:2427
-msgid "Washington/Dulles"
-msgstr "Washington/Dulles"
+#~ msgid "Pompano Beach"
+#~ msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:2428
-msgid "Waterbury"
-msgstr "Waterbury"
+#~ msgid "Ponca City"
+#~ msgstr "Ciudad de Ponca"
 
-#: my-evolution/Locations.h:2429
-msgid "Waterloo"
-msgstr "Waterloo"
+#~ msgid "Ponce"
+#~ msgstr "Ponce"
 
-#: my-evolution/Locations.h:2430
-msgid "Watertown"
-msgstr "Watertown"
+#~ msgid "Ponta Pora"
+#~ msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:2431
-msgid "Waterville"
-msgstr "Waterville"
+#~ msgid "Pontiac"
+#~ msgstr "Pontiac"
 
-#: my-evolution/Locations.h:2432
-msgid "Waukesha"
-msgstr "Waukesha"
+#~ msgid "Pope AFB"
+#~ msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:2433
-msgid "Wausau"
-msgstr "Wausau"
+#~ msgid "Poplar Bluff"
+#~ msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:2434
-msgid "Waycross"
-msgstr "Waycross"
+#~ msgid "Poprad"
+#~ msgstr "Poprad"
 
-#: my-evolution/Locations.h:2435
-msgid "Waynesboro"
-msgstr "Waynesboro"
+#~ msgid "Port Alexander"
+#~ msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:2436
-msgid "Webster City"
-msgstr "Webster City"
+#~ msgid "Port Alsworth"
+#~ msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:2437
-msgid "Wejh"
-msgstr "Wejh"
+#~ msgid "Port Angeles"
+#~ msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:2438
-msgid "Wellington"
-msgstr "Wellington"
+#~ msgid "Port-Au-Prince"
+#~ msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:2439
-msgid "Wenatchee"
-msgstr "Wenatchee"
+#~ msgid "Port Elizabeth"
+#~ msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:2440
-msgid "Wendover"
-msgstr "Wendover"
+#~ msgid "Porterville"
+#~ msgstr "Porterville"
 
-#: my-evolution/Locations.h:2441
-msgid "West Atlanta"
-msgstr "West Atlanta"
+#~ msgid "Port Hardy"
+#~ msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:2442
-msgid "West Burke"
-msgstr "West Burke"
+#~ msgid "Port Hedland"
+#~ msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:2443
-msgid "Westerland"
-msgstr "Westerland"
+#~ msgid "Port Heiden"
+#~ msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:2444
-msgid "Westfield"
-msgstr "Westfield"
+#~ msgid "Portland"
+#~ msgstr "Portland"
 
-#: my-evolution/Locations.h:2445
-msgid "Westhampton"
-msgstr "Westhampton"
+#~ msgid "Porto Alegre"
+#~ msgstr "Puerto Alegre"
 
-#: my-evolution/Locations.h:2446
-msgid "West Palm Beach"
-msgstr "West Palm Beach"
+#~ msgid "Porto Alegre Apt"
+#~ msgstr "Puerto Alegre Apt"
 
-#: my-evolution/Locations.h:2447
-msgid "West Virginia"
-msgstr "West Virginia"
+#~ msgid "Portoroz"
+#~ msgstr "Portoroz"
 
-#: my-evolution/Locations.h:2448
-msgid "West Yellowstone"
-msgstr "West Yellowstone"
+#~ msgid "Porto Santo"
+#~ msgstr "Puerto Santo"
 
-#: my-evolution/Locations.h:2449
-msgid "West Yellowstone (2)"
-msgstr "West Yellowstone (2)"
+#~ msgid "Porto Velho"
+#~ msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:2450
-msgid "Wheeling"
-msgstr "Wheeling"
+#~ msgid "Port Said"
+#~ msgstr "Puerto Said"
 
-#: my-evolution/Locations.h:2451
-msgid "Whidbey Island"
-msgstr "Whidbey Island"
+#~ msgid "Portsmouth"
+#~ msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:2452
-msgid "Whitefield"
-msgstr "Whitefield"
+#~ msgid "Posadas"
+#~ msgstr "Posadas"
 
-#: my-evolution/Locations.h:2453
-msgid "White Plains"
-msgstr "White Plains"
+#~ msgid "Potosi"
+#~ msgstr "Potosi"
 
-#: my-evolution/Locations.h:2454
-msgid "White Sulphur"
-msgstr "White Sulphur"
+#~ msgid "Poughkeepsie"
+#~ msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:2455
-msgid "Whittier"
-msgstr "Whittier"
+#~ msgid "Pownal"
+#~ msgstr "Pownal"
 
-#: my-evolution/Locations.h:2456
-msgid "Wichita"
-msgstr "Wichita"
+#~ msgid "Poza Rica"
+#~ msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:2457
-msgid "Wichita Falls"
-msgstr "Wichita Falls"
+#~ msgid "Poznan"
+#~ msgstr "Poznan"
 
-#: my-evolution/Locations.h:2458
-msgid "Wichita-Jabara"
-msgstr "Wichita-Jabara"
+#~ msgid "Praha"
+#~ msgstr "Praha"
 
-#: my-evolution/Locations.h:2459
-msgid "Wichita-McConnell AFB"
-msgstr "Wichita-McConnell AFB"
+#~ msgid "Pratica di Mare"
+#~ msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:2460
-msgid "Wick"
-msgstr "Wick"
+#~ msgid "Prescott"
+#~ msgstr "Prescott"
 
-#: my-evolution/Locations.h:2461
-msgid "Wien"
-msgstr "Wien"
+#~ msgid "Presidente Prudente"
+#~ msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:2462
-msgid "Wildwood"
-msgstr "Wildwood"
+#~ msgid "Presque Isle"
+#~ msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:2463
-msgid "Wilkes - Barre"
-msgstr "Wilkes - Barre"
+#~ msgid "Prestwick"
+#~ msgstr "Prestwick"
 
-#: my-evolution/Locations.h:2464
-msgid "Williams Field"
-msgstr "Williams Field"
+#~ msgid "Pretoria"
+#~ msgstr "Pretória"
 
-#: my-evolution/Locations.h:2465
-msgid "Williamsport"
-msgstr "Williamsport"
+#~ msgid "Preveza"
+#~ msgstr "Preveza"
 
-#: my-evolution/Locations.h:2466
-msgid "Williston"
-msgstr "Williston"
+#~ msgid "Price-Carbon"
+#~ msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:2467
-msgid "Willoughby"
-msgstr "Willoughby"
+#~ msgid "Pristina"
+#~ msgstr "Prístina"
 
-#: my-evolution/Locations.h:2468
-msgid "Willow Airport"
-msgstr "Willow Airport"
+#~ msgid "Providence"
+#~ msgstr "Providence"
 
-#: my-evolution/Locations.h:2469
-msgid "Wilmington"
-msgstr "Wilmington"
+#~ msgid "Provincetown"
+#~ msgstr "Provincetown"
 
-#: my-evolution/Locations.h:2470
-msgid "Winchester"
-msgstr "Winchester"
+#~ msgid "Provo"
+#~ msgstr "Provo"
 
-#: my-evolution/Locations.h:2471
-msgid "Windsor"
-msgstr "Windsor"
+#~ msgid "Pskov"
+#~ msgstr "Pskov"
 
-#: my-evolution/Locations.h:2472
-msgid "Windsor Locks"
-msgstr "Windsor Locks"
+#~ msgid "Pucallpa"
+#~ msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:2473
-msgid "Wink"
-msgstr "Wink"
+#~ msgid "Pudahuel"
+#~ msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:2474
-msgid "Winnemucca"
-msgstr "Winnemucca"
+#~ msgid "Puebla"
+#~ msgstr "Puebla"
 
-#: my-evolution/Locations.h:2475
-msgid "Winnipeg"
-msgstr "Winnipeg"
+#~ msgid "Pueblo"
+#~ msgstr "Pueblo"
 
-#: my-evolution/Locations.h:2476
-msgid "Winslow"
-msgstr "Winslow"
+#~ msgid "Puerto Barrios"
+#~ msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:2477
-msgid "Winston-Salem"
-msgstr "Winston-Salem"
+#~ msgid "Puerto Cabezas"
+#~ msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:2478
-msgid "Winter Haven"
-msgstr "Winter Haven"
+#~ msgid "Puerto Escondido"
+#~ msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:2479
-msgid "Winter Park"
-msgstr "Winter Park"
+#~ msgid "Puerto Lempira"
+#~ msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:2480
-msgid "Wiscasset"
-msgstr "Wiscasset"
+#~ msgid "Puerto Limon"
+#~ msgstr "Puerto Limón"
 
-#: my-evolution/Locations.h:2481
-msgid "Wisconsin"
-msgstr "Wisconsin"
+#~ msgid "Puerto Maldonado"
+#~ msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:2482
-msgid "Wisconsin Rapids"
-msgstr "Rápidos de Wisconsin"
+#~ msgid "Puerto Montt"
+#~ msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:2483
-msgid "Wise"
-msgstr "Wise"
+#~ msgid "Puerto Plata"
+#~ msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:2484
-msgid "Woensdrecht"
-msgstr "Woensdrecht"
+#~ msgid "Puerto Suarez"
+#~ msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:2485
-msgid "Wolf Point"
-msgstr "Wolf Point"
+#~ msgid "Puerto Vallarta"
+#~ msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:2486
-msgid "Woong Cheon"
-msgstr "Woong Cheon"
+#~ msgid "Pula"
+#~ msgstr "Pula"
 
-#: my-evolution/Locations.h:2487
-msgid "Wooster"
-msgstr "Wooster"
+#~ msgid "Pullman"
+#~ msgstr "Pullman"
 
-#: my-evolution/Locations.h:2488
-msgid "Worcester"
-msgstr "Worcester"
+#~ msgid "Punta Arenas"
+#~ msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:2489
-msgid "Worland"
-msgstr "Worland"
+#~ msgid "Punta Cana"
+#~ msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:2490
-msgid "Worthington"
-msgstr "Worthington"
+#~ msgid "Punta Gorda"
+#~ msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:2491
-msgid "Wrangell"
-msgstr "Wrangell"
+#~ msgid "Puntilla Lake"
+#~ msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:2492
-msgid "Wrightstown / Mcguire AFB"
-msgstr "Wrightstown / Mcguire AFB"
+#~ msgid "Pusan/Kimhae"
+#~ msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:2493
-msgid "Wuchia Observatory"
-msgstr "Wuchia Observatory"
+#~ msgid "Pyongtaek Ab"
+#~ msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:2494
-msgid "Wyoming"
-msgstr "Wyoming"
+#~ msgid "Pyongyang"
+#~ msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:2495
-msgid "Xiamen"
-msgstr "Xiamen"
+#~ msgid "Quantico"
+#~ msgstr "Quántico"
 
-#: my-evolution/Locations.h:2496
-msgid "Yacuiba"
-msgstr "Yacuiba"
+#~ msgid "Quebec"
+#~ msgstr "Quebec"
 
-#: my-evolution/Locations.h:2497
-msgid "Yakima"
-msgstr "Yakima"
+#~ msgid "Quebec City"
+#~ msgstr "Quebec City"
 
-#: my-evolution/Locations.h:2498
-msgid "Yakushima"
-msgstr "Yakushima"
+#~ msgid "Queretaro"
+#~ msgstr "Queretaro"
 
-#: my-evolution/Locations.h:2499
-msgid "Yakutat"
-msgstr "Yakutat"
+#~ msgid "Quillayute"
+#~ msgstr "Quillayute"
 
-#: my-evolution/Locations.h:2500
-msgid "Yakutsk"
-msgstr "Yakutsk"
+#~ msgid "Quimper"
+#~ msgstr "Quimper"
 
-#: my-evolution/Locations.h:2501
-msgid "Yamagata Airport"
-msgstr "Yamagata Airport"
+#~ msgid "Quincy"
+#~ msgstr "Quincy"
 
-#: my-evolution/Locations.h:2502
-msgid "Yamaguchi Ube Airport"
-msgstr "Yamaguchi Ube Airport"
+#~ msgid "Quito/Mariscal Sucre"
+#~ msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:2503
-msgid "Yankton"
-msgstr "Yankton"
+#~ msgid "Rabat"
+#~ msgstr "Rabat"
 
-#: my-evolution/Locations.h:2504
-msgid "Yao Airport"
-msgstr "Yao, aeropuerto"
+#~ msgid "Raduzhny"
+#~ msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:2505
-msgid "Yechon Ab"
-msgstr "Yechon Ab"
+#~ msgid "Rafha"
+#~ msgstr "Rafha"
 
-#: my-evolution/Locations.h:2506
-msgid "Yekaterinburg"
-msgstr "Yekaterinburg"
+#~ msgid "Raleigh-Durham"
+#~ msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:2507
-msgid "Yellowknife"
-msgstr "Yellowknife"
+#~ msgid "Randolph AFB"
+#~ msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:2508
-msgid "Yellowstone"
-msgstr "Yellowstone"
+#~ msgid "Rapid City"
+#~ msgstr "Rapid City"
 
-#: my-evolution/Locations.h:2510
-msgid "Yenbo"
-msgstr "Yenbo"
+#~ msgid "Rapid City-Ellsworth AFB"
+#~ msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:2511
-msgid "Yeoju Range"
-msgstr "Yeoju Range"
+#~ msgid "Ras Al Khaimah"
+#~ msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:2512
-msgid "Yeonpyeungdo"
-msgstr "Yeonpyeungdo"
+#~ msgid "Rawlins"
+#~ msgstr "Rawlins"
 
-#: my-evolution/Locations.h:2513
-msgid "Yeovilton"
-msgstr "Yeovilton"
+#~ msgid "Reading"
+#~ msgstr "Reading"
 
-#: my-evolution/Locations.h:2514
-msgid "Yokosuka Fwf"
-msgstr "Yokosuka Fwf"
+#~ msgid "Rebun Island"
+#~ msgstr "Isla Rebun"
 
-#: my-evolution/Locations.h:2515
-msgid "Yokota Ab"
-msgstr "Yokota Ab"
+#~ msgid "Recife"
+#~ msgstr "Recife"
 
-#: my-evolution/Locations.h:2516
-msgid "Yongsan/H-208 Hp"
-msgstr "Yongsan/H-208 Hp"
+#~ msgid "Red Bluff"
+#~ msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:2517
-msgid "Yoro"
-msgstr "Yoro"
+#~ msgid "Redding"
+#~ msgstr "Redding"
 
-#: my-evolution/Locations.h:2518
-msgid "Yosu"
-msgstr "Yosu"
+#~ msgid "Redig"
+#~ msgstr "Redig"
 
-#: my-evolution/Locations.h:2519
-msgid "Youngstown"
-msgstr "Youngstown"
+#~ msgid "Redmond"
+#~ msgstr "Redmond"
 
-#: my-evolution/Locations.h:2520
-msgid "Ypsilanti"
-msgstr "Ypsilanti"
+#~ msgid "Red Oak"
+#~ msgstr "Red Oak"
 
-#: my-evolution/Locations.h:2522
-msgid "Yukon"
-msgstr "Yukón"
+#~ msgid "Redwood Falls"
+#~ msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:2523
-msgid "Yuma MCAS"
-msgstr "Yuma MCAS"
+#~ msgid "Reggio Calabria"
+#~ msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:2524
-msgid "Yurimaguas"
-msgstr "Yurimaguas"
+#~ msgid "Regina"
+#~ msgstr "Regina"
 
-#: my-evolution/Locations.h:2525
-msgid "Yuzhno-Sakhalinsk"
-msgstr "Yuzhno-Sakhalinsk"
+#~ msgid "Reims-Champagne"
+#~ msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:2526
-msgid "Zacatecas"
-msgstr "Zacatecas"
+#~ msgid "Rennes"
+#~ msgstr "Rennes"
 
-#: my-evolution/Locations.h:2527
-msgid "Zadar"
-msgstr "Zadar"
+#~ msgid "Reno"
+#~ msgstr "Reno"
 
-#: my-evolution/Locations.h:2528
-msgid "Zagreb"
-msgstr "Zagreb"
+#~ msgid "Renton"
+#~ msgstr "Renton"
 
-#: my-evolution/Locations.h:2529
-msgid "Zakinthos"
-msgstr "Zakinthos"
+#~ msgid "Resistencia"
+#~ msgstr "Resistencia"
 
-#: my-evolution/Locations.h:2530
-msgid "Zama Airfield"
-msgstr "Zama Airfield"
+#~ msgid "Reus"
+#~ msgstr "Reus"
 
-#: my-evolution/Locations.h:2531
-msgid "Zanesville"
-msgstr "Zanesville"
+#~ msgid "Reyes"
+#~ msgstr "Reyes"
 
-#: my-evolution/Locations.h:2532
-msgid "Zaragoza"
-msgstr "Zaragoza"
+#~ msgid "Reykjavik"
+#~ msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:2533
-msgid "Zell Am See"
-msgstr "Zell Am See"
+#~ msgid "Reynosa"
+#~ msgstr "Reinosa"
 
-#: my-evolution/Locations.h:2534
-msgid "Zuni Pueblo"
-msgstr "Zuni Pueblo"
+#~ msgid "Rhinelander"
+#~ msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:2535
-msgid "Zurich"
-msgstr "Zurich"
+#~ msgid "Rhode Island"
+#~ msgstr "Isla de Rodas"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "La carpeta contiene el resumen de Evolution"
+#~ msgid "Riberalta"
+#~ msgstr "Riberalta"
 
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Citas"
+#~ msgid "Richmond"
+#~ msgstr "Richmond"
 
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "No tiene citas."
+#~ msgid "Rickenbacker"
+#~ msgstr "Rickenbacker"
 
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
+#~ msgid "Rieti"
+#~ msgstr "Rieti"
 
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr "%l:%M%P %d %B"
+#~ msgid "Rifle"
+#~ msgstr "Rifle"
 
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Sin descripción"
+#~ msgid "Rijeka"
+#~ msgstr "Rijeka"
 
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Resumen de correo"
+#~ msgid "Rimini"
+#~ msgstr "Rimini"
 
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Palabra del día de Dictionary.com"
+#~ msgid "Rio De Janeiro"
+#~ msgstr "Río De Janeiro"
 
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Frase célebre del día"
+#~ msgid "Rio Gallegos"
+#~ msgstr "Río Gallegos"
 
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Nueva fuente de noticias"
+#~ msgid "Rio Grande"
+#~ msgstr "Río Grande"
 
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
+#~ msgid "Rioja"
+#~ msgstr "La Rioja"
 
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Error al descargar RDF"
+#~ msgid "Rio / Jacarepagua"
+#~ msgstr "Río / Jacarepagua"
 
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Fuente de noticias"
+#~ msgid "Rionegro/J.M.Cordova"
+#~ msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Todo"
+#~ msgid "Rishiri Island"
+#~ msgstr "Isla de Rishiri"
 
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Mostrados"
+#~ msgid "Rivas"
+#~ msgstr "Rivas"
 
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "No hay tareas"
+#~ msgid "Rivera"
+#~ msgstr "Rivera"
 
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Sin descripción)"
+#~ msgid "Riverside"
+#~ msgstr "Riverside"
 
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Mi meteorología"
+#~ msgid "Riverside/March AFB"
+#~ msgstr "Riverside/March AFB"
 
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Hubo un error descargando datos para"
+#~ msgid "Riverton"
+#~ msgstr "Riverton"
 
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Meteorología"
+#~ msgid "Rivne"
+#~ msgstr "Rivne"
 
-#. 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:583
-msgid "KBOS"
-msgstr "LEMD:LEVS:LEVC"
+#~ msgid "Rivolto"
+#~ msgstr "Rivolto"
 
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e de %B de %Y"
+#~ msgid "Riyadh"
+#~ msgstr "Riyadh"
 
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Por favor espere..."
+#~ msgid "Roanoke"
+#~ msgstr "Roanoke"
 
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir resumen"
+#~ msgid "Roatan"
+#~ msgstr "Roatan"
 
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Ha fallado la impresión del resumen"
+#~ msgid "Robore"
+#~ msgstr "Robore"
 
-#: my-evolution/metar.c:30
-msgid " F"
-msgstr " F"
+#~ msgid "Rochester"
+#~ msgstr "Rochester"
 
-#: my-evolution/metar.c:30
-msgid " C"
-msgstr " C"
+#~ msgid "Rockford"
+#~ msgstr "Rockford"
 
-#: my-evolution/metar.c:34
-msgid "knots"
-msgstr "nudos"
+#~ msgid "Rockland"
+#~ msgstr "Rockland"
 
-#: my-evolution/metar.c:34
-msgid "kph"
-msgstr "kph"
+#~ msgid "Rockport"
+#~ msgstr "Rockport"
 
-#: my-evolution/metar.c:39
-msgid "inHg"
-msgstr "inHg"
+#~ msgid "Rock Springs"
+#~ msgstr "Rock Springs"
 
-#: my-evolution/metar.c:39
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "Rocky Mount"
+#~ msgstr "Rocky Mount"
 
-#: my-evolution/metar.c:42
-msgid "miles"
-msgstr "millas"
+#~ msgid "Rodos"
+#~ msgstr "Rodos"
 
-#: my-evolution/metar.c:42
-msgid "kilometers"
-msgstr "kilómetros"
+#~ msgid "Rogers"
+#~ msgstr "Rogers"
 
-#: my-evolution/metar.c:45
-msgid "Clear sky"
-msgstr "Cielo despejado"
+#~ msgid "Roma/Ciampino"
+#~ msgstr "Roma/Ciampino"
 
-#: my-evolution/metar.c:46
-msgid "Broken clouds"
-msgstr "Nubosidad intermitente"
+#~ msgid "Roma/Fiumicino"
+#~ msgstr "Roma/Fiumicino"
 
-#: my-evolution/metar.c:47
-msgid "Scattered clouds"
-msgstr "Nubes dispersas"
+#~ msgid "Roma/Urbe"
+#~ msgstr "Roma/Urbe"
 
-#: my-evolution/metar.c:48
-msgid "Few clouds"
-msgstr "Algunas nubes"
+#~ msgid "Rome-Russell"
+#~ msgstr "Rome-Russell"
 
-#: my-evolution/metar.c:49
-msgid "Overcast"
-msgstr "Cubierto"
+#~ msgid "Ronchi de' Legionari"
+#~ msgstr "Ronchi de' Legionari"
 
-#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
-msgid "Invalid"
-msgstr "Inválido"
+#~ msgid "Ronneby"
+#~ msgstr "Ronneby"
 
-#: my-evolution/metar.c:64
-msgid "Variable"
-msgstr "Variable"
+#~ msgid "Roosevelt"
+#~ msgstr "Roosevelt"
 
-#: my-evolution/metar.c:65
-msgid "North"
-msgstr "Norte"
+#~ msgid "Roros"
+#~ msgstr "Roros"
 
-#: my-evolution/metar.c:65
-msgid "North - NorthEast"
-msgstr "Norte - Nordeste"
+#~ msgid "Rorvik/Ryum"
+#~ msgstr "Rorvik/Ryum"
 
-#: my-evolution/metar.c:65
-msgid "Northeast"
-msgstr "Nordeste"
+#~ msgid "Rosario"
+#~ msgstr "Rosario"
 
-#: my-evolution/metar.c:65
-msgid "East - NorthEast"
-msgstr "Este - Nordeste"
+#~ msgid "Roseburg"
+#~ msgstr "Roseburg"
 
-#: my-evolution/metar.c:66
-msgid "East"
-msgstr "Este"
+#~ msgid "Roseglen"
+#~ msgstr "Roseglen"
 
-#: my-evolution/metar.c:66
-msgid "East - Southeast"
-msgstr "Este - Sureste"
+#~ msgid "Rost"
+#~ msgstr "Rost"
 
-#: my-evolution/metar.c:66
-msgid "Southeast"
-msgstr "Sureste"
+#~ msgid "Rostov-Na-Donu"
+#~ msgstr "Rostov-Na-Donu"
 
-#: my-evolution/metar.c:66
-msgid "South - Southeast"
-msgstr "Sur - Sureste"
+#~ msgid "Roswell"
+#~ msgstr "Roswell"
 
-#: my-evolution/metar.c:67
-msgid "South"
-msgstr "Sur"
+#~ msgid "Rotterdam"
+#~ msgstr "Rotterdam"
 
-#: my-evolution/metar.c:67
-msgid "South - Southwest"
-msgstr "Sur - Suroeste"
+#~ msgid "Rouen-Valle de Seine"
+#~ msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/metar.c:67
-msgid "Southwest"
-msgstr "Suroeste"
+#~ msgid "Ruidoso-Sierra Blanca"
+#~ msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/metar.c:67
-msgid "West - Southwest"
-msgstr "Oeste - Suroeste"
+#~ msgid "Rurrenabaque"
+#~ msgstr "Rurrenabaque"
 
-#: my-evolution/metar.c:68
-msgid "West"
-msgstr "Oeste"
+#~ msgid "Russell"
+#~ msgstr "Russell"
 
-#: my-evolution/metar.c:68
-msgid "West - Northwest"
-msgstr "Oeste - Noroeste"
+#~ msgid "Russia"
+#~ msgstr "Rusia"
 
-#: my-evolution/metar.c:68
-msgid "Northwest"
-msgstr "Noroeste"
+#~ msgid "Rutland"
+#~ msgstr "Rutland"
 
-#: my-evolution/metar.c:68
-msgid "North - Northwest"
-msgstr "Norte - Noroeste"
+#~ msgid "Rygge"
+#~ msgstr "Rygge"
 
-#. DRIZZLE
-#: my-evolution/metar.c:128
-msgid "Drizzle"
-msgstr "Llovizna"
-
-#: my-evolution/metar.c:129
-msgid "Drizzle in the vicinity"
-msgstr "Llovizna en las proximidades"
-
-#: my-evolution/metar.c:130
-msgid "Light drizzle"
-msgstr "Ligera llovizna"
-
-#: my-evolution/metar.c:131
-msgid "Moderate drizzle"
-msgstr "Llovizna moderada"
-
-#: my-evolution/metar.c:132
-msgid "Heavy drizzle"
-msgstr "Fuerte Llovizna"
-
-#: my-evolution/metar.c:133
-msgid "Shallow drizzle"
-msgstr "Llovizna suave"
-
-#: my-evolution/metar.c:134
-msgid "Patches of drizzle"
-msgstr "Llovizna a ráfagas"
-
-#: my-evolution/metar.c:135
-msgid "Partial drizzle"
-msgstr "Llovizna parcial"
-
-#: my-evolution/metar.c:136 my-evolution/metar.c:151
-msgid "Thunderstorm"
-msgstr "Tormenta"
-
-#: my-evolution/metar.c:137
-msgid "Windy drizzle"
-msgstr "Llovizna ventosa"
-
-#: my-evolution/metar.c:138
-msgid "Showers"
-msgstr "Chaparrones"
-
-#: my-evolution/metar.c:139
-msgid "Drifting drizzle"
-msgstr "Lloviznas racheadas"
-
-#: my-evolution/metar.c:140
-msgid "Freezing drizzle"
-msgstr "Lloviznas muy frías"
-
-#. RAIN
-#: my-evolution/metar.c:143
-msgid "Rain"
-msgstr "Lluvia"
-
-#: my-evolution/metar.c:144
-msgid "Rain in the vicinity"
-msgstr "Lluvia en las proximidades"
-
-#: my-evolution/metar.c:145
-msgid "Light rain"
-msgstr "Lluvia suave"
-
-#: my-evolution/metar.c:146
-msgid "Moderate rain"
-msgstr "Lluvia moderada"
-
-#: my-evolution/metar.c:147
-msgid "Heavy rain"
-msgstr "Lluvia fuerte"
-
-#: my-evolution/metar.c:148
-msgid "Shallow rain"
-msgstr "Lluvia suave"
-
-#: my-evolution/metar.c:149
-msgid "Patches of rain"
-msgstr "Lluvia a ráfagas"
-
-#: my-evolution/metar.c:150
-msgid "Partial rainfall"
-msgstr "Lluvia parcial"
-
-#: my-evolution/metar.c:152
-msgid "Blowing rainfall"
-msgstr "Aguacero"
-
-#: my-evolution/metar.c:153
-msgid "Rain showers"
-msgstr "Chaparrones"
-
-#: my-evolution/metar.c:154
-msgid "Drifting rain"
-msgstr "Lluvia racheada"
-
-#: my-evolution/metar.c:155
-msgid "Freezing rain"
-msgstr "Lluvia muy fría"
-
-#. SNOW
-#: my-evolution/metar.c:158
-msgid "Snow"
-msgstr "Nieve"
-
-#: my-evolution/metar.c:159
-msgid "Snow in the vicinity"
-msgstr "Nevadas en las proximidades"
-
-#: my-evolution/metar.c:160
-msgid "Light snow"
-msgstr "Ligera nevada"
-
-#: my-evolution/metar.c:161
-msgid "Moderate snow"
-msgstr "Nevada moderada"
-
-#: my-evolution/metar.c:162
-msgid "Heavy snow"
-msgstr "Nevada fuerte"
-
-#: my-evolution/metar.c:163
-msgid "Shallow snow"
-msgstr "Nevada suave"
-
-#: my-evolution/metar.c:164
-msgid "Patches of snow"
-msgstr "Ráfagas de nieve"
-
-#: my-evolution/metar.c:165
-msgid "Partial snowfall"
-msgstr "Nevadas parciales"
-
-#: my-evolution/metar.c:166 my-evolution/metar.c:181
-msgid "Snowstorm"
-msgstr "Tormenta de nieve"
-
-#: my-evolution/metar.c:167
-msgid "Blowing snowfall"
-msgstr "Ventisca de nieve"
-
-#: my-evolution/metar.c:168
-msgid "Snow showers"
-msgstr "Chubascos de nieve"
-
-#: my-evolution/metar.c:169
-msgid "Drifting snow"
-msgstr "Rachas de nieve"
-
-#: my-evolution/metar.c:170
-msgid "Freezing snow"
-msgstr "Nieve congelada"
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:173
-msgid "Snow grains"
-msgstr "Copos de nieve"
-
-#: my-evolution/metar.c:174
-msgid "Snow grains in the vicinity"
-msgstr "Granizo en los alrededores"
-
-#: my-evolution/metar.c:175
-msgid "Light snow grains"
-msgstr "Copos de nieve ligeros"
-
-#: my-evolution/metar.c:176
-msgid "Moderate snow grains"
-msgstr "Granizada moderada"
-
-#: my-evolution/metar.c:177
-msgid "Heavy snow grains"
-msgstr "Granizada abundante"
-
-#: my-evolution/metar.c:178
-msgid "Shallow snow grains"
-msgstr "Granizada muy intensa"
-
-#: my-evolution/metar.c:179
-msgid "Patches of snow grains"
-msgstr "Lugares con granizo"
-
-#: my-evolution/metar.c:180
-msgid "Partial snow grains"
-msgstr "Granizada parcial"
-
-#: my-evolution/metar.c:182
-msgid "Blowing snow grains"
-msgstr "Granizo abundante"
-
-#: my-evolution/metar.c:183
-msgid "Snow grain showers"
-msgstr "Granizada"
-
-#: my-evolution/metar.c:184
-msgid "Drifting snow grains"
-msgstr "Granizada cambiando"
-
-#: my-evolution/metar.c:185
-msgid "Freezing snow grains"
-msgstr "Granizo con heladas"
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:188
-msgid "Ice crystals"
-msgstr "Cristales de hielo"
-
-#: my-evolution/metar.c:189
-msgid "Ice crystals in the vicinity"
-msgstr "Heladas en las proximidades"
-
-#: my-evolution/metar.c:190
-msgid "Few ice crystals"
-msgstr "Algunas placas de hielo"
-
-#: my-evolution/metar.c:191
-msgid "Moderate ice crystals"
-msgstr "Helada moderada"
-
-#: my-evolution/metar.c:192
-msgid "Heavy ice crystals"
-msgstr "Helada intensa"
-
-#: my-evolution/metar.c:194
-msgid "Patches of ice crystals"
-msgstr "Lugares con cristales de hielo"
-
-#: my-evolution/metar.c:195
-msgid "Partial ice crystals"
-msgstr "Helada parcial"
-
-#: my-evolution/metar.c:196
-msgid "Ice crystal storm"
-msgstr "Tormenta de hielo"
-
-#: my-evolution/metar.c:197
-msgid "Blowing ice crystals"
-msgstr "Ventisca de hielo"
-
-#: my-evolution/metar.c:198
-msgid "Showers of ice crystals"
-msgstr "Tormenta de cristales de hielo"
-
-#: my-evolution/metar.c:199
-msgid "Drifting ice crystals"
-msgstr "Cristales de hielo cambiando"
-
-#: my-evolution/metar.c:200
-msgid "Freezing ice crystals"
-msgstr "Cristales de hielo congelados"
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:203
-msgid "Ice pellets"
-msgstr "Bolas de hielo"
-
-#: my-evolution/metar.c:204
-msgid "Ice pellets in the vicinity"
-msgstr "Granizo en los alrededores"
-
-#: my-evolution/metar.c:205
-msgid "Few ice pellets"
-msgstr "Poco granizo"
-
-#: my-evolution/metar.c:206
-msgid "Moderate ice pellets"
-msgstr "Granizo moderado"
-
-#: my-evolution/metar.c:207
-msgid "Heavy ice pellets"
-msgstr "Granizo abundante"
-
-#: my-evolution/metar.c:208
-msgid "Shallow ice pellets"
-msgstr "Granizo muy abundante"
-
-#: my-evolution/metar.c:209
-msgid "Patches of ice pellets"
-msgstr "Lugares con granizo"
-
-#: my-evolution/metar.c:210
-msgid "Partial ice pellets"
-msgstr "Granizo parcial"
-
-#: my-evolution/metar.c:211
-msgid "Ice pellet storm"
-msgstr "Tormenta de granizo"
-
-#: my-evolution/metar.c:212
-msgid "Blowing ice pellets"
-msgstr "Tormenta de granizo"
-
-#: my-evolution/metar.c:213
-msgid "Showers of ice pellets"
-msgstr "Granizo con lluvia"
-
-#: my-evolution/metar.c:214
-msgid "Drifting ice pellets"
-msgstr "Granizada cambiando"
-
-#: my-evolution/metar.c:215
-msgid "Freezing ice pellets"
-msgstr "Granizada con hielo"
-
-#: my-evolution/metar.c:219
-msgid "Hail in the vicinity"
-msgstr "Granizo en las proximidades"
-
-#: my-evolution/metar.c:220 my-evolution/metar.c:235
-msgid "Light hail"
-msgstr "Ligera granizada"
-
-#: my-evolution/metar.c:221
-msgid "Moderate hail"
-msgstr "Granizo moderado"
-
-#: my-evolution/metar.c:222
-msgid "Heavy hail"
-msgstr "Granizada intensa"
-
-#: my-evolution/metar.c:223
-msgid "Shallow hail"
-msgstr "Suave granizada"
-
-#: my-evolution/metar.c:224
-msgid "Patches of hail"
-msgstr "Granizo a ráfagas"
-
-#: my-evolution/metar.c:225
-msgid "Partial hail"
-msgstr "Granizada parcial"
-
-#: my-evolution/metar.c:226
-msgid "Hailstorm"
-msgstr "Tormenta de granizo"
-
-#: my-evolution/metar.c:227
-msgid "Blowing hail"
-msgstr "Ventisca de granizo"
-
-#: my-evolution/metar.c:228
-msgid "Hail showers"
-msgstr "Chubasco de granizo"
-
-#: my-evolution/metar.c:229
-msgid "Drifting hail"
-msgstr "Rachas de granizo"
-
-#: my-evolution/metar.c:230
-msgid "Freezing hail"
-msgstr "Granizada con hielo"
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:233
-msgid "Small hail"
-msgstr "Granizo pequeño"
-
-#: my-evolution/metar.c:234
-msgid "Small hail in the vicinity"
-msgstr "Granizo en los alrededores"
-
-#: my-evolution/metar.c:236
-msgid "Moderate small hail"
-msgstr "Granizo moderado"
-
-#: my-evolution/metar.c:237
-msgid "Heavy small hail"
-msgstr "Granizo abundante"
-
-#: my-evolution/metar.c:238
-msgid "Shallow small hail"
-msgstr "Granizo muy abundante"
-
-#: my-evolution/metar.c:239
-msgid "Patches of small hail"
-msgstr "Lugares con granizo"
-
-#: my-evolution/metar.c:240
-msgid "Partial small hail"
-msgstr "Granizada parcial"
-
-#: my-evolution/metar.c:241
-msgid "Small hailstorm"
-msgstr "Pequeña granizada"
-
-#: my-evolution/metar.c:242
-msgid "Blowing small hail"
-msgstr "Granizada con viento leve"
-
-#: my-evolution/metar.c:243
-msgid "Showers of small hail"
-msgstr "Granizo con lluvia"
-
-#: my-evolution/metar.c:244
-msgid "Drifting small hail"
-msgstr "Granizada cambiando"
-
-#: my-evolution/metar.c:245
-msgid "Freezing small hail"
-msgstr "Granizo con hielo"
-
-#. PRECIPITATION
-#: my-evolution/metar.c:248
-msgid "Unknown precipitation"
-msgstr "Precipitaciones indeterminadas"
-
-#: my-evolution/metar.c:249
-msgid "Precipitation in the vicinity"
-msgstr "Precipitación en los alrededores"
-
-#: my-evolution/metar.c:250
-msgid "Light precipitation"
-msgstr "Precipitación ligera"
-
-#: my-evolution/metar.c:251
-msgid "Moderate precipitation"
-msgstr "Precipitación moderada"
-
-#: my-evolution/metar.c:252
-msgid "Heavy precipitation"
-msgstr "Precipitación abundante"
-
-#: my-evolution/metar.c:253
-msgid "Shallow precipitation"
-msgstr "Precipitación torrencial"
-
-#: my-evolution/metar.c:254
-msgid "Patches of precipitation"
-msgstr "Lugares con precipitación"
-
-#: my-evolution/metar.c:255
-msgid "Partial precipitation"
-msgstr "Precipitación parcial"
-
-#: my-evolution/metar.c:256
-msgid "Unknown thunderstorm"
-msgstr "Tormenta desconocida"
-
-#: my-evolution/metar.c:257
-msgid "Blowing precipitation"
-msgstr "Precipitación torrencial"
-
-#: my-evolution/metar.c:258
-msgid "Showers, type unknown"
-msgstr "Lluvia, de tipo desconocido"
-
-#: my-evolution/metar.c:259
-msgid "Drifting precipitation"
-msgstr "Precipitación cambiando"
-
-#: my-evolution/metar.c:260
-msgid "Freezing precipitation"
-msgstr "Precipitación con hielo"
-
-#. MIST
-#: my-evolution/metar.c:263
-msgid "Mist"
-msgstr "Niebla"
-
-#: my-evolution/metar.c:264
-msgid "Mist in the vicinity"
-msgstr "Neblina en los alrededores"
-
-#: my-evolution/metar.c:265
-msgid "Light mist"
-msgstr "Neblina ligera"
-
-#: my-evolution/metar.c:266
-msgid "Moderate mist"
-msgstr "Neblina moderada"
-
-#: my-evolution/metar.c:267
-msgid "Thick mist"
-msgstr "Neblina gruesa"
-
-#: my-evolution/metar.c:268
-msgid "Shallow mist"
-msgstr "Cortina de neblina"
-
-#: my-evolution/metar.c:269
-msgid "Patches of mist"
-msgstr "Lugares con neblina"
-
-#: my-evolution/metar.c:270
-msgid "Partial mist"
-msgstr "Neblina parcial"
-
-#: my-evolution/metar.c:272
-msgid "Mist with wind"
-msgstr "Neblina con viento"
-
-#: my-evolution/metar.c:274
-msgid "Drifting mist"
-msgstr "Neblina cambiando"
-
-#: my-evolution/metar.c:275
-msgid "Freezing mist"
-msgstr "Neblina con hielo"
-
-#. FOG
-#: my-evolution/metar.c:278
-msgid "Fog"
-msgstr "Niebla"
-
-#: my-evolution/metar.c:279
-msgid "Fog in the vicinity"
-msgstr "Niebla en los alrededores"
-
-#: my-evolution/metar.c:280
-msgid "Light fog"
-msgstr "Niebla ligera"
-
-#: my-evolution/metar.c:281
-msgid "Moderate fog"
-msgstr "Niebla moderada"
-
-#: my-evolution/metar.c:282
-msgid "Thick fog"
-msgstr "Niebla gruesa"
-
-#: my-evolution/metar.c:283
-msgid "Shallow fog"
-msgstr "Niebla muy gruesa"
-
-#: my-evolution/metar.c:284
-msgid "Patches of fog"
-msgstr "Lugares con niebla"
-
-#: my-evolution/metar.c:285
-msgid "Partial fog"
-msgstr "Niebla parcial"
-
-#: my-evolution/metar.c:287
-msgid "Fog with wind"
-msgstr "Niebla con viento"
-
-#: my-evolution/metar.c:289
-msgid "Drifting fog"
-msgstr "Niebla cambiando"
-
-#: my-evolution/metar.c:290
-msgid "Freezing fog"
-msgstr "Niebla con hielo"
-
-#. SMOKE
-#: my-evolution/metar.c:293
-msgid "Smoke"
-msgstr "Humo"
-
-#: my-evolution/metar.c:294
-msgid "Smoke in the vicinity"
-msgstr "Humo en los alrededores"
-
-#: my-evolution/metar.c:295
-msgid "Thin smoke"
-msgstr "Humo ligero"
-
-#: my-evolution/metar.c:296
-msgid "Moderate smoke"
-msgstr "Humo moderado"
-
-#: my-evolution/metar.c:297
-msgid "Thick smoke"
-msgstr "Humo grueso"
-
-#: my-evolution/metar.c:298
-msgid "Shallow smoke"
-msgstr "Cortina de humo"
-
-#: my-evolution/metar.c:299
-msgid "Patches of smoke"
-msgstr "Lugares con humo"
-
-#: my-evolution/metar.c:300
-msgid "Partial smoke"
-msgstr "Humo parcial"
-
-#: my-evolution/metar.c:301
-msgid "Thunderous smoke"
-msgstr "Niebla con truenos"
-
-#: my-evolution/metar.c:302
-msgid "Smoke with wind"
-msgstr "Humo con viento"
-
-#: my-evolution/metar.c:304
-msgid "Drifting smoke"
-msgstr "Humo cambiando"
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:308
-msgid "Volcanic ash"
-msgstr "Ceniza volcánica"
-
-#: my-evolution/metar.c:309
-msgid "Volcanic ash in the vicinity"
-msgstr "Cenizas volcánicas en los alrededores"
-
-#: my-evolution/metar.c:311
-msgid "Moderate volcanic ash"
-msgstr "Cenizas volcánicas moderadas"
-
-#: my-evolution/metar.c:312
-msgid "Thick volcanic ash"
-msgstr "Cenizas volcánicas gruesas"
-
-#: my-evolution/metar.c:313
-msgid "Shallow volcanic ash"
-msgstr "Cortina de cenizas volcánicas"
-
-#: my-evolution/metar.c:314
-msgid "Patches of volcanic ash"
-msgstr "Lugares con cenizas volcánicas"
-
-#: my-evolution/metar.c:315
-msgid "Partial volcanic ash"
-msgstr "Cenizas volcánicas parciales"
-
-#: my-evolution/metar.c:316
-msgid "Thunderous volcanic ash"
-msgstr "Cenizas volcánicas con truenos"
-
-#: my-evolution/metar.c:317
-msgid "Blowing volcanic ash"
-msgstr "Cenizas volcánicas abundantes"
-
-#: my-evolution/metar.c:318
-msgid "Showers of volcanic ash"
-msgstr "Lluvia de cenizas volcánicas"
-
-#: my-evolution/metar.c:319
-msgid "Drifting volcanic ash"
-msgstr "Cambiando cenizas volcánicas"
-
-#: my-evolution/metar.c:320
-msgid "Freezing volcanic ash"
-msgstr "Cenizas volcánicas con hielo"
-
-#. SAND
-#: my-evolution/metar.c:323
-msgid "Sand"
-msgstr "Arena"
-
-#: my-evolution/metar.c:324
-msgid "Sand in the vicinity"
-msgstr "Arena en los alrededores"
-
-#: my-evolution/metar.c:325
-msgid "Light sand"
-msgstr "Arena ligera"
-
-#: my-evolution/metar.c:326
-msgid "Moderate sand"
-msgstr "Arena moderada"
-
-#: my-evolution/metar.c:327
-msgid "Heavy sand"
-msgstr "Arena abundante"
-
-#: my-evolution/metar.c:329
-msgid "Patches of sand"
-msgstr "Lugares con arena"
-
-#: my-evolution/metar.c:330
-msgid "Partial sand"
-msgstr "Arena parcial"
-
-#: my-evolution/metar.c:332
-msgid "Blowing sand"
-msgstr "Arena muy abundante"
-
-#: my-evolution/metar.c:334
-msgid "Drifting sand"
-msgstr "Arena cambiando"
-
-#. HAZE
-#: my-evolution/metar.c:338
-msgid "Haze"
-msgstr "Bruma"
-
-#: my-evolution/metar.c:339
-msgid "Haze in the vicinity"
-msgstr "Bruma en los alrededores"
-
-#: my-evolution/metar.c:340
-msgid "Light haze"
-msgstr "Bruma ligera"
-
-#: my-evolution/metar.c:341
-msgid "Moderate haze"
-msgstr "Bruma moderada"
-
-#: my-evolution/metar.c:342
-msgid "Thick haze"
-msgstr "Bruma gruesa"
-
-#: my-evolution/metar.c:343
-msgid "Shallow haze"
-msgstr "Cortina de bruma"
-
-#: my-evolution/metar.c:344
-msgid "Patches of haze"
-msgstr "Lugares con bruma"
-
-#: my-evolution/metar.c:345
-msgid "Partial haze"
-msgstr "Bruma parcial"
-
-#: my-evolution/metar.c:347
-msgid "Haze with wind"
-msgstr "Bruma con vientos"
-
-#: my-evolution/metar.c:349
-msgid "Drifting haze"
-msgstr "Cambiando la bruma"
-
-#: my-evolution/metar.c:350
-msgid "Freezing haze"
-msgstr "Bruma con hielo"
-
-#. SPRAY
-#: my-evolution/metar.c:353
-msgid "Spray"
-msgstr "Rocío"
-
-#: my-evolution/metar.c:354
-msgid "Spray in the vicinity"
-msgstr "Rocío en los alrededores"
-
-#: my-evolution/metar.c:355
-msgid "Light spray"
-msgstr "Rocío ligero"
-
-#: my-evolution/metar.c:356
-msgid "Moderate spray"
-msgstr "Rocío moderado"
-
-#: my-evolution/metar.c:357
-msgid "Heavy spray"
-msgstr "Rocío abundante"
-
-#: my-evolution/metar.c:358
-msgid "Shallow spray"
-msgstr "Rocío muy abundante"
-
-#: my-evolution/metar.c:359
-msgid "Patches of spray"
-msgstr "Lugares con rocío"
-
-#: my-evolution/metar.c:360
-msgid "Partial spray"
-msgstr "Rocío parcial"
-
-#: my-evolution/metar.c:362
-msgid "Blowing spray"
-msgstr "Cortina de rocío"
-
-#: my-evolution/metar.c:364
-msgid "Drifting spray"
-msgstr "Rocío cambiando"
-
-#: my-evolution/metar.c:365
-msgid "Freezing spray"
-msgstr "Rocío con hielo"
-
-#. DUST
-#: my-evolution/metar.c:368
-msgid "Dust"
-msgstr "Polvo"
-
-#: my-evolution/metar.c:369
-msgid "Dust in the vicinity"
-msgstr "Polvo en los alrededores"
-
-#: my-evolution/metar.c:370
-msgid "Light dust"
-msgstr "Polvo ligero"
-
-#: my-evolution/metar.c:371
-msgid "Moderate dust"
-msgstr "Polvo moderado"
-
-#: my-evolution/metar.c:372
-msgid "Heavy dust"
-msgstr "Polvo abundante"
-
-#: my-evolution/metar.c:374
-msgid "Patches of dust"
-msgstr "Lugares con polvo"
-
-#: my-evolution/metar.c:375
-msgid "Partial dust"
-msgstr "Polvo parcial"
-
-#: my-evolution/metar.c:377
-msgid "Blowing dust"
-msgstr "Cortina de polvo"
-
-#: my-evolution/metar.c:379
-msgid "Drifting dust"
-msgstr "Cambiando el polvo"
-
-#. SQUALL
-#: my-evolution/metar.c:383
-msgid "Squall"
-msgstr "Borrasca"
-
-#: my-evolution/metar.c:384
-msgid "Squall in the vicinity"
-msgstr "Chubasco en los alrededores"
-
-#: my-evolution/metar.c:385
-msgid "Light squall"
-msgstr "Chubascos ligeros"
-
-#: my-evolution/metar.c:386
-msgid "Moderate squall"
-msgstr "Chubascos moderados"
-
-#: my-evolution/metar.c:387
-msgid "Heavy squall"
-msgstr "Chubascos abundantes"
-
-#: my-evolution/metar.c:390
-msgid "Partial squall"
-msgstr "Chubascos parciales"
-
-#: my-evolution/metar.c:391
-msgid "Thunderous squall"
-msgstr "Chubascos con truenos"
-
-#: my-evolution/metar.c:392
-msgid "Blowing squall"
-msgstr "Chubascos muy abundantes"
-
-#: my-evolution/metar.c:394
-msgid "Drifting squall"
-msgstr "Cambiando chubascos"
-
-#: my-evolution/metar.c:395
-msgid "Freezing squall"
-msgstr "Chubascos con heladas"
-
-#. SANDSTORM
-#: my-evolution/metar.c:398
-msgid "Sandstorm"
-msgstr "Tormenta de arena"
-
-#: my-evolution/metar.c:399
-msgid "Sandstorm in the vicinity"
-msgstr "Tormenta de arena en los alrededores"
-
-#: my-evolution/metar.c:400
-msgid "Light standstorm"
-msgstr "Tormenta de arena ligera"
-
-#: my-evolution/metar.c:401
-msgid "Moderate sandstorm"
-msgstr "Tormenta de arena moderada"
-
-#: my-evolution/metar.c:402
-msgid "Heavy sandstorm"
-msgstr "Tormenta de arena abundante"
-
-#: my-evolution/metar.c:403
-msgid "Shallow sandstorm"
-msgstr "Tormenta de arena muy abundante"
-
-#: my-evolution/metar.c:405
-msgid "Partial sandstorm"
-msgstr "Tormenta de arena parcial"
-
-#: my-evolution/metar.c:406
-msgid "Thunderous sandstorm"
-msgstr "Tormenta de arena con truenos"
-
-#: my-evolution/metar.c:407
-msgid "Blowing sandstorm"
-msgstr "Tormenta de arena muy intensa"
-
-#: my-evolution/metar.c:409
-msgid "Drifting sandstorm"
-msgstr "Cambiando la tormenta de arena"
-
-#: my-evolution/metar.c:410
-msgid "Freezing sandstorm"
-msgstr "Tormenta de arena helada"
-
-#. DUSTSTORM
-#: my-evolution/metar.c:413
-msgid "Duststorm"
-msgstr "Tormenta de polvo"
-
-#: my-evolution/metar.c:414
-msgid "Duststorm in the vicinity"
-msgstr "Tormenta de polvo en los alrededores"
-
-#: my-evolution/metar.c:415
-msgid "Light duststorm"
-msgstr "Tormenta de polvo ligera"
-
-#: my-evolution/metar.c:416
-msgid "Moderate duststorm"
-msgstr "Tormenta de polvo moderada"
-
-#: my-evolution/metar.c:417
-msgid "Heavy duststorm"
-msgstr "Tormenta de polvo abundante"
-
-#: my-evolution/metar.c:418
-msgid "Shallow duststorm"
-msgstr "Tormenta de polvo muy abundante"
-
-#: my-evolution/metar.c:420
-msgid "Partial duststorm"
-msgstr "Tormenta de polvo parcial"
-
-#: my-evolution/metar.c:421
-msgid "Thunderous duststorm"
-msgstr "Tormenta de polvo con truenos"
-
-#: my-evolution/metar.c:422
-msgid "Blowing duststorm"
-msgstr "Tormenta de polvo muy intensa"
-
-#: my-evolution/metar.c:424
-msgid "Drifting duststorm"
-msgstr "Tormenta de polvo cambiando"
-
-#: my-evolution/metar.c:425
-msgid "Freezing duststorm"
-msgstr "Tormenta de polvo helada"
-
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:428
-msgid "Funnel cloud"
-msgstr "Nublado"
-
-#: my-evolution/metar.c:429
-msgid "Funnel cloud in the vicinity"
-msgstr "Nublado en los alrededores"
-
-#: my-evolution/metar.c:430
-msgid "Light funnel cloud"
-msgstr "Nublado ligero"
-
-#: my-evolution/metar.c:431
-msgid "Moderate funnel cloud"
-msgstr "Nublado moderado"
-
-#: my-evolution/metar.c:432
-msgid "Thick funnel cloud"
-msgstr "Nublado abundante"
-
-#: my-evolution/metar.c:433
-msgid "Shallow funnel cloud"
-msgstr "Nublado muy abundante"
-
-#: my-evolution/metar.c:434
-msgid "Patches of funnel clouds"
-msgstr "Lugares con nublado"
-
-#: my-evolution/metar.c:435
-msgid "Partial funnel clouds"
-msgstr "Nublado parcial"
-
-#: my-evolution/metar.c:437
-msgid "Funnel cloud w/ wind"
-msgstr "Nublado con vientos"
-
-#: my-evolution/metar.c:439
-msgid "Drifting funnel cloud"
-msgstr "Nublado cambiando"
-
-#. TORNADO
-#: my-evolution/metar.c:443 my-evolution/metar.c:452
-msgid "Tornado"
-msgstr "Tornado"
-
-#: my-evolution/metar.c:444
-msgid "Tornado in the vicinity"
-msgstr "Tornado en los alrededores"
-
-#: my-evolution/metar.c:446
-msgid "Moderate tornado"
-msgstr "Tornado moderado"
-
-#: my-evolution/metar.c:447
-msgid "Raging tornado"
-msgstr "Tornado violento"
-
-#: my-evolution/metar.c:450
-msgid "Partial tornado"
-msgstr "Tornado parcial"
-
-#: my-evolution/metar.c:451
-msgid "Thunderous tornado"
-msgstr "Tornado con truenos"
-
-#: my-evolution/metar.c:454
-msgid "Drifting tornado"
-msgstr "Cambiando el tornado"
-
-#: my-evolution/metar.c:455
-msgid "Freezing tornado"
-msgstr "Tornado helado"
-
-#. DUST_WHIRLS
-#: my-evolution/metar.c:458
-msgid "Dust whirls"
-msgstr "Remolinos de polvo"
+#~ msgid "Rzeszow"
+#~ msgstr "Rzeszow"
 
-#: my-evolution/metar.c:459
-msgid "Dust whirls in the vicinity"
-msgstr "Remolino de polvo en los alrededores"
+#~ msgid "Saarbrucken"
+#~ msgstr "Saarbrucken"
 
-#: my-evolution/metar.c:460
-msgid "Light dust whirls"
-msgstr "Remolino de polvo ligero"
+#~ msgid "Sabine Pass"
+#~ msgstr "Sabine Pass"
 
-#: my-evolution/metar.c:461
-msgid "Moderate dust whirls"
-msgstr "Remolino de polvo moderado"
+#~ msgid "Sacramento"
+#~ msgstr "Sacramento"
 
-#: my-evolution/metar.c:462
-msgid "Heavy dust whirls"
-msgstr "Remolino de polvo abundante"
+#~ msgid "Sacramento-Woodland"
+#~ msgstr "Sacramento-Woodland"
 
-#: my-evolution/metar.c:463
-msgid "Shallow dust whirls"
-msgstr "Remolino de polvo intenso"
+#~ msgid "Safford-Municipal Airport"
+#~ msgstr "Safford-Municipal Airport"
 
-#: my-evolution/metar.c:464
-msgid "Patches of dust whirls"
-msgstr "Lugares con remolino de polvo"
+#~ msgid "Saginaw"
+#~ msgstr "Saginaw"
 
-#: my-evolution/metar.c:465
-msgid "Partial dust whirls"
-msgstr "Remolinos de polvo parciales"
+#~ msgid "Saint Anthony"
+#~ msgstr "Saint Anthony"
 
-#: my-evolution/metar.c:467
-msgid "Blowing dust whirls"
-msgstr "Remolinos de polvo muy intensos"
+#~ msgid "Saint-Brieuc-Armor"
+#~ msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/metar.c:469
-msgid "Drifting dust whirls"
-msgstr "Remolinos de polvo cambiando"
+#~ msgid "Saint-Dizier-Robinson"
+#~ msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "C_elsius"
-msgstr "C_elsius"
+#~ msgid "Saint-Etienne-Boutheon"
+#~ msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "How many days should the calendar display at once?"
-msgstr "¿Cuántos días debe mostrar de una vez el calendario?"
+#~ msgid "Saint Mary's"
+#~ msgstr "Saint Mary's"
 
-#: my-evolution/my-evolution.glade.h:5
-msgid "News Feed Settings"
-msgstr "Configuración de las fuentes de noticias"
+#~ msgid "Saint Mawgan"
+#~ msgstr "Saint Mawgan"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "News Feeds"
-msgstr "Fuentes de noticias"
+#~ msgid "Saint-Nazaire-Montoir"
+#~ msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
-msgstr "Un _mes"
+#~ msgid "Saint Paul"
+#~ msgstr "Saint Paul"
 
-#: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
-msgstr "Una s_emana"
+#~ msgid "Saiq"
+#~ msgstr "Saiq"
 
-#: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
-msgstr "Int_ervalo de actualización (segundos):"
+#~ msgid "Salalah"
+#~ msgstr "Salalah"
 
-#: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
-msgstr "In_tervalo de actualización (segundos):"
+#~ msgid "Salem"
+#~ msgstr "Salem"
 
-#: my-evolution/my-evolution.glade.h:11
-msgid "Schedule"
-msgstr "Horario"
+#~ msgid "Salida"
+#~ msgstr "Salida"
 
-#: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
-msgstr "Mostrar tod_as las tareas"
+#~ msgid "Salida-Harriet"
+#~ msgstr "Salida-Harriet"
 
-#: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
-msgstr "Mostrar las _tareas de hoy"
+#~ msgid "Salina"
+#~ msgstr "Salina"
 
-#: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
-msgstr "Mostrar temperaturas en:"
+#~ msgid "Salinas"
+#~ msgstr "Salinas"
 
-#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
-msgstr "Tareas "
+#~ msgid "Salisbury"
+#~ msgstr "Salisbury"
 
-#: my-evolution/my-evolution.glade.h:17
-msgid "Weather Settings"
-msgstr "Configuración de meteorología"
+#~ msgid "Salmon"
+#~ msgstr "Salmon"
 
-#: my-evolution/my-evolution.glade.h:18
-msgid "_Delete Feed"
-msgstr "_Borrar fuente"
+#~ msgid "Salmon (2)"
+#~ msgstr "Salmon (2)"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "_Fahrenheit"
-msgstr "_Fahrenheit"
+#~ msgid "Salta"
+#~ msgstr "Salta"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Five days"
-msgstr "_Cinco días"
+#~ msgid "Saltillo"
+#~ msgstr "Saltillo"
 
-#: my-evolution/my-evolution.glade.h:21
-msgid "_Max number of items shown:"
-msgstr "Número _máx de elementos mostrados:"
+#~ msgid "Salt Lake City"
+#~ msgstr "Salt Lake City"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_New Feed"
-msgstr "_Nueva fuente"
+#~ msgid "Salto"
+#~ msgstr "Salto"
 
-#: my-evolution/my-evolution.glade.h:23
-msgid "_One day"
-msgstr "_Un día"
+#~ msgid "Salt point"
+#~ msgstr "Salt point"
 
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Show full path for folders"
-msgstr "Mo_strar ruta completa para las carpetas"
+#~ msgid "Salvador"
+#~ msgstr "El Salvador"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
-"línea aquí"
+#~ msgid "Salzburg"
+#~ msgstr "Salzburg"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Intérprete de Evolution."
+#~ msgid "Samara"
+#~ msgstr "Samara"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuración de preferencias de carpetas de Evolution"
+#~ msgid "Samos"
+#~ msgstr "Samos"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Configuración de carpetas"
+#~ msgid "Samsun"
+#~ msgstr "Samsun"
 
-#: shell/e-activity-handler.c:164
-msgid "Show Details"
-msgstr "Mostrar detalles"
+#~ msgid "Sana'A"
+#~ msgstr "Sana'A"
 
-#: shell/e-activity-handler.c:166
-msgid "Cancel Operation"
-msgstr "Cancelar operación"
+#~ msgid "San Andres Isla/Sesquicentenario"
+#~ msgstr "San Andres Isla/Sesquicentenario"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"No se pudo transferir la carpeta:\n"
-"%s"
+#~ msgid "San Angelo"
+#~ msgstr "San Angelo"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» en «%s»..."
+#~ msgid "San Antonio"
+#~ msgstr "San Antonio"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Añadir una carpeta"
+#~ msgid "San Antonio Del Tachira"
+#~ msgstr "San Antonio Del Tachira"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Borradores"
+#~ msgid "San Antonio-Kelly AFB"
+#~ msgstr "San Antonio-Kelly AFB"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Correo recibido"
+#~ msgid "San Antonio-Stinson"
+#~ msgstr "San Antonio-Stinson"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Correo para enviar"
+#~ msgid "San Carlos"
+#~ msgstr "San Carlos"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Enviado"
+#~ msgid "Sandane"
+#~ msgstr "Sandane"
 
-#: shell/e-setup.c:146
-msgid "Could not update files correctly"
-msgstr "No se pudieron actualizar correctamente los archivos"
+#~ msgid "Sandberg"
+#~ msgstr "Sandberg"
 
-#: shell/e-setup.c:167
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"No se pudo crear el directorio\n"
-"%s\n"
-"Error: %s"
+#~ msgid "Sanderson"
+#~ msgstr "Sanderson"
 
-#: shell/e-setup.c:178
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"Ha ocurrido un error mientras se copiaban archivos a\n"
-"«%s»."
+#~ msgid "San Diego"
+#~ msgstr "San Diego"
 
-#: shell/e-setup.c:244
-#, 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, muévalo para permitir la instalación\n"
-"de los archivos de usuario de Evolution."
+#~ msgid "San Diego-Brown"
+#~ msgstr "San Diego-Brown"
 
-#: shell/e-setup.c:253
-#, 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"
-"de Evolution. Por favor, muévalo para permitir la\n"
-"instalación de los archivos de usuario de Evolution."
+#~ msgid "San Diego-Miramar"
+#~ msgstr "San Diego-Miramar"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Producido por"
+#~ msgid "San Diego-Montgomery"
+#~ msgstr "San Diego-Montgomery"
 
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr "Carpetas adicionales para autocompletar direcciones"
+#~ msgid "San Diego-North Island"
+#~ msgstr "San Diego-North Island"
 
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr "Seleccionar carpeta predeterminada"
+#~ msgid "San Diego-Santee"
+#~ msgstr "San Diego-Santee"
 
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr "Carpetas predefinidas"
+#~ msgid "Sandnessjoen/Stokka"
+#~ msgstr "Sandnessjoen/Stokka"
 
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr "Carpetas sin conexión"
+#~ msgid "Sand Point"
+#~ msgstr "Sand Point"
 
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr "Carpetas para autocompletar"
+#~ msgid "San Fernando De Apure"
+#~ msgstr "San Fernando de Apure"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "No se pudo copiar la carpeta: %s"
+#~ msgid "Sanford"
+#~ msgstr "Sanford"
 
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "No se pudo mover la carpeta: %s"
+#~ msgid "San Francisco"
+#~ msgstr "San Francisco"
 
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "No se pudo mover una carpeta sobre sí misma."
+#~ msgid "Sangju"
+#~ msgstr "Sangju"
 
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "No se pudo copiar una carpeta sobre sí misma."
+#~ msgid "San Ignacio De Velasco"
+#~ msgstr "San Ignacio de Velasco"
 
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes."
+#~ msgid "San Joaquin"
+#~ msgstr "San Joaquín"
 
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Especificar una carpeta en la que copiar la carpeta «%s»:"
+#~ msgid "San Jose"
+#~ msgstr "San Jose"
 
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Copiar carpeta"
+#~ msgid "San Jose De Chiquitos"
+#~ msgstr "San Jose De Chiquitos"
 
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Especificar una carpeta a la que mover la carpeta «%s»:"
+#~ msgid "San Jose del Cabo"
+#~ msgstr "San Jose del Cabo"
 
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Mover carpeta"
+#~ msgid "San Jose-Santa Clara"
+#~ msgstr "San Jose-Santa Clara"
 
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"No se pudo borrar la carpeta:\n"
-"%s"
+#~ msgid "San Juan"
+#~ msgstr "San Juan"
 
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "¿Seguro que quiere borrar «%s»?"
+#~ msgid "Sankt-Peterburg"
+#~ msgstr "Sankt-Peterburg"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Borrar «%s»"
+#~ msgid "Sanliurfa"
+#~ msgstr "Sanliurfa"
 
-#: shell/e-shell-folder-commands.c:489
-#, c-format
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-"No se pudo renombrar la carpeta:\n"
-"%s"
+#~ msgid "San Luis Obispo"
+#~ msgstr "San Luis Obispo"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renombrar carpeta «%s» a:"
+#~ msgid "San Luis Potosi"
+#~ msgstr "San Luis Potosí"
 
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Renombrar carpeta"
+#~ msgid "San Miguel"
+#~ msgstr "San Miguel"
 
-#: shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "El nombre de carpeta especificado no es valido: %s"
+#~ msgid "San Nicholas Island"
+#~ msgstr "Isla de San Nicholas"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+#~ msgid "San Salvador"
+#~ msgstr "San Salvador"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "La carpeta seleccionada no pertenece a otro usuario"
+#~ msgid "San Sebastian"
+#~ msgstr "San Sebastián"
 
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"No se pudo borrar la carpeta:\n"
-"%s"
+#~ msgid "Santa Ana"
+#~ msgstr "Santa Ana"
 
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"No se pudo crear la carpeta especificada:\n"
-"%s"
+#~ msgid "Santa Barbara"
+#~ msgstr "Santa Barbara"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Crear carpeta nueva"
+#~ msgid "Santa Cruz"
+#~ msgstr "Santa Cruz"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
-msgid "(Untitled)"
-msgstr "(Sin título)"
+#~ msgid "Santa Fe"
+#~ msgstr "Santa Fe"
 
-#: shell/e-shell-importer.c:139
-msgid "Choose the type of importer to run:"
-msgstr "Elija el tipo de importador a ejecutar:"
+#~ msgid "Santa Maria"
+#~ msgstr "Santa María"
 
-#: shell/e-shell-importer.c:142
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-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."
+#~ msgid "Santa Marta/Simon Bolivar"
+#~ msgstr "Santa Marta/Simón Bolivar"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
-msgid "Please select the information that you would like to import:"
-msgstr "Por favor seleccione la información que quiera importar:"
+#~ msgid "Santa Monica"
+#~ msgstr "Santa Mónica"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-"Evolution comprobó la configuración de las siguientes aplicaciones:\n"
-"Pine, Netscape, Elm, iCalendar. No se encontraron ajustes que\n"
-"pudieran ser importados. Si quiere intentarlo de nuevo, pulse\n"
-"el botón «Atrás».\n"
+#~ msgid "Santander"
+#~ msgstr "Santander"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando elemento %d."
+#~ msgid "Santarem"
+#~ msgstr "Santarem"
 
-#: shell/e-shell-importer.c:323
-msgid "Select importer"
-msgstr "Seleccionar importador"
+#~ msgid "Santa Rosa"
+#~ msgstr "Santa Rosa"
 
-#: shell/e-shell-importer.c:464
-#, c-format
-msgid "File %s does not exist"
-msgstr "El archivo %s no existe"
+#~ msgid "Santa Rosa de Copan"
+#~ msgstr "Santa Rosa de Copan"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
-msgid "Evolution Error"
-msgstr "Error de Evolution"
+#~ msgid "Santiago"
+#~ msgstr "Santiago"
 
-#: shell/e-shell-importer.c:481
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
-"%s"
+#~ msgid "Santiago de Cuba"
+#~ msgstr "Santiago de Cuba"
 
-#: shell/e-shell-importer.c:490
-msgid "Importing"
-msgstr "Importando"
+#~ msgid "Santiago Del Estero"
+#~ msgstr "Santiago Del Estero"
 
-#: shell/e-shell-importer.c:497
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comenzando %s"
+#~ msgid "Santorini"
+#~ msgstr "Santorini"
 
-#: shell/e-shell-importer.c:509
-#, c-format
-msgid "Error starting %s"
-msgstr "Error cargando %s"
+#~ msgid "Santos"
+#~ msgstr "Santos"
 
-#: shell/e-shell-importer.c:523
-#, c-format
-msgid "Error loading %s"
-msgstr "Error cargando %s"
+#~ msgid "Sao Jose Dos Campo"
+#~ msgstr "Sao Jose Dos Campo"
 
-#: shell/e-shell-importer.c:540
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando elemento 1."
+#~ msgid "Sao Luiz"
+#~ msgstr "Sao Luiz"
 
-#: shell/e-shell-importer.c:594
-msgid "Automatic"
-msgstr "Automático"
+#~ msgid "Sao Paulo"
+#~ msgstr "Sao Paulo"
 
-#: shell/e-shell-importer.c:643
-msgid "Filename:"
-msgstr "Nombre de archivo:"
+#~ msgid "Sapporo Ab"
+#~ msgstr "Sapporo Ab"
 
-#: shell/e-shell-importer.c:648
-msgid "Select a file"
-msgstr "Elija un archivo"
+#~ msgid "Sarajevo"
+#~ msgstr "Sarajevo"
 
-#: shell/e-shell-importer.c:657
-msgid "File type:"
-msgstr "Tipo de archivo:"
+#~ msgid "Saranac Lake"
+#~ msgstr "Saranac Lake"
 
-#: shell/e-shell-importer.c:682
-msgid "Import data and settings from older programs"
-msgstr "Importar datos y configuración de programas antiguos"
+#~ msgid "Sarasota"
+#~ msgstr "Sarasota"
 
-#: shell/e-shell-importer.c:686
-msgid "Import a single file"
-msgstr "Importar un único archivo"
+#~ msgid "Saratov"
+#~ msgstr "Saratov"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Por favor espere...\n"
-"Buscando configuraciones existentes"
+#~ msgid "Sarzana"
+#~ msgstr "Sarzana"
 
-#: shell/e-shell-importer.c:758
-msgid "Starting Intelligent Importers"
-msgstr "Comenzando importadores inteligentes"
+#~ msgid "Saskatchewan"
+#~ msgstr "Saskatchewan"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
-#, c-format
-msgid "From %s:"
-msgstr "De %s:"
+#~ msgid "Saskatoon"
+#~ msgstr "Saskatoon"
 
-#: shell/e-shell-importer.c:1061
-msgid "Select folder"
-msgstr "Seleccionar carpeta"
+#~ msgid "Sauce Viejo"
+#~ msgstr "Sauce Viejo"
 
-#: shell/e-shell-importer.c:1062
-msgid "Select a destination folder for importing this data"
-msgstr "Seleccionar una carpeta de destino donde importar estos datos"
+#~ msgid "Sault Ste Marie"
+#~ msgstr "Sault Ste Marie"
 
-#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importar"
+#~ msgid "Savannah"
+#~ msgstr "Savannah"
 
-#: shell/e-shell-offline-handler.c:592
-msgid "Closing connections..."
-msgstr "Cerrando conexiones..."
+#~ msgid "Savannah-Hunter AAF"
+#~ msgstr "Savannah-Hunter AAF"
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Error mientras se sincronizaba «%s»:\n"
-"%s"
+#~ msgid "Sawyer AFB"
+#~ msgstr "Sawyer AF"
 
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Sincronizando carpeta"
+#~ msgid "Sayun"
+#~ msgstr "Sayun"
 
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sincronizando «%s» (%d de %d)..."
+#~ msgid "Scatsta"
+#~ msgstr "Scatsta"
 
-#: shell/e-shell-settings-dialog.c:346
-msgid "Evolution Settings"
-msgstr "Preferencias de Evolution"
+#~ msgid "Schaffen"
+#~ msgstr "Schaffen"
 
-#. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
-#: shell/e-shell-shared-folder-picker-dialog.c:281
-msgid "Please select a user."
-msgstr "Por favor seleccione un usuario."
+#~ msgid "Schenectady"
+#~ msgstr "Schenectady"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr "Abriendo carpeta"
+#~ msgid "Scilly Isles"
+#~ msgstr "Scilly Isles"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr "Abriendo carpeta «%s»"
+#~ msgid "Scottsbluff"
+#~ msgstr "Scottsbluff"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr "en «%s» ..."
+#~ msgid "Scottsdale"
+#~ msgstr "Scottsdale"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr "No se pudo abrir la carpeta compartida: %s."
+#~ msgid "Scranton"
+#~ msgstr "Scranton"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr "No se pudo encontrar la carpeta compartida especificada"
+#~ msgid "Seattle"
+#~ msgstr "Seattle"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nuevo"
+#~ msgid "Seattle-Boeing"
+#~ msgstr "Seattle-Boeing"
 
-#: shell/e-shell-utils.c:116
-msgid "No folder name specified."
-msgstr "No ha especificado un nombre de carpeta."
+#~ msgid "Sedalia"
+#~ msgstr "Sedalia"
 
-#: 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."
+#~ msgid "Seeb"
+#~ msgstr "Seeb"
 
-#: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «/»."
+#~ msgid "Selanik"
+#~ msgstr "Selanik"
 
-#: shell/e-shell-utils.c:135
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «#»."
+#~ msgid "Sendai Airport"
+#~ msgstr "Aeropuerto de Sendai"
 
-#: shell/e-shell-utils.c:141
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' y '..' son nombres reservados de carpetas."
+#~ msgid "Seoul E Ab"
+#~ msgstr "Seoul E Ab"
 
-#: shell/e-shell-view-menu.c:89
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+#~ msgid "Seoul/Kimp'O International Airport"
+#~ msgstr "Aeropuerto Internacional de Seoul/Kimp'O"
 
-#: shell/e-shell-view-menu.c:97
-#, c-format
-msgid "Error executing %s."
-msgstr "Error ejecutando %s."
+#~ msgid "Seoul/Yongdungp'O Rokaf Wc"
+#~ msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: shell/e-shell-view-menu.c:193
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy no está instalado"
+#~ msgid "Sept-Iles"
+#~ msgstr "Sept-Iles"
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy could not be run."
-msgstr "No se ha podido ejecutar bug buddy"
+#~ msgid "Seul Choix Pt"
+#~ msgstr "Seul Choix Pt"
 
-#: shell/e-shell-view-menu.c:247
-msgid "About Ximian Evolution"
-msgstr "Acerca de Ximian Evolution"
+#~ msgid "Sevilla"
+#~ msgstr "Sevilla"
 
-#: shell/e-shell-view-menu.c:502
-msgid "Go to folder..."
-msgstr "Ir a la carpeta..."
+#~ msgid "Seward"
+#~ msgstr "Seward"
 
-#: shell/e-shell-view-menu.c:503
-msgid "Select the folder that you want to open"
-msgstr "Seleccione la carpeta que quiere abrir"
+#~ msgid "Sexton Summit"
+#~ msgstr "Sexton Summit"
 
-#: shell/e-shell-view-menu.c:617
-msgid "Create New Shortcut"
-msgstr "Crear atajo"
+#~ msgid "Shanghai"
+#~ msgstr "Shanghai"
 
-#: 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:"
+#~ msgid "Shannon"
+#~ msgstr "Shannon"
 
-#: shell/e-shell-view-menu.c:769
-msgid "_Work Online"
-msgstr "_Trabajar conectado"
+#~ msgid "Sharjah"
+#~ msgstr "Sharjah"
 
-#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
-msgid "_Work Offline"
-msgstr "_Trabajar desconectado"
+#~ msgid "Sharm El Sheikhintl"
+#~ msgstr "Sharm El Sheikhintl"
 
-#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Trabajar desconectado"
+#~ msgid "Sharurah"
+#~ msgstr "Sharurah"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(No hay carpetas mostrándose)"
+#~ msgid "Shawbury"
+#~ msgstr "Shawbury"
 
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#~ msgid "Shearwater"
+#~ msgstr "Shearwater"
 
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(nada)"
+#~ msgid "Sheboygan"
+#~ msgstr "Sheboygan"
 
-#: shell/e-shell-view.c:2083
-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."
+#~ msgid "Sheldon"
+#~ msgstr "Sheldon"
 
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution está en proceso de desconectarse."
+#~ msgid "Shelter Cove"
+#~ msgstr "Shelter Cove"
 
-#: shell/e-shell-view.c:2096
-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."
+#~ msgid "Shelton"
+#~ msgstr "Shelton"
 
-#: 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"
+#~ msgid "Shenandoah"
+#~ msgstr "Shenandoah"
 
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No se pudo configurar almacenamiento local -- %s"
+#~ msgid "Sheridan"
+#~ msgstr "Sheridan"
 
-#: shell/e-shell.c:1804
-#, 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."
+#~ msgid "Sherman-Denison"
+#~ msgstr "Sherman-Denison"
 
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
+#~ msgid "Shimofusa Ab"
+#~ msgstr "Shimofusa Ab"
 
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "No se pudo registrar en OAF"
+#~ msgid "Shingle Point"
+#~ msgstr "Shingle Point"
 
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
+#~ msgid "Shiraz"
+#~ msgstr "Shiraz"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Error genérico"
+#~ msgid "Shishmaref"
+#~ msgstr "Shishmaref"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Crear un nuevo grupo de atajos"
+#~ msgid "Shizuhama Ab"
+#~ msgstr "Shizuhama Ab"
 
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nombre del grupo:"
+#~ msgid "Shoreham"
+#~ msgstr "Shoreham"
 
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "¿Realmente quiere quitar el grupo «%s» de la barra de atajos?"
+#~ msgid "Show Low"
+#~ msgstr "Show Low"
 
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Renombrar grupo de atajos"
+#~ msgid "Shreveport Downtown"
+#~ msgstr "Shreveport Downtown"
 
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Renombrar grupos de atajos seleccionados a:"
+#~ msgid "Shreveport Regional"
+#~ msgstr "Shreveport Regional"
 
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Icono_s pequeños"
+#~ msgid "Sidney"
+#~ msgstr "Sidney"
 
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Mostrar los atajos como iconos pequeños"
+#~ msgid "Sigonella"
+#~ msgstr "Sigonella"
 
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Iconos _grandes"
+#~ msgid "Siloam Springs"
+#~ msgstr "Siloam Springs"
 
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Mostrar los atajos como iconos grandes"
+#~ msgid "Silver City"
+#~ msgstr "Silver City"
 
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Añadir grupo..."
+#~ msgid "Sindal"
+#~ msgstr "Sindal"
 
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Crear un nuevo grupo de atajos"
+#~ msgid "Sioux City"
+#~ msgstr "Sioux City"
 
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Quitar este grupo..."
+#~ msgid "Sioux Falls"
+#~ msgstr "Sioux Falls"
 
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Quitar este grupo de atajos"
+#~ msgid "Sitka"
+#~ msgstr "Sitka"
 
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Re_nombrar este grupo..."
+#~ msgid "Sivas"
+#~ msgstr "Sivas"
 
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Renombrar este grupo de atajos"
+#~ msgid "Sivrihisar"
+#~ msgstr "Sivrihisar"
 
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Ocultar la barra de atajos"
+#~ msgid "Skagway"
+#~ msgstr "Skagway"
 
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Ocultar la barra de atajos"
+#~ msgid "Skiathos"
+#~ msgstr "Skiathos"
 
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Crear atajos pre_determinados"
+#~ msgid "Skien/Geiteryggen"
+#~ msgstr "Skien/Geiteryggen"
 
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Crear atajos predeterminados"
+#~ msgid "Skive"
+#~ msgstr "Skive"
 
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Renombrar atajo"
+#~ msgid "Skopje"
+#~ msgstr "Skopje"
 
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Renombrar atajos seleccionados a:"
+#~ msgid "Skwentna"
+#~ msgstr "Skwentna"
 
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Abrir la carpeta enlazada a este atajo"
+#~ msgid "Slana"
+#~ msgstr "Slana"
 
-#: shell/e-shortcuts-view.c:424 ui/evolution.xml.h:23
-msgid "Open in New _Window"
-msgstr "Abrir en una _ventana nueva"
+#~ msgid "Smithers"
+#~ msgstr "Smithers"
 
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
+#~ msgid "Smyrna"
+#~ msgstr "Smyrna"
 
-#: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Renombrar"
+#~ msgid "Snowshoe Lake"
+#~ msgstr "Lago Snowshoe"
 
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Renombrar este atajo"
+#~ msgid "Sochi"
+#~ msgstr "Sochi"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Qui_tar"
+#~ msgid "Socorro"
+#~ msgstr "Socorro"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Quitar este atajo de la lista de atajos"
+#~ msgid "Socotra"
+#~ msgstr "Socotra"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Error guardando atajos."
+#~ msgid "Soda Springs"
+#~ msgstr "Soda Springs"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Atajos"
+#~ msgid "Sofia"
+#~ msgstr "Sofía"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Activar"
+#~ msgid "Sogndal"
+#~ msgstr "Sogndal"
 
-#: shell/e-storage.c:566
-msgid "No error"
-msgstr "Sin errores"
+#~ msgid "Soldotna"
+#~ msgstr "Soldotna"
 
-#: shell/e-storage.c:570
-msgid "A folder with the same name already exists"
-msgstr "Ya existe una carpeta con ese nombre"
+#~ msgid "Somerset"
+#~ msgstr "Somerset"
 
-#: shell/e-storage.c:572
-msgid "The specified folder type is not valid"
-msgstr "Es tipo de archivo especificado no es válido"
+#~ msgid "Sonderborg"
+#~ msgstr "Sonderborg"
 
-#: shell/e-storage.c:574
-msgid "I/O error"
-msgstr "Error de E/S"
+#~ msgid "Songmu Ab"
+#~ msgstr "Songmu Ab"
 
-#: shell/e-storage.c:576
-msgid "Not enough space to create the folder"
-msgstr "No hay suficiente espacio para crear la carpeta"
+#~ msgid "Sorkjosen"
+#~ msgstr "Sorkjosen"
 
-#: shell/e-storage.c:578
-msgid "The folder is not empty"
-msgstr "Esta carpeta no está vacía"
+#~ msgid "Southampton"
+#~ msgstr "Southampton"
 
-#: shell/e-storage.c:580
-msgid "The specified folder was not found"
-msgstr "No se encontró la carpeta especificada"
+#~ msgid "South Bend"
+#~ msgstr "South Bend"
 
-#: shell/e-storage.c:582
-msgid "Function not implemented in this storage"
-msgstr "Función sin implementar en este almacenamiento"
+#~ msgid "South Carolina"
+#~ msgstr "Carolina del Sur"
 
-#: shell/e-storage.c:586
-msgid "Operation not supported"
-msgstr "Operación no implementada"
+#~ msgid "South Dakota"
+#~ msgstr "Dakota del Sur"
 
-#: shell/e-storage.c:588
-msgid "The specified type is not supported in this storage"
-msgstr "El tipo especificado no está implementado por este manejador"
+#~ msgid "Southend"
+#~ msgstr "Southend"
 
-#: shell/e-storage.c:590
-msgid "The specified folder cannot be modified or removed"
-msgstr "La carpeta especificada no puede ser modificado o borrado"
+#~ msgid "South Marsh Island"
+#~ msgstr "South Marsh Island"
 
-#: shell/e-storage.c:592
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "No se pudo mover una carpeta dentro de uno de sus descendientes"
+#~ msgid "South Timbalier"
+#~ msgstr "South Timbalier"
 
-#: shell/e-storage.c:594
-msgid "Cannot create a folder with that name"
-msgstr "No se pudo crear una carpeta con ese nombre"
+#~ msgid "Sparrevohn"
+#~ msgstr "Sparrevohn"
 
-#: shell/e-storage.c:596
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operación no puede efectuarse en modo desconectado"
+#~ msgid "Spencer"
+#~ msgstr "Spencer"
 
-#: shell/e-task-widget.c:211
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#~ msgid "Spickard"
+#~ msgstr "Spickard"
 
-#: shell/e-task-widget.c:216
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% completado)"
+#~ msgid "Split"
+#~ msgstr "Split"
 
-#: shell/evolution-folder-selector-button.c:100
-msgid "<click here to select a folder>"
-msgstr "<pinche aquí para seleccionar una carpeta>"
+#~ msgid "Spokane"
+#~ msgstr "Spokane"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Error desconocido."
+#~ msgid "Spokane-Parkwater"
+#~ msgstr "Spokane-Parkwater"
 
-#: 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"
+#~ msgid "Springbok"
+#~ msgstr "Springbok"
 
-#: 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"
+#~ msgid "Springfield"
+#~ msgstr "Springfield"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Error CORBA"
+#~ msgid "Stampede Pass"
+#~ msgstr "Stampede Pass"
 
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Interrumpido"
+#~ msgid "State College"
+#~ msgstr "State College"
 
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumento inválido"
+#~ msgid "Stauning"
+#~ msgstr "Stauning"
 
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Ya tiene un dueño"
+#~ msgid "Staunton"
+#~ msgstr "Staunton"
 
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Sin dueño"
+#~ msgid "Stavanger/Sola"
+#~ msgstr "Stavanger/Sola"
 
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "No encontrado"
+#~ msgid "Staverton"
+#~ msgstr "Staverton"
 
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Tipo no soportado"
+#~ msgid "Stavropol"
+#~ msgstr "Stavropol"
 
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Schema no soportado"
+#~ msgid "St Cloud"
+#~ msgstr "St Cloud"
 
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Operación no soportada"
+#~ msgid "Steamboat Springs"
+#~ msgstr "Steamboat Springs"
 
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Error interno"
+#~ msgid "Stephenville"
+#~ msgstr "Stephenville"
 
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Salir"
+#~ msgid "St. George"
+#~ msgstr "St. George"
 
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI no válida"
+#~ msgid "Stillwater"
+#~ msgstr "Stillwater"
 
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Tiene subcarpetas"
+#~ msgid "St. John's"
+#~ msgstr "St. John's"
 
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "No queda sitio"
+#~ msgid "St Johnsbury"
+#~ msgstr "San Johnsbury"
 
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "El antiguo dueño a muerto"
+#~ msgid "St Joseph"
+#~ msgstr "San Joseph"
 
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Tipo de pruebas"
+#~ msgid "St Louis"
+#~ msgstr "San Luis"
 
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Componente de Prueba de Evolution"
+#~ msgid "St Louis-Spirit"
+#~ msgstr "Espíritu de San Luis"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr "Conexiones activas"
+#~ msgid "Stockholm (Arlanda)"
+#~ msgstr "Stockholmo (Arlanda)"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
+#~ msgid "Stockholm (Bromma)"
+#~ msgstr "Stockholmo (Bromma)"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Las siguientes conexiones están actualmente activas:"
+#~ msgid "Stockton"
+#~ msgstr "Stockton"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "C_alendario:"
+#~ msgid "Stokmarknes/Skagen"
+#~ msgstr "Stokmarknes/Skagen"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Contactos:"
+#~ msgid "Stord/Sorstokken"
+#~ msgstr "Stord/Sorstokken"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "Co_rreo:"
+#~ msgid "Storm Lake"
+#~ msgstr "Lago Storm"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tareas"
+#~ msgid "Stornoway"
+#~ msgstr "Stornoway"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "_Nombre de la carpeta:"
+#~ msgid "St Paul"
+#~ msgstr "San Paul"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Tipo de carpeta:"
+#~ msgid "St Petersburg"
+#~ msgstr "San Petersburgo"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Especifique donde crear la carpeta:"
+#~ msgid "St Petersburg / Clearwater"
+#~ msgstr "San Petersburgo / Clearwater"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Abrir carpeta de otro usuario"
+#~ msgid "Strasbourg"
+#~ msgstr "Strasbourg"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Cuent_a:"
+#~ msgid "Strevell"
+#~ msgstr "Strevell"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nombre de la _carpeta:"
+#~ msgid "St Simon's Island"
+#~ msgstr "Isla San Simón"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Usuario:"
+#~ msgid "Stumpy Point"
+#~ msgstr "Stumpy Point"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Asistente de configuración de Evolution"
+#~ msgid "Sturgeon Bay"
+#~ msgstr "Sturgeon Bay"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Importando archivos"
+#~ msgid "Stuttgart"
+#~ msgstr "Stuttgart"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Zona horaria "
+#~ msgid "Sucre"
+#~ msgstr "Sucre"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Bienvenido"
+#~ msgid "Sumburgh"
+#~ msgstr "Sumburgh"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Bienvenido a Evolution. Las siguientes pantallas permitirán a\n"
-"Evolution conectarse a sus cuentas de correo, e importar archivos\n"
-"desde otras aplicaciones. \n"
-"\n"
-"Por favor pulse el botón «Siguiente» para continuar. "
+#~ msgid "Sumter"
+#~ msgstr "Sumter"
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"Ha introducido toda la información necesaria para\n"
-"configurar Evolution. \n"
-"\n"
-"Pulse el botón «Aplicar» para guardar su configuración. "
+#~ msgid "Sumter (2)"
+#~ msgstr "Sumter (2)"
 
-#: 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. "
+#~ msgid "Sundsvall-Harnosand"
+#~ msgstr "Sundsvall-Harnosand"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Asistente de importación de Evolution"
+#~ msgid "Sungshan/Taipei"
+#~ msgstr "Sungshan/Taipei"
 
-#: shell/importer/import.glade.h:3
-msgid "Import File (step 3 of 3)"
-msgstr "Importar archivo (Paso 3 de 3)"
+#~ msgid "Superior"
+#~ msgstr "Superior"
 
-#: shell/importer/import.glade.h:4
-msgid "Importer Type (step 1 of 3)"
-msgstr "Tipo de importador (Paso 1 de 3)"
+#~ msgid "Sutton"
+#~ msgstr "Sutton"
 
-#: shell/importer/import.glade.h:5
-msgid "Select Importers (step 2 of 3)"
-msgstr "Seleccione importadores (paso 2 de 3)"
+#~ msgid "Suwon Ab"
+#~ msgstr "Suwon Ab"
 
-#: shell/importer/import.glade.h:6
-msgid "Select a File (step 2 of 3)"
-msgstr "Elija un archivo (paso 2 de 3)"
+#~ msgid "Svalbard"
+#~ msgstr "Svalbard"
 
-#: shell/importer/import.glade.h:7
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"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."
+#~ msgid "Svolvaer/Helle"
+#~ msgstr "Svolvaer/Helle"
 
-#: shell/importer/intelligent.c:189
-msgid "Importers"
-msgstr "Importadores"
+#~ msgid "Swift Current"
+#~ msgstr "Swift Current"
 
-#: shell/importer/intelligent.c:195
-msgid "Don't import"
-msgstr "No importar"
+#~ msgid "Sydney"
+#~ msgstr "Sydney"
 
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "No me preguntes más veces"
+#~ msgid "Syktyvkar"
+#~ msgstr "Syktyvkar"
 
-#: shell/importer/intelligent.c:207
-msgid "Evolution can import data from the following files:"
-msgstr "Evolution puede importar datos de los siguiente s archivos:"
+#~ msgid "Sympheropol"
+#~ msgstr "Sympheropol"
 
-#: shell/main.c:112 shell/main.c:574
-msgid "Evolution"
-msgstr "Evolution"
+#~ msgid "Syracuse"
+#~ msgstr "Syracusa"
 
-#: shell/main.c:118
-msgid "Evolution is now exiting ..."
-msgstr "Evolution está terminando ..."
+#~ msgid "Szczecin"
+#~ msgstr "Szczecin"
 
-#. Preview/Alpha/Beta version warning message
-#: shell/main.c:274
-#, 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 is getting close,\n"
-"but some features are either unfinished or do not work properly.\n"
-"\n"
-"If you want a stable version of Evolution, we urge you to uninstall\n"
-"this version, and install version %s instead.\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 en descargar esta versión \n"
-"liberación preliminar de la suite para trabajo en grupo de Ximian, "
-"Evolution.\n"
-"\n"
-"Esta versión de Ximian Evolution todavía no está terminada. Está cerca de "
-"terminarse\n"
-"pero algunas características están incompletas o no funcionan bien.\n"
-"\n"
-"Si quiere una versión estable de Evolution, es mejor que desinstale esta "
-"versión e instale la versión %s en su lugar.\n"
-"\n"
-"Si encuentra fallos, por favor informenos de ellos en bugzilla.ximian.com.\n"
-"Este producto viene sin garantía alguna y no está dirigido a personas "
-"proclives a\n"
-"abscesos violentos de ira.\n"
-"\n"
-"esperamos que disfrute de nuestro duro trabajo, y esperamos su "
-"contribución.\n"
+#~ msgid "Szombathely"
+#~ msgstr "Szombathely"
 
-#: shell/main.c:298
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Gracias\n"
-"El equipo de Ximian Evolution\n"
+#~ msgid "Tabatinga"
+#~ msgstr "Tabatinga"
 
-#: shell/main.c:306
-msgid "Don't tell me again"
-msgstr "No preguntarme más veces"
+#~ msgid "Tabriz"
+#~ msgstr "Tabriz"
 
-#: shell/main.c:401
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "No se pudo acceder a la shell de Ximian Evolution."
+#~ msgid "Tabuk"
+#~ msgstr "Tabuk"
 
-#: shell/main.c:410
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
+#~ msgid "Tachikawa Ab"
+#~ msgstr "Tachikawa Ab"
 
-#: shell/main.c:542
-msgid "Disable splash screen"
-msgstr "Deshabilita la pantalla de entrada"
+#~ msgid "Tacna"
+#~ msgstr "Tacna"
 
-#: shell/main.c:544
-msgid "Start in offline mode"
-msgstr "Iniciar en modo desconectado"
+#~ msgid "Tacoma"
+#~ msgstr "Tacoma"
 
-#: shell/main.c:546
-msgid "Start in online mode"
-msgstr "Iniciar en modo conectado"
+#~ msgid "Tacoma-Lakewood"
+#~ msgstr "Tacoma-Lakewood"
 
-#: shell/main.c:549
-msgid "Forcibly shut down all evolution components"
-msgstr "Forzar el cierre de todos los componentes de evolution"
+#~ msgid "Tacuarembo"
+#~ msgstr "Tacuarembo"
 
-#: shell/main.c:552
-msgid "Send the debugging output of all components to a file."
-msgstr "Envía la salida de depurado de todos los componente a un archivo."
+#~ msgid "Taegu"
+#~ msgstr "Taegu"
 
-#: shell/main.c:578
-#, 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"
+#~ msgid "Taegu Ab"
+#~ msgstr "Taegu Ab"
 
-#: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Error cargando la libreta predeterminada."
+#~ msgid "Taejon"
+#~ msgstr "Taejon"
 
-#: tools/evolution-addressbook-abuse.c:112
-#: tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Archivo de entrada"
+#~ msgid "Tahoe Valley"
+#~ msgstr "Tahoe Valley"
 
-#: tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "No ha especificado un nombre de archivo."
+#~ msgid "Taichung"
+#~ msgstr "Taichung"
 
-#: tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr "Un adjunto para añadir"
+#~ msgid "Taif"
+#~ msgstr "Taif"
 
-#: tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr "Tipo de contenido del adjunto."
+#~ msgid "Tainan"
+#~ msgstr "Tainan"
 
-#: tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr "El nombre del fichero a mostrar en el correo."
+#~ msgid "Taiyuan"
+#~ msgstr "Taiyuan"
 
-#: tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr "Descripción del adjunto"
+#~ msgid "Taiz"
+#~ msgstr "Taiz"
 
-#: tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr "Marcar adjunto para que sea mostrado en línea por omisión."
+#~ msgid "Tajima"
+#~ msgstr "Tajima"
 
-#: tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr "Asunto predeterminado para el mensaje."
+#~ msgid "Takamatsu Airport"
+#~ msgstr "Aeropuerto de Takamatsu"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: tools/killev.c:63
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "No se pudo ejecutar: «%s»: %s\n"
+#~ msgid "Talara"
+#~ msgstr "Talara"
 
-#: tools/killev.c:78
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Cerrando %s (%s)\n"
+#~ msgid "Talkeetna"
+#~ msgstr "Talkeetna"
 
-#: ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "Copia contact(os) a otra carpeta..."
+#~ msgid "Tallahassee"
+#~ msgstr "Tallahassee"
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Copia la selección"
+#~ msgid "Tallinn"
+#~ msgstr "Tallinn"
 
-#: ui/evolution-addressbook.xml.h:5
-msgid "Copy to Folder..."
-msgstr "Copia a la carpeta..."
+#~ msgid "Tamanrasset"
+#~ msgstr "Tamanrasset"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Corta la selección"
+#~ msgid "Tamanrasset/Aguenna"
+#~ msgstr "Tamanrasset/Aguenna"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete selected contacts"
-msgstr "Borra los contactos seleccionados"
+#~ msgid "Tampa"
+#~ msgstr "Tampa"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
-msgstr "Mover contact(os) a otra carpeta..."
+#~ msgid "Tampa-Macdill AFB"
+#~ msgstr "Tampa-Macdill AFB"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Move to Folder..."
-msgstr "Mover a la carpeta..."
+#~ msgid "Tampere"
+#~ msgstr "Tampere"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Pega el contenido del porta papeles"
+#~ msgid "Tampico"
+#~ msgstr "Tampico"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Previews the contacts to be printed"
-msgstr "Previsualiza los contactos a imprimir"
+#~ msgid "Tanana"
+#~ msgstr "Tanana"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:13
-msgid "Print Pre_view"
-msgstr "Pre_visualizar la impresión"
+#~ msgid "Tanegashima Airport"
+#~ msgstr "Aeropuerto de Tanegashima"
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "Print selected contacts"
-msgstr "Imprime los contactos seleccionados"
+#~ msgid "Taos"
+#~ msgstr "Taos"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "Save selected contacts as a VCard."
-msgstr "Guarda los contactos seleccionados en una VCard."
+#~ msgid "Taoyuan"
+#~ msgstr "Taoyuan"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "Select All"
-msgstr "Seleccionar todo"
+#~ msgid "Tapachula"
+#~ msgstr "Tapachula"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Select all contacts"
-msgstr "Seleccionar todos los contactos"
+#~ msgid "Taranto"
+#~ msgstr "Taranto"
 
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr "Envía un mensaje a los contactos seleccionados"
+#~ msgid "Tarbes"
+#~ msgstr "Tarbes"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "Send message to contact"
-msgstr "Envía un mensaje al contacto"
+#~ msgid "Tarija"
+#~ msgstr "Tarija"
 
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send selected contacts to another person."
-msgstr "Envía los contactos seleccionados a otra persona."
+#~ msgid "Tarvisio"
+#~ msgstr "Tarvisio"
 
-#: ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Parar"
+#~ msgid "Tatalina"
+#~ msgstr "Tatalina"
 
-#: ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Parar la carga"
+#~ msgid "Tateyama Ab"
+#~ msgstr "Tateyama Ab"
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "View the current contact"
-msgstr "Ver el contacto actual"
+#~ msgid "Taunton"
+#~ msgstr "Taunton"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: 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-tasks.xml.h:15 ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "A_cciones"
+#~ msgid "Tebessa"
+#~ msgstr "Tebessa"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-msgid "_Forward Contact..."
-msgstr "_Reenviar contactos..."
+#~ msgid "Tees-Side"
+#~ msgstr "Tees-Side"
 
-#: ui/evolution-addressbook.xml.h:35
-msgid "_Move to Folder..."
-msgstr "_Mover a la carpeta..."
+#~ msgid "Tegucigalpa"
+#~ msgstr "Tegucigalpa"
 
-#: ui/evolution-addressbook.xml.h:39
-msgid "_Save as VCard"
-msgstr "G_uardar como vCard"
+#~ msgid "Tehran-Mehrabad"
+#~ msgstr "Tehran-Mehrabad"
 
-#: ui/evolution-addressbook.xml.h:40
-msgid "_Search for Contacts"
-msgstr "Bu_scar contactos"
+#~ msgid "Tela"
+#~ msgstr "Tela"
 
-#: ui/evolution-addressbook.xml.h:41
-msgid "_Select All"
-msgstr "_Seleccionar todo"
+#~ msgid "Temple"
+#~ msgstr "Temple"
 
-#: ui/evolution-addressbook.xml.h:42
-msgid "_Send Message to Contact..."
-msgstr "Enviar _mensaje al contacto..."
+#~ msgid "Tennessee"
+#~ msgstr "Tennessee"
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Día"
+#~ msgid "Tepic"
+#~ msgstr "Tepic"
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Delete All Occurrences"
-msgstr "Borrar todas las ocurrencias"
+#~ msgid "Teresina"
+#~ msgstr "Teresina"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Delete the appointment"
-msgstr "Borrar la cita"
+#~ msgid "Terre Haute"
+#~ msgstr "Terre Haute"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Delete this Occurrence"
-msgstr "Borrar esta ocurrencia"
+#~ msgid "Terrell"
+#~ msgstr "Terrell"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Delete this occurrence"
-msgstr "Borrar esta ocurrencia"
+#~ msgid "Teterboro"
+#~ msgstr "Teterboro"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go To"
-msgstr "Ir a"
+#~ msgid "Texarkana"
+#~ msgstr "Texarkana"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back"
-msgstr "Volver"
+#~ msgid "Texas"
+#~ msgstr "Texas"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward"
-msgstr "Avanzar"
+#~ msgid "The Dalles"
+#~ msgstr "The Dalles"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Ir a una _fecha"
+#~ msgid "Thessaloniki"
+#~ msgstr "Tesalónica"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Ir a una fecha específica"
+#~ msgid "Thief River Falls"
+#~ msgstr "Thief River Falls"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Ir a hoy"
+#~ msgid "Thiruvananthapuram"
+#~ msgstr "Thiruvananthapuram"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Month"
-msgstr "Mes"
+#~ msgid "Thisted"
+#~ msgstr "Thisted"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Previsualiza el calendario a imprimir"
+#~ msgid "Thompson Falls"
+#~ msgstr "Thompson Falls"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print this calendar"
-msgstr "Imprime este calendario"
+#~ msgid "Thumrait"
+#~ msgstr "Thumrait"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Publica información de disponibilidad para este calendario"
+#~ msgid "Tianjin"
+#~ msgstr "Tianjin"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show one day"
-msgstr "Mostrar un día"
+#~ msgid "Tijuana"
+#~ msgstr "Tijuana"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show one month"
-msgstr "Mostrar un mes"
+#~ msgid "Timisoara"
+#~ msgstr "Timisoara"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show one week"
-msgstr "Mostrar una semana"
+#~ msgid "Tin City"
+#~ msgstr "Tin City"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show the working week"
-msgstr "Mostrar la semana laboral"
+#~ msgid "Tirana"
+#~ msgstr "Tirana"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Semana"
+#~ msgid "Tiree"
+#~ msgstr "Tiree"
 
-#: 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
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Cerrar"
+#~ msgid "Tirgu Mures"
+#~ msgstr "Tirgu Mures"
 
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Cerrar este elemento"
+#~ msgid "Tiruchchirapalli"
+#~ msgstr "Tiruchchirapalli"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Borrar este elemento"
+#~ msgid "Titusville"
+#~ msgstr "Titusville"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Barra de herramientas principal"
+#~ msgid "Tivat"
+#~ msgstr "Tivat"
 
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Previsualizar el elemento que va a ser impreso"
+#~ msgid "Tlemcen Zenata"
+#~ msgstr "Tlemcen Zenata"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
-msgid "Print this item"
-msgstr "Imprime este elemento"
+#~ msgid "Tobias Bolanos"
+#~ msgstr "Tobias Bolanos"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Guardar"
+#~ msgid "Tocumen"
+#~ msgstr "Tocumen"
 
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Guardar como..."
+#~ msgid "Togiak Village"
+#~ msgstr "Togiak Village"
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save and Close"
-msgstr "Guardar y cerrar"
+#~ msgid "Tokachi GSDF"
+#~ msgstr "Tokachi GSDF"
 
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save the item and close the dialog box"
-msgstr "Guarda el elemento y cierra la ventana de diálogo"
+#~ msgid "Tokunoshima Island"
+#~ msgstr "Tokunoshima, isla de"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save this item to disk"
-msgstr "Guarda este elemento a disco"
+#~ msgid "Tokushima Ab"
+#~ msgstr "Tokushima Ab"
 
-#: 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
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
-msgid "_File"
-msgstr "_Archivo"
+#~ msgid "Tokyo Heliport"
+#~ msgstr "Tokyo Heliport"
 
-#: ui/evolution-composer-entries.xml.h:1
-msgid "Copy selected text to the clipboard"
-msgstr "Copia el texto seleccionado al portapapeles"
+#~ msgid "Tokyo International Airport"
+#~ msgstr "Tokyo International Airport"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
-msgid "Cu_t"
-msgstr "Cor_tar"
+#~ msgid "Tokyo New International Airport"
+#~ msgstr "Tokyo New International Airport"
 
-#: ui/evolution-composer-entries.xml.h:3
-msgid "Cut selected text to the clipboard"
-msgstr "Corta el texto seleccionado al portapapeles"
+#~ msgid "Toledo"
+#~ msgstr "Toledo"
 
-#: ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
-msgstr "Pega texto desde el portapapeles"
+#~ msgid "Toluca"
+#~ msgstr "Toluca"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#~ msgid "Tonopah"
+#~ msgstr "Tonopah"
 
-#: ui/evolution-composer-entries.xml.h:6
-msgid "Select all text"
-msgstr "Selecciona todo el texto"
+#~ msgid "Topeka"
+#~ msgstr "Topeka"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Imprimir so_bre..."
+#~ msgid "Topeka-Forbes Field"
+#~ msgstr "Topeka-Forbes Field"
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Guardar _como..."
+#~ msgid "Torino/Bric Della Croce"
+#~ msgstr "Torino/Bric Della Croce"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Save the contact and close the dialog box"
-msgstr "Guarda el contacto y cierra la ventana de diálogo"
+#~ msgid "Torino/Caselle"
+#~ msgstr "Torino/Caselle"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Envía un _mensaje al contacto..."
+#~ msgid "Toronto"
+#~ msgstr "Toronto"
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Guardar"
+#~ msgid "Torp"
+#~ msgstr "Torp"
 
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr "Borra esta lista"
+#~ msgid "Torrance"
+#~ msgstr "Torrance"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Borrar..."
+#~ msgid "Torreon"
+#~ msgstr "Torreon"
 
-#: ui/evolution-contact-list-editor.xml.h:7
-msgid "Save the list and close the dialog box"
-msgstr "Guarda la lista y cierra la ventana de diálogo"
+#~ msgid "Tottori Airport"
+#~ msgstr "Tottori, aeropuerto de"
 
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Se_nd list to other..."
-msgstr "E_nviar la lista a otros..."
+#~ msgid "Toulouse"
+#~ msgstr "Toulouse"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Send _message to list..."
-msgstr "Enviar un _mensaje a la lista..."
+#~ msgid "Toul-Rosieres"
+#~ msgstr "Toul-Rosieres"
 
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Cancelar reun_ión"
+#~ msgid "Tours-St-Symphorien"
+#~ msgstr "Tours-St-Symphorien"
 
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "Cancela la reunión para este elemento"
+#~ msgid "Toussus-Le Noble"
+#~ msgstr "Toussus-Le Noble"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "Reenvía como i_Calendar"
+#~ msgid "Townsville"
+#~ msgstr "Townsville"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Reenvía este elemento por correo"
+#~ msgid "Toyama Airport"
+#~ msgstr "Toyama Airport"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "Obtiene la última información de la reunión"
+#~ msgid "Trabzon"
+#~ msgstr "Trabzon"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "Actuali_zar reunión"
+#~ msgid "Trapani"
+#~ msgstr "Trapani"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "Concertar una _reunión"
+#~ msgid "Traverse City"
+#~ msgstr "Traverse City"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "Concierta una reunión para este elemento"
+#~ msgid "Trelew"
+#~ msgstr "Trelew"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Personaliza Mi Evolution"
+#~ msgid "Trenton"
+#~ msgstr "Trenton"
 
-#: ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Cancela la operación de correo actual"
+#~ msgid "Trevico"
+#~ msgstr "Trevico"
 
-#: ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "Redactar un _mensaje nuevo"
+#~ msgid "Treviso/Istrana"
+#~ msgstr "Treviso/Istrana"
 
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit rules for filtering new mail"
-msgstr "Crea o edita reglas para el filtrado de mensajes nuevos"
+#~ msgid "Treviso/S.Angelo"
+#~ msgstr "Treviso/S.Angelo"
 
-#: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit virtual folder definitions"
-msgstr "Crea o edita definiciones de carpetas virtuales"
+#~ msgid "Trieste"
+#~ msgstr "Trieste"
 
-#: ui/evolution-mail-global.xml.h:6
-msgid "Empty _Trash"
-msgstr "_Vaciar papelera"
+#~ msgid "Trinidad"
+#~ msgstr "Trinidad"
 
-#: ui/evolution-mail-global.xml.h:7
-msgid "Forget _Passwords"
-msgstr "Olvidar _contraseñas"
+#~ msgid "Tripoli"
+#~ msgstr "Tripoli"
 
-#: ui/evolution-mail-global.xml.h:8
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
+#~ msgid "Tromso/Langnes"
+#~ msgstr "Tromso/Langnes"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Open a window for composing a mail message"
-msgstr "Abre una ventana para escribir un mensaje de correo"
+#~ msgid "Trondheim/Vaernes"
+#~ msgstr "Trondheim/Vaernes"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+#~ msgid "Troutdale"
+#~ msgstr "Troutdale"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
-msgstr "Publicar un mensaje nuevo"
+#~ msgid "Troyes/Barberey"
+#~ msgstr "Troyes/Barberey"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Post a message to a Public folder"
-msgstr "Publica un mensaje en una carpeta pública"
+#~ msgid "Truckee"
+#~ msgstr "Truckee"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "S_ubscribe to Folders..."
-msgstr "S_uscribirse a carpetas..."
+#~ msgid "Truth or Consequences"
+#~ msgstr "Verdad o Consecuencias"
 
-#: ui/evolution-mail-global.xml.h:14
-msgid "Show message preview window"
-msgstr "Muestra una ventana de previsualización de mensajes"
+#~ msgid "Tsuiki Ab"
+#~ msgstr "Tsuiki Ab"
 
-#: ui/evolution-mail-global.xml.h:15
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
+#~ msgid "Tsushima Airport"
+#~ msgstr "Tsushima Airport"
 
-#: ui/evolution-mail-global.xml.h:16
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor de carpetas virtuales..."
+#~ msgid "Tucson"
+#~ msgstr "Tucson"
 
-#: ui/evolution-mail-global.xml.h:18
-msgid "_Filters..."
-msgstr "_Filtros..."
+#~ msgid "Tucson-Davis AFB"
+#~ msgstr "Tucson-Davis AFB"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Preview Pane"
-msgstr "Panel de _previsualización"
+#~ msgid "Tucuman"
+#~ msgstr "Tucuman"
 
-#: ui/evolution-mail-list.xml.h:1
-msgid "Change the properties of this folder"
-msgstr "Cambia las propiedades de esta carpeta"
+#~ msgid "Tucumcari"
+#~ msgstr "Tucumcari"
 
-#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Copia mensajes seleccionados al portapapeles"
+#~ msgid "Tucurui"
+#~ msgstr "Tucurui"
 
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
+#~ msgid "Tulancingo"
+#~ msgstr "Tulancingo"
 
-#: ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "Ocultar los mensajes _seleccionados"
+#~ msgid "Tulcea"
+#~ msgstr "Tulcea"
 
-#: ui/evolution-mail-list.xml.h:6
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensajes _borrados"
+#~ msgid "Tulsa"
+#~ msgstr "Tulsa"
 
-#: ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr "Oculta_r mensajes leídos"
+#~ msgid "Tupelo"
+#~ msgstr "Tupelo"
 
-#: 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 "Turaif"
+#~ msgstr "Turaif"
 
-#: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Marcar todos como _leídos"
+#~ msgid "Turku"
+#~ msgstr "Turku"
 
-#: ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Marca los mensajes visibles como leídos"
+#~ msgid "Tuscaloosa"
+#~ msgstr "Tuscaloosa"
 
-#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message(s) from the clipboard"
-msgstr "Pega un(os) mensaje(s) desde el portapapeles"
+#~ msgid "Tuxtla Gutierrez"
+#~ msgstr "Tuxtla Gutierrez"
 
-#: ui/evolution-mail-list.xml.h:12
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
+#~ msgid "Twenthe"
+#~ msgstr "Twenthe"
 
-#: ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "Seleccionar _hilo"
+#~ msgid "Twentynine Palms"
+#~ msgstr "Twentynine Palms"
 
-#: 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"
+#~ msgid "Twin Falls"
+#~ msgstr "Twin Falls"
 
-#: 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"
+#~ msgid "Tyler"
+#~ msgstr "Tyler"
 
-#: ui/evolution-mail-list.xml.h:17
-msgid "Select all visible messages"
-msgstr "Selecciona todos los mensajes visibles"
+#~ msgid "Tyndall AFB"
+#~ msgstr "Tyndall AFB"
 
-#: ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "M_ostrar mensajes ocultos"
+#~ msgid "Tyumen"
+#~ msgstr "Tyumen"
 
-#: ui/evolution-mail-list.xml.h:19
-msgid "Show messages that have been temporarily hidden"
-msgstr "Muestra los mensajes que han estado ocultos temporalmente"
+#~ msgid "Uberaba"
+#~ msgstr "Uberaba"
 
-#: 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"
+#~ msgid "Ufa"
+#~ msgstr "Ufa"
 
-#: ui/evolution-mail-list.xml.h:21
-msgid "Temporarily hide the selected messages"
-msgstr "Oculta temporalmente los mensajes seleccionados"
+#~ msgid "Ukiah"
+#~ msgstr "Ukiah"
 
-#: ui/evolution-mail-list.xml.h:22
-msgid "Threaded Message list"
-msgstr "Lista de mensajes encadenados"
+#~ msgid "Ulan-Ude"
+#~ msgstr "Ulan-Ude"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
-msgid "_Expunge"
-msgstr "P_urgar"
+#~ msgid "Ulsan"
+#~ msgstr "Ulsan"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
-msgid "_Folder"
-msgstr "Carpe_ta"
+#~ msgid "Ulyanovsk"
+#~ msgstr "Ulyanovsk"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertir selección"
+#~ msgid "Umea"
+#~ msgstr "Umea"
 
-#: ui/evolution-mail-list.xml.h:30
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#~ msgid "Umiat"
+#~ msgstr "Umiat"
 
-#: ui/evolution-mail-list.xml.h:31
-msgid "_Threaded Message List"
-msgstr "_Lista de mensajes encadenados"
+#~ msgid "Unalakleet"
+#~ msgstr "Unalakleet"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr "Aña_dir remitente a la agenda"
+#~ msgid "United Arab Emirates "
+#~ msgstr "Emiratos Árabes Unidos"
 
-#: ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "A_plicar filtros"
+#~ msgid "Unst"
+#~ msgstr "Unst"
 
-#: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr "Añadir remitente a la agenda"
+#~ msgid "Upington"
+#~ msgstr "Upington"
 
-#: ui/evolution-mail-message.xml.h:4
-msgid "Apply filter rules to the selected messages"
-msgstr "Aplica filtros a los mensajes seleccionados"
+#~ msgid "Uruapan"
+#~ msgstr "Uruapan"
 
-#: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Responde a todos los destinatarios del mensaje seleccionado"
+#~ msgid "Uruguaiana"
+#~ msgstr "Uruguaiana"
 
-#: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
+#~ msgid "Urumqi"
+#~ msgstr "Urumqi"
 
-#: ui/evolution-mail-message.xml.h:7
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Responde al remitente del mensaje seleccionado"
+#~ msgid "Utah"
+#~ msgstr "Utah"
 
-#: ui/evolution-mail-message.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Copia mensajes seleccionados a otra carpeta"
+#~ msgid "Utica"
+#~ msgstr "Utica"
 
-#: ui/evolution-mail-message.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr "Crear una carpeta _virtual según el mensaje"
+#~ msgid "Utrecht/Soesterberg"
+#~ msgstr "Utrecht/Soesterberg"
 
-#: ui/evolution-mail-message.xml.h:11
-msgid "Create a rule to filter messages from this sender"
-msgstr "Crea una regla para filtrar los mensajes de este remitente"
+#~ msgid "Utsunomiya Ab"
+#~ msgstr "Utsunomiya Ab"
 
-#: ui/evolution-mail-message.xml.h:12
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
+#~ msgid "Uzhgorod"
+#~ msgstr "Uzhgorod"
 
-#: ui/evolution-mail-message.xml.h:13
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
+#~ msgid "Vadso"
+#~ msgstr "Vadso"
 
-#: ui/evolution-mail-message.xml.h:14
-msgid "Create a rule to filter messages with this subject"
-msgstr "Crea una regla para filtrar los mensajes con este asunto"
+#~ msgid "Vaerlose"
+#~ msgstr "Vaerlose"
 
-#: ui/evolution-mail-message.xml.h:15
-msgid "Create a virtual folder for these recipients"
-msgstr "Crea una carpeta virtual para estos destinatarios"
+#~ msgid "Vagar"
+#~ msgstr "Vagar"
 
-#: ui/evolution-mail-message.xml.h:16
-msgid "Create a virtual folder for this mailing list"
-msgstr "Crea una carpeta virtual para esta lista de correo"
+#~ msgid "Valdez 2"
+#~ msgstr "Valdez 2"
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Create a virtual folder for this sender"
-msgstr "Crea una carpeta virtual para este remitente"
+#~ msgid "Valdosta"
+#~ msgstr "Valdosta"
 
-#: ui/evolution-mail-message.xml.h:18
-msgid "Create a virtual folder for this subject"
-msgstr "Crea una carpeta virtual para este asunto"
+#~ msgid "Valdosta-Moody AFB"
+#~ msgstr "Valdosta-Moody AFB"
 
-#: ui/evolution-mail-message.xml.h:19
-msgid "Decrease the text size"
-msgstr "Reduce el tamaño del texto"
+#~ msgid "Valencia"
+#~ msgstr "Valencia"
 
-#: ui/evolution-mail-message.xml.h:21
-msgid "Display the next important message"
-msgstr "Muestra el siguiente mensaje importante"
+#~ msgid "Valentine"
+#~ msgstr "Valentine"
 
-#: ui/evolution-mail-message.xml.h:22
-msgid "Display the next message"
-msgstr "Muestra el mensaje siguiente"
+#~ msgid "Valera*"
+#~ msgstr "Valera*"
 
-#: ui/evolution-mail-message.xml.h:23
-msgid "Display the next unread message"
-msgstr "Muestra el siguiente mensaje no leído"
+#~ msgid "Valkenburg"
+#~ msgstr "Valkenburg"
 
-#: ui/evolution-mail-message.xml.h:24
-msgid "Display the next unread thread"
-msgstr "Muestra el siguiente hilo no leído"
+#~ msgid "Valley"
+#~ msgstr "Valley"
 
-#: ui/evolution-mail-message.xml.h:25
-msgid "Display the previous important message"
-msgstr "Muestra el anterior mensaje importante"
+#~ msgid "Valparaiso"
+#~ msgstr "Valparaiso"
 
-#: ui/evolution-mail-message.xml.h:26
-msgid "Display the previous message"
-msgstr "Muestra el mensaje anterior"
+#~ msgid "Valparaiso-Eglin AFB"
+#~ msgstr "Valparaiso-Eglin AFB"
 
-#: ui/evolution-mail-message.xml.h:27
-msgid "Display the previous unread message"
-msgstr "Muestra el anterior mensaje no leído"
+#~ msgid "Van"
+#~ msgstr "Van"
 
-#: ui/evolution-mail-message.xml.h:28
-msgid "F_orward"
-msgstr "Reen_viar"
+#~ msgid "Vancouver"
+#~ msgstr "Vancouver"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Filter on Mailing _List..."
-msgstr "Filtrar según la _lista de correo..."
+#~ msgid "Vandel"
+#~ msgstr "Vandel"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Filter on Se_nder..."
-msgstr "Filtrar según el remite_nte..."
+#~ msgid "Vandenberg AFB"
+#~ msgstr "Vandenberg AFB"
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Filter on _Recipients..."
-msgstr "Filtrar según los destinata_rios..."
+#~ msgid "Vandenberg Range"
+#~ msgstr "Vandenberg Range"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "Filter on _Subject..."
-msgstr "Filtrar según el a_sunto..."
+#~ msgid "Van Nuys"
+#~ msgstr "Van Nuys"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Flag selected message(s) for follow-up"
-msgstr "Marcar los mensajes seleccionados para seguimiento"
+#~ msgid "Varadero"
+#~ msgstr "Varadero"
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Follow _Up..."
-msgstr "_Seguimiento..."
+#~ msgid "Varanasi/Babatpur"
+#~ msgstr "Varanasi/Babatpur"
 
-#: ui/evolution-mail-message.xml.h:35
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar la carga de imágenes en el correo HTML"
+#~ msgid "Varna"
+#~ msgstr "Varna"
 
-#: ui/evolution-mail-message.xml.h:37
-msgid "Forward the selected message in the body of a new message"
-msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
+#~ msgid "Vasteras"
+#~ msgstr "Vasteras"
 
-#: ui/evolution-mail-message.xml.h:38
-msgid "Forward the selected message quoted like a reply"
-msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
+#~ msgid "Vaxjo"
+#~ msgstr "Vaxjo"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Forward the selected message to someone"
-msgstr "Reenvía a alguien el mensaje seleccionado"
+#~ msgid "Venezia"
+#~ msgstr "Venezia"
 
-#: ui/evolution-mail-message.xml.h:40
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
+#~ msgid "Venice"
+#~ msgstr "Venecia"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Increase the text size"
-msgstr "Incrementar el tamaño del texto"
+#~ msgid "Veracruz"
+#~ msgstr "Veracruz"
 
-#: ui/evolution-mail-message.xml.h:42
-msgid "Load _Images"
-msgstr "Cargar _imágenes"
+#~ msgid "Vermillion"
+#~ msgstr "Vermillion"
 
-#: ui/evolution-mail-message.xml.h:44
-msgid "Mark as I_mportant"
-msgstr "Marcar como i_mportante"
+#~ msgid "Vermont"
+#~ msgstr "Vermont"
 
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
-msgstr "Marcar como _no leído"
+#~ msgid "Vernal"
+#~ msgstr "Vernal"
 
-#: ui/evolution-mail-message.xml.h:46
-msgid "Mark as Unimp_ortant"
-msgstr "Marcar como no imp_ortante"
+#~ msgid "Vero Beach"
+#~ msgstr "Vero Beach"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected message(s) as having been read"
-msgstr "Marca el(los) mensaje(s) seleccionado(s) como leídos"
+#~ msgid "Vicenza"
+#~ msgstr "Vicenza"
 
-#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected message(s) as important"
-msgstr "Marca el(los)r mensaje(s) seleccionado(s) como importantes"
+#~ msgid "Vichy-Charmeil"
+#~ msgstr "Vichy-Charmeil"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leídos"
+#~ msgid "Vichy-Rolla"
+#~ msgstr "Vichy-Rolla"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Marcar mensaje(s) seleccionado(s) como no importantes"
+#~ msgid "Vicksburg"
+#~ msgstr "Vicksburg"
 
-#: ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages for deletion"
-msgstr "Marcar los mensajes seleccionados para borrar"
+#~ msgid "Victoria"
+#~ msgstr "Victoria"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Move"
-msgstr "Mover"
+#~ msgid "Vigo"
+#~ msgstr "Vigo"
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Move selected message(s) to another folder"
-msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
+#~ msgid "Vilhena"
+#~ msgstr "Vilhena"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next"
-msgstr "Siguiente"
+#~ msgid "Villacoublay"
+#~ msgstr "Villacoublay"
 
-#: ui/evolution-mail-message.xml.h:55
-msgid "Next _Important Message"
-msgstr "Siguiente mensaje _importante"
+#~ msgid "Villafranca"
+#~ msgstr "Villafranca"
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Next _Thread"
-msgstr "Siguiente _hilo"
+#~ msgid "Villahermosa"
+#~ msgstr "Villahermosa"
 
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next _Unread Message"
-msgstr "Siguiente m_ensaje no leído"
+#~ msgid "Villamontes"
+#~ msgstr "Villamontes"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Open the selected message in a new window"
-msgstr "Abre el mensaje seleccionado en una nueva ventana"
+#~ msgid "Villa Reynolds"
+#~ msgstr "Villa Reynolds"
 
-#: ui/evolution-mail-message.xml.h:59
-msgid "Open the selected message in the composer to re-send it"
-msgstr "Abre el mensaje seleccionado para reenviarlo"
+#~ msgid "Vilnius"
+#~ msgstr "Vilnius"
 
-#: ui/evolution-mail-message.xml.h:60
-msgid "Original Si_ze"
-msgstr "Tamaño _original"
+#~ msgid "Virginia"
+#~ msgstr "Virginia"
 
-#: ui/evolution-mail-message.xml.h:61
-msgid "P_revious Unread Message"
-msgstr "Me_nsaje anterior no leído"
+#~ msgid "Virginia Beach"
+#~ msgstr "Virginia Beach"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
-msgstr "Publicar una respuesta"
+#~ msgid "Virginia Tech Airport"
+#~ msgstr "Virginia Tech Airport"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message in a Public folder"
-msgstr "Publica una respuesta a un mensaje en una carpeta pública"
+#~ msgid "Viru-Viru"
+#~ msgstr "Viru-Viru"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Pr_evious Important Message"
-msgstr "Mensaje importante an_terior"
+#~ msgid "Visalia"
+#~ msgstr "Visalia"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Preview the message to be printed"
-msgstr "Previsualiza el mensaje que va a ser impreso"
+#~ msgid "Visby"
+#~ msgstr "Visby"
 
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous"
-msgstr "Anterior"
+#~ msgid "Viterbo"
+#~ msgstr "Viterbo"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Print this message"
-msgstr "Imprimir este mensaje"
+#~ msgid "Vitoria"
+#~ msgstr "Vitoria"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Re_direct"
-msgstr "Re_dirigir"
+#~ msgid "Vladikavkaz"
+#~ msgstr "Vladikavkaz"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Reenviar (rebotar) el mensaje seleccionado a alguien"
+#~ msgid "Vladivostok"
+#~ msgstr "Vladivostok"
 
-#: ui/evolution-mail-message.xml.h:76
-msgid "Reset the text to its original size"
-msgstr "Dejar el texto en su tamaño original"
+#~ msgid "Vlieland"
+#~ msgstr "Vlieland"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
-msgstr "Bu_scar mensaje..."
+#~ msgid "Vojens/Skrydstrup"
+#~ msgstr "Vojens/Skrydstrup"
 
-#: ui/evolution-mail-message.xml.h:78
-msgid "S_maller"
-msgstr "_Menor"
+#~ msgid "Volgograd"
+#~ msgstr "Volgograd"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Save the message as a text file"
-msgstr "Guardar el mensaje en un archivo de texto"
+#~ msgid "Volkel"
+#~ msgstr "Volkel"
 
-#: ui/evolution-mail-message.xml.h:80
-msgid "Search for text in the body of the displayed message"
-msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
+#~ msgid "Volk Field"
+#~ msgstr "Volk Field"
 
-#: ui/evolution-mail-message.xml.h:81
-msgid "Set up the page settings for your current printer"
-msgstr "Establecer la configuración de la página para la impresora actual"
+#~ msgid "Voronezh"
+#~ msgstr "Voronezh"
 
-#: ui/evolution-mail-message.xml.h:82
-msgid "Show Email _Source"
-msgstr "Mostrar el _origen del mensaje"
+#~ msgid "Voslau"
+#~ msgstr "Voslau"
 
-#: ui/evolution-mail-message.xml.h:83
-msgid "Show Full _Headers"
-msgstr "Mostrar _cabeceras completas"
+#~ msgid "Waco"
+#~ msgstr "Waco"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "Show message in the normal style"
-msgstr "Mostrar mensajes en el estilo normal"
+#~ msgid "Wadi Al Dawasser Airport"
+#~ msgstr "Wadi Al Dawasser Airport"
 
-#: ui/evolution-mail-message.xml.h:85
-msgid "Show message with all email headers"
-msgstr "Mostrar mensajes con todas las cabeceras"
+#~ msgid "Wainwright"
+#~ msgstr "Wainwright"
 
-#: ui/evolution-mail-message.xml.h:86
-msgid "Show the raw email source of the message"
-msgstr "Mostrar la fuente del mensaje en bruto"
+#~ msgid "Wakefield"
+#~ msgstr "Wakefield"
 
-#: ui/evolution-mail-message.xml.h:87
-msgid "Text Si_ze"
-msgstr "_Tamaño del texto"
+#~ msgid "Wakkanai Airport"
+#~ msgstr "Wakkanai Airport"
 
-#: ui/evolution-mail-message.xml.h:88
-msgid "Un-delete the selected messages"
-msgstr "Recuperar los mensajes seleccionados"
+#~ msgid "Walla Walla"
+#~ msgstr "Walla Walla"
 
-#: ui/evolution-mail-message.xml.h:89
-msgid "VFolder on Mailing _List..."
-msgstr "Carpeta virtual según la _lista de correo..."
+#~ msgid "Wallops Island"
+#~ msgstr "Wallops, isla de"
 
-#: ui/evolution-mail-message.xml.h:90
-msgid "VFolder on Se_nder..."
-msgstr "Carpeta virtual según el remite_nte..."
+#~ msgid "Walnut Ridge"
+#~ msgstr "Walnut Ridge"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "VFolder on _Recipients..."
-msgstr "Carpeta virtual según los destinata_rios..."
+#~ msgid "Warner Robins"
+#~ msgstr "Warner Robins"
 
-#: ui/evolution-mail-message.xml.h:92
-msgid "VFolder on _Subject..."
-msgstr "Carpeta virtual según el a_sunto..."
+#~ msgid "Warroad"
+#~ msgstr "Warroad"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Attached"
-msgstr "_Adjunto"
+#~ msgid "Warszawa"
+#~ msgstr "Warszawa"
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "_Copy to Folder"
-msgstr "_Copiar a la carpeta"
+#~ msgid "Washington"
+#~ msgstr "Washington"
 
-#: ui/evolution-mail-message.xml.h:96
-msgid "_Create Filter From Message"
-msgstr "Crear un filtro del _mensaje"
+#~ msgid "Washington/Dulles"
+#~ msgstr "Washington/Dulles"
 
-#: ui/evolution-mail-message.xml.h:98
-msgid "_Forward Message"
-msgstr "_Reenviar mensaje"
+#~ msgid "Waterbury"
+#~ msgstr "Waterbury"
 
-#: ui/evolution-mail-message.xml.h:99
-msgid "_Go To"
-msgstr "_Ir a"
+#~ msgid "Waterloo"
+#~ msgstr "Waterloo"
 
-#: ui/evolution-mail-message.xml.h:100
-msgid "_Inline"
-msgstr "_Incluido en línea"
+#~ msgid "Watertown"
+#~ msgstr "Watertown"
 
-#: ui/evolution-mail-message.xml.h:101
-msgid "_Larger"
-msgstr "Ma_yor"
+#~ msgid "Waterville"
+#~ msgstr "Waterville"
 
-#: ui/evolution-mail-message.xml.h:102
-msgid "_Message Display"
-msgstr "_Mostrar mensaje"
+#~ msgid "Waukesha"
+#~ msgstr "Waukesha"
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "_Move to Folder"
-msgstr "_Mover a la carpeta"
+#~ msgid "Wausau"
+#~ msgstr "Wausau"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Next Message"
-msgstr "Mensaje _siguiente"
+#~ msgid "Waycross"
+#~ msgstr "Waycross"
 
-#: ui/evolution-mail-message.xml.h:105
-msgid "_Normal Display"
-msgstr "Vista _normal"
+#~ msgid "Waynesboro"
+#~ msgstr "Waynesboro"
 
-#: ui/evolution-mail-message.xml.h:106
-msgid "_Open Message"
-msgstr "_Abrir mensaje"
+#~ msgid "Webster City"
+#~ msgstr "Webster City"
 
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Previous Message"
-msgstr "Mensaje a_nterior"
+#~ msgid "Wejh"
+#~ msgstr "Wejh"
 
-#: ui/evolution-mail-message.xml.h:109
-msgid "_Quoted"
-msgstr "_Citado"
+#~ msgid "Wellington"
+#~ msgstr "Wellington"
 
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Resend..."
-msgstr "_Reexpedir..."
+#~ msgid "Wenatchee"
+#~ msgstr "Wenatchee"
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
-msgid "_Tools"
-msgstr "_Herramientas"
+#~ msgid "Wendover"
+#~ msgstr "Wendover"
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Undelete"
-msgstr "_Recuperar"
+#~ msgid "West Atlanta"
+#~ msgstr "West Atlanta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
+#~ msgid "West Burke"
+#~ msgstr "West Burke"
 
-#: 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:43
-msgid "_Close"
-msgstr "_Cerrar"
+#~ msgid "Westerland"
+#~ msgstr "Westerland"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Ver"
+#~ msgid "Westfield"
+#~ msgstr "Westfield"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Adjuntar"
+#~ msgid "Westhampton"
+#~ msgstr "Westhampton"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjuntar un archivo"
+#~ msgid "West Palm Beach"
+#~ msgstr "West Palm Beach"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Cierra el archivo actual"
+#~ msgid "West Virginia"
+#~ msgstr "West Virginia"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Borra todo menos la firma"
+#~ msgid "West Yellowstone"
+#~ msgstr "West Yellowstone"
 
-#: ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Cifrar este mensaje con PGP"
+#~ msgid "West Yellowstone (2)"
+#~ msgstr "West Yellowstone (2)"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Cifra este mensaje con su certificado de cifrado S/MIME"
+#~ msgid "Wheeling"
+#~ msgstr "Wheeling"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
-msgid "For_mat"
-msgstr "For_mato"
+#~ msgid "Whidbey Island"
+#~ msgstr "Whidbey Island"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "HT_ML"
-msgstr "HT_ML"
+#~ msgid "Whitefield"
+#~ msgstr "Whitefield"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
+#~ msgid "White Plains"
+#~ msgstr "White Plains"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Abrir un archivo"
+#~ msgid "White Sulphur"
+#~ msgstr "White Sulphur"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "Cifrar con PGP"
+#~ msgid "Whittier"
+#~ msgstr "Whittier"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "Firmar con PGP"
+#~ msgid "Wichita"
+#~ msgstr "Wichita"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "S/MIME Encrypt"
-msgstr "Cifrar con S/MIME"
+#~ msgid "Wichita Falls"
+#~ msgstr "Wichita Falls"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "S/MIME Sign"
-msgstr "Firmar con S/MIME"
+#~ msgid "Wichita-Jabara"
+#~ msgstr "Wichita-Jabara"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Guardar como"
+#~ msgid "Wichita-McConnell AFB"
+#~ msgstr "Wichita-McConnell AFB"
 
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save _Draft"
-msgstr "Guardar _borrador"
+#~ msgid "Wick"
+#~ msgstr "Wick"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "Guardar en carpeta..."
+#~ msgid "Wien"
+#~ msgstr "Wien"
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Guardar archivo actual"
+#~ msgid "Wildwood"
+#~ msgstr "Wildwood"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Guardar el archivo actual con un nombre diferente"
+#~ msgid "Wilkes - Barre"
+#~ msgstr "Wilkes - Barre"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "Guardara el mensaje a una carpeta específica"
+#~ msgid "Williams Field"
+#~ msgstr "Williams Field"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Enviar"
+#~ msgid "Williamsport"
+#~ msgstr "Williamsport"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "Enviar el mensaje en formato HTML"
+#~ msgid "Williston"
+#~ msgstr "Williston"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send this message"
-msgstr "Enviar este mensaje"
+#~ msgid "Willoughby"
+#~ msgstr "Willoughby"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Mostrar / ocultar adjuntos"
+#~ msgid "Willow Airport"
+#~ msgstr "Willow Airport"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Mostrar _adjuntos"
+#~ msgid "Wilmington"
+#~ msgstr "Wilmington"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Mostrar adjuntos"
+#~ msgid "Winchester"
+#~ msgstr "Winchester"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Sign this message with your PGP key"
-msgstr "Firmar este mensaje con su clave PGP"
+#~ msgid "Windsor"
+#~ msgstr "Windsor"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Firmar este mensaje con su certificado de firma S/MIME"
+#~ msgid "Windsor Locks"
+#~ msgstr "Windsor Locks"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Activa si se muestra el campo CCO"
+#~ msgid "Wink"
+#~ msgstr "Wink"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the CC field is displayed"
-msgstr "Activa si se muestra el campo CC"
+#~ msgid "Winnemucca"
+#~ msgstr "Winnemucca"
 
-#: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Activa si se muestra el selector 'De'"
+#~ msgid "Winnipeg"
+#~ msgstr "Winnipeg"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Activa si se muestra el campo Responder-A"
+#~ msgid "Winslow"
+#~ msgstr "Winslow"
 
-#: ui/evolution-message-composer.xml.h:36
-msgid "_Attachment..."
-msgstr "_Adjunto..."
+#~ msgid "Winston-Salem"
+#~ msgstr "Winston-Salem"
 
-#: ui/evolution-message-composer.xml.h:37
-msgid "_Bcc Field"
-msgstr "Campo Cc_o"
+#~ msgid "Winter Haven"
+#~ msgstr "Winter Haven"
 
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Cc Field"
-msgstr "Campo _Cc"
+#~ msgid "Winter Park"
+#~ msgstr "Winter Park"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Delete all"
-msgstr "_Borrar todo"
+#~ msgid "Wiscasset"
+#~ msgstr "Wiscasset"
 
-#: ui/evolution-message-composer.xml.h:43
-msgid "_From Field"
-msgstr "Campo _De"
+#~ msgid "Wisconsin"
+#~ msgstr "Wisconsin"
 
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
-msgid "_Insert"
-msgstr "_Insertar"
+#~ msgid "Wisconsin Rapids"
+#~ msgstr "Rápidos de Wisconsin"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Abrir..."
+#~ msgid "Wise"
+#~ msgstr "Wise"
 
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Reply-To Field"
-msgstr "Campo _Responder-A"
+#~ msgid "Woensdrecht"
+#~ msgstr "Woensdrecht"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Seguridad"
+#~ msgid "Wolf Point"
+#~ msgstr "Wolf Point"
 
-#: ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
-msgstr "H_TML"
+#~ msgid "Woong Cheon"
+#~ msgstr "Woong Cheon"
 
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save the current file and close the window"
-msgstr "Guardar el archivo y cerrar la ventana de diálogo"
+#~ msgid "Wooster"
+#~ msgstr "Wooster"
 
-#: 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"
+#~ msgid "Worcester"
+#~ msgstr "Worcester"
 
-#: ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "Carpe_ta"
+#~ msgid "Worland"
+#~ msgstr "Worland"
 
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Regenerar la lista"
+#~ msgid "Worthington"
+#~ msgstr "Worthington"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Regenerar la lista de carpetas"
+#~ msgid "Wrangell"
+#~ msgstr "Wrangell"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Quitar carpetas de su lista de carpetas suscritas"
+#~ msgid "Wrightstown / Mcguire AFB"
+#~ msgstr "Wrightstown / Mcguire AFB"
 
-#: ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Suscribir"
+#~ msgid "Wuchia Observatory"
+#~ msgstr "Wuchia Observatory"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Dessuscribir"
+#~ msgid "Wyoming"
+#~ msgstr "Wyoming"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Asignar tarea"
+#~ msgid "Xiamen"
+#~ msgstr "Xiamen"
 
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Asignar esta tarea a otros"
+#~ msgid "Yacuiba"
+#~ msgstr "Yacuiba"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Cancelar tarea"
+#~ msgid "Yakima"
+#~ msgstr "Yakima"
 
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Cancelar esta tarea"
+#~ msgid "Yakushima"
+#~ msgstr "Yakushima"
 
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Obtener la última información de la tarea"
+#~ msgid "Yakutat"
+#~ msgstr "Yakutat"
 
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Ac_tualizar tarea"
+#~ msgid "Yakutsk"
+#~ msgstr "Yakutsk"
 
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Copiar las tareas seleccionadas"
+#~ msgid "Yamagata Airport"
+#~ msgstr "Yamagata Airport"
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Corta las tareas seleccionadas"
+#~ msgid "Yamaguchi Ube Airport"
+#~ msgstr "Yamaguchi Ube Airport"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete completed tasks"
-msgstr "Borrar las tareas completadas"
+#~ msgid "Yankton"
+#~ msgstr "Yankton"
 
-#: ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
-msgstr "Borrar las tareas seleccionadas"
+#~ msgid "Yao Airport"
+#~ msgstr "Yao, aeropuerto"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Mar_k as Complete"
-msgstr "_Marcar como terminado"
+#~ msgid "Yechon Ab"
+#~ msgstr "Yechon Ab"
 
-#: ui/evolution-tasks.xml.h:9
-msgid "Mark selected tasks as complete"
-msgstr "Marcar tareas seleccionadas como terminadas"
+#~ msgid "Yekaterinburg"
+#~ msgstr "Yekaterinburg"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Paste task from the clipboard"
-msgstr "Pegar la tarea del portapapeles"
+#~ msgid "Yellowknife"
+#~ msgstr "Yellowknife"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Previews the list of tasks to be printed"
-msgstr "Vista previa de la lista de tareas a imprimir"
+#~ msgid "Yellowstone"
+#~ msgstr "Yellowstone"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Print the list of tasks"
-msgstr "Imprimir la lista de tareas"
+#~ msgid "Yenbo"
+#~ msgstr "Yenbo"
 
-#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Acerca de Ximian Evolution..."
+#~ msgid "Yeoju Range"
+#~ msgstr "Yeoju Range"
 
-#: ui/evolution.xml.h:2
-msgid "Add to _Shortcut Bar"
-msgstr "Aña_dir a la barra de atajos"
+#~ msgid "Yeonpyeungdo"
+#~ msgstr "Yeonpyeungdo"
 
-#: ui/evolution.xml.h:3
-msgid "Change Evolution's settings"
-msgstr "Cambiar la configuración de Evolution"
+#~ msgid "Yeovilton"
+#~ msgstr "Yeovilton"
 
-#: ui/evolution.xml.h:4
-msgid "Change the name of this folder"
-msgstr "Cambiar el nombre de esta carpeta"
+#~ msgid "Yokosuka Fwf"
+#~ msgstr "Yokosuka Fwf"
 
-#: ui/evolution.xml.h:7
-msgid "Copy this folder"
-msgstr "Copiar esta carpeta"
+#~ msgid "Yokota Ab"
+#~ msgstr "Yokota Ab"
 
-#: ui/evolution.xml.h:8
-msgid "Create a link to this folder in the shortcut bar"
-msgstr "Crear un enlace a esta carpeta en la lista de atajos"
+#~ msgid "Yongsan/H-208 Hp"
+#~ msgstr "Yongsan/H-208 Hp"
 
-#: ui/evolution.xml.h:9
-msgid "Create a new folder"
-msgstr "Crear una nueva carpeta"
+#~ msgid "Yoro"
+#~ msgstr "Yoro"
 
-#: ui/evolution.xml.h:10
-msgid "Create a new shortcut"
-msgstr "Crear un nuevo atajo"
+#~ msgid "Yosu"
+#~ msgstr "Yosu"
 
-#: ui/evolution.xml.h:11
-msgid "Create a new window displaying this folder"
-msgstr "Crear una nueva ventana mostrando esta carpeta"
+#~ msgid "Youngstown"
+#~ msgstr "Youngstown"
 
-#: ui/evolution.xml.h:12
-msgid "Delete this folder"
-msgstr "Borrar esta carpeta"
+#~ msgid "Ypsilanti"
+#~ msgstr "Ypsilanti"
 
-#: ui/evolution.xml.h:13
-msgid "Display a different folder"
-msgstr "Mostrar una carpeta distinta"
+#~ msgid "Yukon"
+#~ msgstr "Yukón"
 
-#: ui/evolution.xml.h:14
-msgid "E_xit"
-msgstr "_Salir"
+#~ msgid "Yuma MCAS"
+#~ msgstr "Yuma MCAS"
 
-#: ui/evolution.xml.h:15
-msgid "Evolution _Window"
-msgstr "_Ventana de Evolution"
+#~ msgid "Yurimaguas"
+#~ msgstr "Yurimaguas"
 
-#: ui/evolution.xml.h:16
-msgid "Exit the program"
-msgstr "Salir del programa"
+#~ msgid "Yuzhno-Sakhalinsk"
+#~ msgstr "Yuzhno-Sakhalinsk"
 
-#: ui/evolution.xml.h:17
-msgid "Import data from other programs"
-msgstr "Importar datos de otros programas"
+#~ msgid "Zacatecas"
+#~ msgstr "Zacatecas"
 
-#: ui/evolution.xml.h:19
-msgid "Move this folder to another place"
-msgstr "Mueve esta carpeta a otro sitio"
+#~ msgid "Zadar"
+#~ msgstr "Zadar"
 
-#: ui/evolution.xml.h:20
-msgid "Open Other _User's Folder..."
-msgstr "Abrir carpeta de otro _usuario..."
+#~ msgid "Zagreb"
+#~ msgstr "Zagreb"
 
-#: ui/evolution.xml.h:21
-msgid "Open a folder belonging to some other user on the server"
-msgstr "Abra una carpeta perteneciente a otro usuario en el servidor"
+#~ msgid "Zakinthos"
+#~ msgstr "Zakinthos"
 
-#: ui/evolution.xml.h:22
-msgid "Open in New Window"
-msgstr "Abrir en una ventana nueva"
+#~ msgid "Zama Airfield"
+#~ msgstr "Zama Airfield"
 
-#: ui/evolution.xml.h:24
-msgid "Open this folder in an other window"
-msgstr "Abre esta carpeta en una nueva ventana"
+#~ msgid "Zanesville"
+#~ msgstr "Zanesville"
 
-#: ui/evolution.xml.h:25
-msgid "Pi_lot Settings..."
-msgstr "Configuración del _Pilot..."
+#~ msgid "Zaragoza"
+#~ msgstr "Zaragoza"
 
-#: ui/evolution.xml.h:26
-msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Eliminar una carpeta añadida con «Abrir carpeta de otro usuario»"
+#~ msgid "Zell Am See"
+#~ msgstr "Zell Am See"
 
-#: ui/evolution.xml.h:27
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
+#~ msgid "Zuni Pueblo"
+#~ msgstr "Zuni Pueblo"
 
-#: ui/evolution.xml.h:28
-msgid "Send queued items and retrieve new items"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
+#~ msgid "Zurich"
+#~ msgstr "Zurich"
 
-#: ui/evolution.xml.h:29
-msgid "Set up Pilot configuration"
-msgstr "Configuración del Pilot"
+#~ msgid "Folder containing the Evolution Summary"
+#~ msgstr "La carpeta contiene el resumen de Evolution"
 
-#: ui/evolution.xml.h:30
-msgid "Show information about Ximian Evolution"
-msgstr "Mostrar información acerca de Ximian Evolution"
+#~ msgid "Appointments"
+#~ msgstr "Citas"
 
-#: ui/evolution.xml.h:31
-msgid "Submit Bug Report"
-msgstr "Remitir un informe de fallo"
+#~ msgid "No appointments."
+#~ msgstr "No tiene citas."
 
-#: ui/evolution.xml.h:32
-msgid "Submit _Bug Report"
-msgstr "Remitir informe de un _fallo"
+#~ msgid "%k:%M %d %B"
+#~ msgstr "%k:%M %d %B"
 
-#: ui/evolution.xml.h:33
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Enviar un informe de fallo usando Bug Buddy"
+#~ msgid "%l:%M%P %d %B"
+#~ msgstr "%l:%M%P %d %B"
 
-#: ui/evolution.xml.h:34
-msgid "Toggle"
-msgstr "Activar"
+#~ msgid "No description"
+#~ msgstr "Sin descripción"
 
-#: ui/evolution.xml.h:35
-msgid "Toggle whether to show the folder bar"
-msgstr "Activar si se muestra la barra de carpetas"
+#~ msgid "Mail summary"
+#~ msgstr "Resumen de correo"
 
-#: ui/evolution.xml.h:36
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Activar si se muestra la barra de atajos"
+#~ msgid "Dictionary.com Word of the Day"
+#~ msgstr "Palabra del día de Dictionary.com"
 
-#: ui/evolution.xml.h:37
-msgid "Toggle whether we are working offline."
-msgstr "Activar si se estamos trabajando desconectados o no."
+#~ msgid "Quotes of the Day"
+#~ msgstr "Frase célebre del día"
 
-#: ui/evolution.xml.h:38
-msgid "View the selected folder"
-msgstr "Ver la carpeta seleccionada"
+#~ msgid "New News Feed"
+#~ msgstr "Nueva fuente de noticias"
 
-#: ui/evolution.xml.h:40
-msgid "Ximian Evolution _FAQ"
-msgstr "_FAQ de Ximian Evolution"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-#: ui/evolution.xml.h:41
-msgid "_About Ximian Evolution..."
-msgstr "_Acerca de Ximian Evolution..."
+#~ msgid "Error downloading RDF"
+#~ msgstr "Error al descargar RDF"
 
-#: ui/evolution.xml.h:44
-msgid "_Copy..."
-msgstr "_Copiar..."
+#~ msgid "News Feed"
+#~ msgstr "Fuente de noticias"
 
-#: ui/evolution.xml.h:48
-msgid "_Folder Bar"
-msgstr "Barra de _carpetas"
+#~ msgid "All"
+#~ msgstr "Todo"
 
-#: ui/evolution.xml.h:49
-msgid "_Folder..."
-msgstr "Carp_eta..."
+#~ msgid "Shown"
+#~ msgstr "Mostrados"
 
-#: ui/evolution.xml.h:50
-msgid "_Go to Folder..."
-msgstr "_Ir a la carpeta..."
+#~ msgid "No tasks"
+#~ msgstr "No hay tareas"
 
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "A_yuda"
+#~ msgid "(No Description)"
+#~ msgstr "(Sin descripción)"
 
-#: ui/evolution.xml.h:52
-msgid "_Import..."
-msgstr "_Importar..."
+#~ msgid "My Weather"
+#~ msgstr "Mi meteorología"
 
-#: ui/evolution.xml.h:53
-msgid "_Move..."
-msgstr "_Mover..."
+#~ msgid "There was an error downloading data for"
+#~ msgstr "Hubo un error descargando datos para"
 
-#: ui/evolution.xml.h:54
-msgid "_New"
-msgstr "_Nuevo"
+#~ msgid "Weather"
+#~ msgstr "Meteorología"
 
-#: ui/evolution.xml.h:55
-msgid "_New Folder"
-msgstr "_Carpeta nueva"
+#~ msgid "KBOS"
+#~ msgstr "LEMD:LEVS:LEVC"
 
-#: ui/evolution.xml.h:56
-msgid "_New Folder..."
-msgstr "_Carpeta nueva"
+#~ msgid "%A, %B %e %Y"
+#~ msgstr "%A, %e de %B de %Y"
 
-#: ui/evolution.xml.h:57
-msgid "_Remove Other User's Folder"
-msgstr "Quita_r la carpeta de otro usuario"
+#~ msgid "Please wait..."
+#~ msgstr "Por favor espere..."
 
-#: ui/evolution.xml.h:58
-msgid "_Rename..."
-msgstr "_Renombrar..."
+#~ msgid "Printing of Summary failed"
+#~ msgstr "Ha fallado la impresión del resumen"
 
-#: ui/evolution.xml.h:59
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
+#~ msgid " F"
+#~ msgstr " F"
 
-#: ui/evolution.xml.h:61
-msgid "_Shortcut Bar"
-msgstr "Barra de atajo_s"
+#~ msgid " C"
+#~ msgstr " C"
 
-#: ui/evolution.xml.h:62
-msgid "_Shortcut..."
-msgstr "_Atajo..."
+#~ msgid "knots"
+#~ msgstr "nudos"
 
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Imprimir resumen"
+#~ msgid "kph"
+#~ msgstr "kph"
 
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Recargar"
+#~ msgid "inHg"
+#~ msgstr "inHg"
 
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Recargar la vista"
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
 
-#: views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Por _compañía"
+#~ msgid "miles"
+#~ msgstr "millas"
 
-#: views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "T_arjetas de visita"
+#~ msgid "kilometers"
+#~ msgstr "kilómetros"
 
-#: views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "Lista de t_eléfonos"
+#~ msgid "Clear sky"
+#~ msgstr "Cielo despejado"
 
-#: views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Vista s_emanal"
+#~ msgid "Broken clouds"
+#~ msgstr "Nubosidad intermitente"
 
-#: views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "Vista _diaria"
+#~ msgid "Scattered clouds"
+#~ msgstr "Nubes dispersas"
 
-#: views/calendar/galview.xml.h:3
-msgid "_Month View"
-msgstr "Vista _mensual"
+#~ msgid "Few clouds"
+#~ msgstr "Algunas nubes"
 
-#: views/calendar/galview.xml.h:4
-msgid "_Work Week View"
-msgstr "Vista de la semana _laboral"
+#~ msgid "Overcast"
+#~ msgstr "Cubierto"
 
-#: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
-msgstr "Como carpeta de enviados"
+#~ msgid "Invalid"
+#~ msgstr "Inválido"
 
-#: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Por marca de seguimiento"
+#~ msgid "Variable"
+#~ msgstr "Variable"
 
-#: views/mail/galview.xml.h:3
-msgid "By Sender"
-msgstr "Por remitente"
+#~ msgid "North"
+#~ msgstr "Norte"
 
-#: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Por estado"
+#~ msgid "North - NorthEast"
+#~ msgstr "Norte - Nordeste"
 
-#: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Por asunto"
+#~ msgid "Northeast"
+#~ msgstr "Nordeste"
 
-#: views/mail/galview.xml.h:6
-msgid "Messages"
-msgstr "Mensajes"
+#~ msgid "East - NorthEast"
+#~ msgstr "Este - Nordeste"
 
-#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "Con _categoría"
+#~ msgid "East"
+#~ msgstr "Este"
 
-#: views/tasks/galview.xml.h:2
-msgid "_Tasks"
-msgstr "_Tareas"
+#~ msgid "East - Southeast"
+#~ msgstr "Este - Sureste"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
-msgid "UTC"
-msgstr "UTC"
+#~ msgid "Southeast"
+#~ msgstr "Sureste"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Seleccione una zona horaria"
+#~ msgid "South - Southeast"
+#~ msgstr "Sur - Sureste"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Zonas horarias"
+#~ msgid "South"
+#~ msgstr "Sur"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Use el botón izquierdo del ratón para ampliar un área del mapa y seleccionar "
-"una zona horaria.\n"
-"Use el botón derecho del ratón para volver al tamaño de mapa anterior."
+#~ msgid "South - Southwest"
+#~ msgstr "Sur - Suroeste"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "_Selección:"
+#~ msgid "Southwest"
+#~ msgstr "Suroeste"
 
-#: widgets/menus/gal-view-menus.c:290
-msgid "_Current View"
-msgstr "_Vista actual"
+#~ msgid "West - Southwest"
+#~ msgstr "Oeste - Suroeste"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
-msgid "Custom View"
-msgstr "Vista personalizada"
+#~ msgid "West"
+#~ msgstr "Oeste"
 
-#: widgets/menus/gal-view-menus.c:358
-msgid "Save Custom View..."
-msgstr "Guardar vista personalizada..."
+#~ msgid "West - Northwest"
+#~ msgstr "Oeste - Noroeste"
 
-#: widgets/menus/gal-view-menus.c:371
-msgid "Define Views..."
-msgstr "Definir vistas..."
+#~ msgid "Northwest"
+#~ msgstr "Noroeste"
 
-#. 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
-msgid "MTWTFSS"
-msgstr "LMXJVSD"
+#~ msgid "North - Northwest"
+#~ msgstr "Norte - Noroeste"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Drizzle"
+#~ msgstr "Llovizna"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
-msgid "Now"
-msgstr "Ahora"
+#~ msgid "Drizzle in the vicinity"
+#~ msgstr "Llovizna en las proximidades"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
-msgid "Today"
-msgstr "Hoy"
+#~ msgid "Light drizzle"
+#~ msgstr "Ligera llovizna"
 
-#: widgets/misc/e-cell-date-edit.c:805
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "La fecha debe estar en el formato: %s"
+#~ msgid "Moderate drizzle"
+#~ msgstr "Llovizna moderada"
 
-#: 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, inclusive"
+#~ msgid "Heavy drizzle"
+#~ msgstr "Fuerte Llovizna"
 
-#: widgets/misc/e-charset-picker.c:61
-msgid "Baltic"
-msgstr "Báltico"
+#~ msgid "Shallow drizzle"
+#~ msgstr "Llovizna suave"
 
-#: widgets/misc/e-charset-picker.c:62
-msgid "Central European"
-msgstr "Centroeuropeo"
+#~ msgid "Patches of drizzle"
+#~ msgstr "Llovizna a ráfagas"
 
-#: widgets/misc/e-charset-picker.c:63
-msgid "Chinese"
-msgstr "Chino"
+#~ msgid "Partial drizzle"
+#~ msgstr "Llovizna parcial"
 
-#: widgets/misc/e-charset-picker.c:64
-msgid "Cyrillic"
-msgstr "Cirílico"
+#~ msgid "Thunderstorm"
+#~ msgstr "Tormenta"
 
-#: widgets/misc/e-charset-picker.c:65
-msgid "Greek"
-msgstr "Griego"
+#~ msgid "Windy drizzle"
+#~ msgstr "Llovizna ventosa"
 
-#: widgets/misc/e-charset-picker.c:66
-msgid "Hebrew"
-msgstr "Hebreo"
+#~ msgid "Showers"
+#~ msgstr "Chaparrones"
 
-#: widgets/misc/e-charset-picker.c:67
-msgid "Japanese"
-msgstr "Japonés"
+#~ msgid "Drifting drizzle"
+#~ msgstr "Lloviznas racheadas"
 
-#: widgets/misc/e-charset-picker.c:68
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Freezing drizzle"
+#~ msgstr "Lloviznas muy frías"
 
-#: widgets/misc/e-charset-picker.c:69
-msgid "Turkish"
-msgstr "Turco"
+#~ msgid "Rain"
+#~ msgstr "Lluvia"
 
-#: widgets/misc/e-charset-picker.c:70
-msgid "Unicode"
-msgstr "Unicode"
+#~ msgid "Rain in the vicinity"
+#~ msgstr "Lluvia en las proximidades"
 
-#: widgets/misc/e-charset-picker.c:71
-msgid "Western European"
-msgstr "Europeo occidental"
+#~ msgid "Light rain"
+#~ msgstr "Lluvia suave"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
-msgid "Traditional"
-msgstr "Tradicional"
+#~ msgid "Moderate rain"
+#~ msgstr "Lluvia moderada"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-msgid "Simplified"
-msgstr "Simplificado"
+#~ msgid "Heavy rain"
+#~ msgstr "Lluvia fuerte"
 
-#: widgets/misc/e-charset-picker.c:97
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#~ msgid "Shallow rain"
+#~ msgstr "Lluvia suave"
 
-#: widgets/misc/e-charset-picker.c:100
-msgid "Visual"
-msgstr "Visual"
+#~ msgid "Patches of rain"
+#~ msgstr "Lluvia a ráfagas"
 
-#: widgets/misc/e-charset-picker.c:168
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Conjunto de caracteres desconocido: %s"
+#~ msgid "Partial rainfall"
+#~ msgstr "Lluvia parcial"
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
-msgid "Character Encoding"
-msgstr "Codificación de caracteres"
+#~ msgid "Blowing rainfall"
+#~ msgstr "Aguacero"
 
-#: widgets/misc/e-charset-picker.c:222
-msgid "Enter the character set to use"
-msgstr "Introduzca conjunto de caracteres a usar"
+#~ msgid "Rain showers"
+#~ msgstr "Chaparrones"
 
-#: widgets/misc/e-charset-picker.c:318
-msgid "Other..."
-msgstr "Otro..."
+#~ msgid "Drifting rain"
+#~ msgstr "Lluvia racheada"
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Freezing rain"
+#~ msgstr "Lluvia muy fría"
 
-#: widgets/misc/e-filter-bar.c:185
-msgid "Search Editor"
-msgstr "Editor de búsquedas"
+#~ msgid "Snow"
+#~ msgstr "Nieve"
 
-#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
-msgid "Save Search"
-msgstr "Guardar búsqueda"
+#~ msgid "Snow in the vicinity"
+#~ msgstr "Nevadas en las proximidades"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
-msgid "_Save Search..."
-msgstr "_Guardar búsqueda..."
+#~ msgid "Light snow"
+#~ msgstr "Ligera nevada"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
-msgid "_Edit Saved Searches..."
-msgstr "_Editar búsquedas guardadas"
+#~ msgid "Moderate snow"
+#~ msgstr "Nevada moderada"
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
-msgid "_Advanced..."
-msgstr "_Avanzado..."
+#~ msgid "Heavy snow"
+#~ msgstr "Nevada fuerte"
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Información"
+#~ msgid "Shallow snow"
+#~ msgstr "Nevada suave"
 
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Error"
+#~ msgid "Patches of snow"
+#~ msgstr "Ráfagas de nieve"
 
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Pregunta"
+#~ msgid "Partial snowfall"
+#~ msgstr "Nevadas parciales"
 
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Mensaje"
+#~ msgid "Snowstorm"
+#~ msgstr "Tormenta de nieve"
 
-#: widgets/misc/e-search-bar.c:531
-msgid "_Search"
-msgstr "_Buscar"
+#~ msgid "Blowing snowfall"
+#~ msgstr "Ventisca de nieve"
 
-#: widgets/misc/e-search-bar.c:537
-msgid "_Find Now"
-msgstr "_Buscar ahora"
+#~ msgid "Snow showers"
+#~ msgstr "Chubascos de nieve"
 
-#: widgets/misc/e-search-bar.c:538
-msgid "_Clear"
-msgstr "_Vaciar"
+#~ msgid "Drifting snow"
+#~ msgstr "Rachas de nieve"
 
-#: widgets/misc/e-search-bar.c:836
-msgid "Item ID"
-msgstr "ID de elemento"
+#~ msgid "Freezing snow"
+#~ msgstr "Nieve congelada"
 
-#: widgets/misc/e-search-bar.c:843
-msgid "Subitem ID"
-msgstr "ID de subelemento"
+#~ msgid "Snow grains"
+#~ msgstr "Copos de nieve"
 
-#: widgets/misc/e-search-bar.c:850
-msgid "Text"
-msgstr "Texto"
+#~ msgid "Snow grains in the vicinity"
+#~ msgstr "Granizo en los alrededores"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Vaciar"
+#~ msgid "Light snow grains"
+#~ msgstr "Copos de nieve ligeros"
 
-#: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
-msgstr "Buscar ahora"
+#~ msgid "Moderate snow grains"
+#~ msgstr "Granizada moderada"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local/LDAP backend"
-msgstr "Soporte de libreta de direcciones local/LDAP de Evolution"
+#~ msgid "Heavy snow grains"
+#~ msgstr "Granizada abundante"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "Evolution Calendar local file backend"
-msgstr "Soporte de archivo local de calendario de Evolution"
+#~ msgid "Shallow snow grains"
+#~ msgstr "Granizada muy intensa"
 
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local file backend"
-msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
+#~ msgid "Patches of snow grains"
+#~ msgstr "Lugares con granizo"
+
+#~ msgid "Partial snow grains"
+#~ msgstr "Granizada parcial"
+
+#~ msgid "Blowing snow grains"
+#~ msgstr "Granizo abundante"
+
+#~ msgid "Snow grain showers"
+#~ msgstr "Granizada"
+
+#~ msgid "Drifting snow grains"
+#~ msgstr "Granizada cambiando"
+
+#~ msgid "Freezing snow grains"
+#~ msgstr "Granizo con heladas"
+
+#~ msgid "Ice crystals"
+#~ msgstr "Cristales de hielo"
+
+#~ msgid "Ice crystals in the vicinity"
+#~ msgstr "Heladas en las proximidades"
+
+#~ msgid "Few ice crystals"
+#~ msgstr "Algunas placas de hielo"
+
+#~ msgid "Moderate ice crystals"
+#~ msgstr "Helada moderada"
+
+#~ msgid "Heavy ice crystals"
+#~ msgstr "Helada intensa"
+
+#~ msgid "Patches of ice crystals"
+#~ msgstr "Lugares con cristales de hielo"
+
+#~ msgid "Partial ice crystals"
+#~ msgstr "Helada parcial"
+
+#~ msgid "Ice crystal storm"
+#~ msgstr "Tormenta de hielo"
+
+#~ msgid "Blowing ice crystals"
+#~ msgstr "Ventisca de hielo"
+
+#~ msgid "Showers of ice crystals"
+#~ msgstr "Tormenta de cristales de hielo"
+
+#~ msgid "Drifting ice crystals"
+#~ msgstr "Cristales de hielo cambiando"
+
+#~ msgid "Freezing ice crystals"
+#~ msgstr "Cristales de hielo congelados"
+
+#~ msgid "Ice pellets"
+#~ msgstr "Bolas de hielo"
+
+#~ msgid "Ice pellets in the vicinity"
+#~ msgstr "Granizo en los alrededores"
+
+#~ msgid "Few ice pellets"
+#~ msgstr "Poco granizo"
+
+#~ msgid "Moderate ice pellets"
+#~ msgstr "Granizo moderado"
+
+#~ msgid "Heavy ice pellets"
+#~ msgstr "Granizo abundante"
+
+#~ msgid "Shallow ice pellets"
+#~ msgstr "Granizo muy abundante"
+
+#~ msgid "Patches of ice pellets"
+#~ msgstr "Lugares con granizo"
+
+#~ msgid "Partial ice pellets"
+#~ msgstr "Granizo parcial"
+
+#~ msgid "Ice pellet storm"
+#~ msgstr "Tormenta de granizo"
+
+#~ msgid "Blowing ice pellets"
+#~ msgstr "Tormenta de granizo"
+
+#~ msgid "Showers of ice pellets"
+#~ msgstr "Granizo con lluvia"
+
+#~ msgid "Drifting ice pellets"
+#~ msgstr "Granizada cambiando"
+
+#~ msgid "Freezing ice pellets"
+#~ msgstr "Granizada con hielo"
+
+#~ msgid "Hail in the vicinity"
+#~ msgstr "Granizo en las proximidades"
+
+#~ msgid "Light hail"
+#~ msgstr "Ligera granizada"
+
+#~ msgid "Moderate hail"
+#~ msgstr "Granizo moderado"
+
+#~ msgid "Heavy hail"
+#~ msgstr "Granizada intensa"
+
+#~ msgid "Shallow hail"
+#~ msgstr "Suave granizada"
+
+#~ msgid "Patches of hail"
+#~ msgstr "Granizo a ráfagas"
+
+#~ msgid "Partial hail"
+#~ msgstr "Granizada parcial"
+
+#~ msgid "Hailstorm"
+#~ msgstr "Tormenta de granizo"
+
+#~ msgid "Blowing hail"
+#~ msgstr "Ventisca de granizo"
+
+#~ msgid "Hail showers"
+#~ msgstr "Chubasco de granizo"
+
+#~ msgid "Drifting hail"
+#~ msgstr "Rachas de granizo"
+
+#~ msgid "Freezing hail"
+#~ msgstr "Granizada con hielo"
+
+#~ msgid "Small hail"
+#~ msgstr "Granizo pequeño"
+
+#~ msgid "Small hail in the vicinity"
+#~ msgstr "Granizo en los alrededores"
+
+#~ msgid "Moderate small hail"
+#~ msgstr "Granizo moderado"
+
+#~ msgid "Heavy small hail"
+#~ msgstr "Granizo abundante"
+
+#~ msgid "Shallow small hail"
+#~ msgstr "Granizo muy abundante"
+
+#~ msgid "Patches of small hail"
+#~ msgstr "Lugares con granizo"
+
+#~ msgid "Partial small hail"
+#~ msgstr "Granizada parcial"
+
+#~ msgid "Small hailstorm"
+#~ msgstr "Pequeña granizada"
+
+#~ msgid "Blowing small hail"
+#~ msgstr "Granizada con viento leve"
+
+#~ msgid "Showers of small hail"
+#~ msgstr "Granizo con lluvia"
+
+#~ msgid "Drifting small hail"
+#~ msgstr "Granizada cambiando"
+
+#~ msgid "Freezing small hail"
+#~ msgstr "Granizo con hielo"
+
+#~ msgid "Unknown precipitation"
+#~ msgstr "Precipitaciones indeterminadas"
+
+#~ msgid "Precipitation in the vicinity"
+#~ msgstr "Precipitación en los alrededores"
+
+#~ msgid "Light precipitation"
+#~ msgstr "Precipitación ligera"
+
+#~ msgid "Moderate precipitation"
+#~ msgstr "Precipitación moderada"
+
+#~ msgid "Heavy precipitation"
+#~ msgstr "Precipitación abundante"
+
+#~ msgid "Shallow precipitation"
+#~ msgstr "Precipitación torrencial"
+
+#~ msgid "Patches of precipitation"
+#~ msgstr "Lugares con precipitación"
+
+#~ msgid "Partial precipitation"
+#~ msgstr "Precipitación parcial"
+
+#~ msgid "Unknown thunderstorm"
+#~ msgstr "Tormenta desconocida"
+
+#~ msgid "Blowing precipitation"
+#~ msgstr "Precipitación torrencial"
+
+#~ msgid "Showers, type unknown"
+#~ msgstr "Lluvia, de tipo desconocido"
+
+#~ msgid "Drifting precipitation"
+#~ msgstr "Precipitación cambiando"
+
+#~ msgid "Freezing precipitation"
+#~ msgstr "Precipitación con hielo"
+
+#~ msgid "Mist"
+#~ msgstr "Niebla"
+
+#~ msgid "Mist in the vicinity"
+#~ msgstr "Neblina en los alrededores"
+
+#~ msgid "Light mist"
+#~ msgstr "Neblina ligera"
+
+#~ msgid "Moderate mist"
+#~ msgstr "Neblina moderada"
+
+#~ msgid "Thick mist"
+#~ msgstr "Neblina gruesa"
+
+#~ msgid "Shallow mist"
+#~ msgstr "Cortina de neblina"
+
+#~ msgid "Patches of mist"
+#~ msgstr "Lugares con neblina"
+
+#~ msgid "Partial mist"
+#~ msgstr "Neblina parcial"
+
+#~ msgid "Mist with wind"
+#~ msgstr "Neblina con viento"
+
+#~ msgid "Drifting mist"
+#~ msgstr "Neblina cambiando"
+
+#~ msgid "Freezing mist"
+#~ msgstr "Neblina con hielo"
+
+#~ msgid "Fog"
+#~ msgstr "Niebla"
+
+#~ msgid "Fog in the vicinity"
+#~ msgstr "Niebla en los alrededores"
+
+#~ msgid "Light fog"
+#~ msgstr "Niebla ligera"
+
+#~ msgid "Moderate fog"
+#~ msgstr "Niebla moderada"
+
+#~ msgid "Thick fog"
+#~ msgstr "Niebla gruesa"
+
+#~ msgid "Shallow fog"
+#~ msgstr "Niebla muy gruesa"
+
+#~ msgid "Patches of fog"
+#~ msgstr "Lugares con niebla"
+
+#~ msgid "Partial fog"
+#~ msgstr "Niebla parcial"
+
+#~ msgid "Fog with wind"
+#~ msgstr "Niebla con viento"
+
+#~ msgid "Drifting fog"
+#~ msgstr "Niebla cambiando"
+
+#~ msgid "Freezing fog"
+#~ msgstr "Niebla con hielo"
+
+#~ msgid "Smoke"
+#~ msgstr "Humo"
+
+#~ msgid "Smoke in the vicinity"
+#~ msgstr "Humo en los alrededores"
+
+#~ msgid "Thin smoke"
+#~ msgstr "Humo ligero"
+
+#~ msgid "Moderate smoke"
+#~ msgstr "Humo moderado"
+
+#~ msgid "Thick smoke"
+#~ msgstr "Humo grueso"
+
+#~ msgid "Shallow smoke"
+#~ msgstr "Cortina de humo"
+
+#~ msgid "Patches of smoke"
+#~ msgstr "Lugares con humo"
+
+#~ msgid "Partial smoke"
+#~ msgstr "Humo parcial"
+
+#~ msgid "Thunderous smoke"
+#~ msgstr "Niebla con truenos"
+
+#~ msgid "Smoke with wind"
+#~ msgstr "Humo con viento"
+
+#~ msgid "Drifting smoke"
+#~ msgstr "Humo cambiando"
+
+#~ msgid "Volcanic ash"
+#~ msgstr "Ceniza volcánica"
+
+#~ msgid "Volcanic ash in the vicinity"
+#~ msgstr "Cenizas volcánicas en los alrededores"
+
+#~ msgid "Moderate volcanic ash"
+#~ msgstr "Cenizas volcánicas moderadas"
+
+#~ msgid "Thick volcanic ash"
+#~ msgstr "Cenizas volcánicas gruesas"
+
+#~ msgid "Shallow volcanic ash"
+#~ msgstr "Cortina de cenizas volcánicas"
+
+#~ msgid "Patches of volcanic ash"
+#~ msgstr "Lugares con cenizas volcánicas"
+
+#~ msgid "Partial volcanic ash"
+#~ msgstr "Cenizas volcánicas parciales"
+
+#~ msgid "Thunderous volcanic ash"
+#~ msgstr "Cenizas volcánicas con truenos"
+
+#~ msgid "Blowing volcanic ash"
+#~ msgstr "Cenizas volcánicas abundantes"
+
+#~ msgid "Showers of volcanic ash"
+#~ msgstr "Lluvia de cenizas volcánicas"
+
+#~ msgid "Drifting volcanic ash"
+#~ msgstr "Cambiando cenizas volcánicas"
+
+#~ msgid "Freezing volcanic ash"
+#~ msgstr "Cenizas volcánicas con hielo"
+
+#~ msgid "Sand"
+#~ msgstr "Arena"
+
+#~ msgid "Sand in the vicinity"
+#~ msgstr "Arena en los alrededores"
+
+#~ msgid "Light sand"
+#~ msgstr "Arena ligera"
+
+#~ msgid "Moderate sand"
+#~ msgstr "Arena moderada"
+
+#~ msgid "Heavy sand"
+#~ msgstr "Arena abundante"
+
+#~ msgid "Patches of sand"
+#~ msgstr "Lugares con arena"
+
+#~ msgid "Partial sand"
+#~ msgstr "Arena parcial"
+
+#~ msgid "Blowing sand"
+#~ msgstr "Arena muy abundante"
+
+#~ msgid "Drifting sand"
+#~ msgstr "Arena cambiando"
+
+#~ msgid "Haze"
+#~ msgstr "Bruma"
+
+#~ msgid "Haze in the vicinity"
+#~ msgstr "Bruma en los alrededores"
+
+#~ msgid "Light haze"
+#~ msgstr "Bruma ligera"
+
+#~ msgid "Moderate haze"
+#~ msgstr "Bruma moderada"
+
+#~ msgid "Thick haze"
+#~ msgstr "Bruma gruesa"
+
+#~ msgid "Shallow haze"
+#~ msgstr "Cortina de bruma"
+
+#~ msgid "Patches of haze"
+#~ msgstr "Lugares con bruma"
+
+#~ msgid "Partial haze"
+#~ msgstr "Bruma parcial"
+
+#~ msgid "Haze with wind"
+#~ msgstr "Bruma con vientos"
+
+#~ msgid "Drifting haze"
+#~ msgstr "Cambiando la bruma"
+
+#~ msgid "Freezing haze"
+#~ msgstr "Bruma con hielo"
+
+#~ msgid "Spray"
+#~ msgstr "Rocío"
+
+#~ msgid "Spray in the vicinity"
+#~ msgstr "Rocío en los alrededores"
+
+#~ msgid "Light spray"
+#~ msgstr "Rocío ligero"
+
+#~ msgid "Moderate spray"
+#~ msgstr "Rocío moderado"
+
+#~ msgid "Heavy spray"
+#~ msgstr "Rocío abundante"
+
+#~ msgid "Shallow spray"
+#~ msgstr "Rocío muy abundante"
+
+#~ msgid "Patches of spray"
+#~ msgstr "Lugares con rocío"
+
+#~ msgid "Partial spray"
+#~ msgstr "Rocío parcial"
+
+#~ msgid "Blowing spray"
+#~ msgstr "Cortina de rocío"
+
+#~ msgid "Drifting spray"
+#~ msgstr "Rocío cambiando"
+
+#~ msgid "Freezing spray"
+#~ msgstr "Rocío con hielo"
+
+#~ msgid "Dust"
+#~ msgstr "Polvo"
+
+#~ msgid "Dust in the vicinity"
+#~ msgstr "Polvo en los alrededores"
+
+#~ msgid "Light dust"
+#~ msgstr "Polvo ligero"
+
+#~ msgid "Moderate dust"
+#~ msgstr "Polvo moderado"
+
+#~ msgid "Heavy dust"
+#~ msgstr "Polvo abundante"
+
+#~ msgid "Patches of dust"
+#~ msgstr "Lugares con polvo"
+
+#~ msgid "Partial dust"
+#~ msgstr "Polvo parcial"
+
+#~ msgid "Blowing dust"
+#~ msgstr "Cortina de polvo"
+
+#~ msgid "Drifting dust"
+#~ msgstr "Cambiando el polvo"
+
+#~ msgid "Squall"
+#~ msgstr "Borrasca"
+
+#~ msgid "Squall in the vicinity"
+#~ msgstr "Chubasco en los alrededores"
+
+#~ msgid "Light squall"
+#~ msgstr "Chubascos ligeros"
+
+#~ msgid "Moderate squall"
+#~ msgstr "Chubascos moderados"
+
+#~ msgid "Heavy squall"
+#~ msgstr "Chubascos abundantes"
+
+#~ msgid "Partial squall"
+#~ msgstr "Chubascos parciales"
+
+#~ msgid "Thunderous squall"
+#~ msgstr "Chubascos con truenos"
+
+#~ msgid "Blowing squall"
+#~ msgstr "Chubascos muy abundantes"
+
+#~ msgid "Drifting squall"
+#~ msgstr "Cambiando chubascos"
+
+#~ msgid "Freezing squall"
+#~ msgstr "Chubascos con heladas"
+
+#~ msgid "Sandstorm"
+#~ msgstr "Tormenta de arena"
+
+#~ msgid "Sandstorm in the vicinity"
+#~ msgstr "Tormenta de arena en los alrededores"
+
+#~ msgid "Light standstorm"
+#~ msgstr "Tormenta de arena ligera"
+
+#~ msgid "Moderate sandstorm"
+#~ msgstr "Tormenta de arena moderada"
+
+#~ msgid "Heavy sandstorm"
+#~ msgstr "Tormenta de arena abundante"
+
+#~ msgid "Shallow sandstorm"
+#~ msgstr "Tormenta de arena muy abundante"
+
+#~ msgid "Partial sandstorm"
+#~ msgstr "Tormenta de arena parcial"
+
+#~ msgid "Thunderous sandstorm"
+#~ msgstr "Tormenta de arena con truenos"
+
+#~ msgid "Blowing sandstorm"
+#~ msgstr "Tormenta de arena muy intensa"
+
+#~ msgid "Drifting sandstorm"
+#~ msgstr "Cambiando la tormenta de arena"
+
+#~ msgid "Freezing sandstorm"
+#~ msgstr "Tormenta de arena helada"
+
+#~ msgid "Duststorm"
+#~ msgstr "Tormenta de polvo"
+
+#~ msgid "Duststorm in the vicinity"
+#~ msgstr "Tormenta de polvo en los alrededores"
+
+#~ msgid "Light duststorm"
+#~ msgstr "Tormenta de polvo ligera"
+
+#~ msgid "Moderate duststorm"
+#~ msgstr "Tormenta de polvo moderada"
+
+#~ msgid "Heavy duststorm"
+#~ msgstr "Tormenta de polvo abundante"
+
+#~ msgid "Shallow duststorm"
+#~ msgstr "Tormenta de polvo muy abundante"
+
+#~ msgid "Partial duststorm"
+#~ msgstr "Tormenta de polvo parcial"
+
+#~ msgid "Thunderous duststorm"
+#~ msgstr "Tormenta de polvo con truenos"
+
+#~ msgid "Blowing duststorm"
+#~ msgstr "Tormenta de polvo muy intensa"
+
+#~ msgid "Drifting duststorm"
+#~ msgstr "Tormenta de polvo cambiando"
+
+#~ msgid "Freezing duststorm"
+#~ msgstr "Tormenta de polvo helada"
+
+#~ msgid "Funnel cloud"
+#~ msgstr "Nublado"
+
+#~ msgid "Funnel cloud in the vicinity"
+#~ msgstr "Nublado en los alrededores"
+
+#~ msgid "Light funnel cloud"
+#~ msgstr "Nublado ligero"
+
+#~ msgid "Moderate funnel cloud"
+#~ msgstr "Nublado moderado"
+
+#~ msgid "Thick funnel cloud"
+#~ msgstr "Nublado abundante"
+
+#~ msgid "Shallow funnel cloud"
+#~ msgstr "Nublado muy abundante"
+
+#~ msgid "Patches of funnel clouds"
+#~ msgstr "Lugares con nublado"
+
+#~ msgid "Partial funnel clouds"
+#~ msgstr "Nublado parcial"
+
+#~ msgid "Funnel cloud w/ wind"
+#~ msgstr "Nublado con vientos"
+
+#~ msgid "Drifting funnel cloud"
+#~ msgstr "Nublado cambiando"
+
+#~ msgid "Tornado"
+#~ msgstr "Tornado"
+
+#~ msgid "Tornado in the vicinity"
+#~ msgstr "Tornado en los alrededores"
+
+#~ msgid "Moderate tornado"
+#~ msgstr "Tornado moderado"
+
+#~ msgid "Raging tornado"
+#~ msgstr "Tornado violento"
+
+#~ msgid "Partial tornado"
+#~ msgstr "Tornado parcial"
+
+#~ msgid "Thunderous tornado"
+#~ msgstr "Tornado con truenos"
+
+#~ msgid "Drifting tornado"
+#~ msgstr "Cambiando el tornado"
+
+#~ msgid "Freezing tornado"
+#~ msgstr "Tornado helado"
+
+#~ msgid "Dust whirls"
+#~ msgstr "Remolinos de polvo"
+
+#~ msgid "Dust whirls in the vicinity"
+#~ msgstr "Remolino de polvo en los alrededores"
+
+#~ msgid "Light dust whirls"
+#~ msgstr "Remolino de polvo ligero"
+
+#~ msgid "Moderate dust whirls"
+#~ msgstr "Remolino de polvo moderado"
+
+#~ msgid "Heavy dust whirls"
+#~ msgstr "Remolino de polvo abundante"
+
+#~ msgid "Shallow dust whirls"
+#~ msgstr "Remolino de polvo intenso"
+
+#~ msgid "Patches of dust whirls"
+#~ msgstr "Lugares con remolino de polvo"
+
+#~ msgid "Partial dust whirls"
+#~ msgstr "Remolinos de polvo parciales"
+
+#~ msgid "Blowing dust whirls"
+#~ msgstr "Remolinos de polvo muy intensos"
+
+#~ msgid "Drifting dust whirls"
+#~ msgstr "Remolinos de polvo cambiando"
+
+#~ msgid "C_elsius"
+#~ msgstr "C_elsius"
+
+#~ msgid "How many days should the calendar display at once?"
+#~ msgstr "¿Cuántos días debe mostrar de una vez el calendario?"
+
+#~ msgid "News Feed Settings"
+#~ msgstr "Configuración de las fuentes de noticias"
+
+#~ msgid "News Feeds"
+#~ msgstr "Fuentes de noticias"
+
+#~ msgid "One mont_h"
+#~ msgstr "Un _mes"
+
+#~ msgid "One w_eek"
+#~ msgstr "Una s_emana"
+
+#~ msgid "R_efresh time (seconds):"
+#~ msgstr "Int_ervalo de actualización (segundos):"
+
+#~ msgid "Refresh _time (seconds):"
+#~ msgstr "In_tervalo de actualización (segundos):"
+
+#~ msgid "Schedule"
+#~ msgstr "Horario"
+
+#~ msgid "Show _all tasks"
+#~ msgstr "Mostrar tod_as las tareas"
+
+#~ msgid "Show _today's tasks"
+#~ msgstr "Mostrar las _tareas de hoy"
+
+#~ msgid "Show temperatures in:"
+#~ msgstr "Mostrar temperaturas en:"
+
+#~ msgid "Tasks "
+#~ msgstr "Tareas "
+
+#~ msgid "Weather Settings"
+#~ msgstr "Configuración de meteorología"
+
+#~ msgid "_Delete Feed"
+#~ msgstr "_Borrar fuente"
+
+#~ msgid "_Fahrenheit"
+#~ msgstr "_Fahrenheit"
+
+#~ msgid "_Five days"
+#~ msgstr "_Cinco días"
+
+#~ msgid "_Max number of items shown:"
+#~ msgstr "Número _máx de elementos mostrados:"
+
+#~ msgid "_New Feed"
+#~ msgstr "_Nueva fuente"
+
+#~ msgid "_One day"
+#~ msgstr "_Un día"
+
+#~ msgid "_Show full path for folders"
+#~ msgstr "Mo_strar ruta completa para las carpetas"
+
+#~ 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"
+
+#~ msgid "Cannot set up local storage -- %s"
+#~ msgstr "No se pudo configurar almacenamiento local -- %s"
+
+#~ 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."
+
+#~ msgid "Disable splash screen"
+#~ msgstr "Deshabilita la pantalla de entrada"
+
+#~ msgid "Add to _Shortcut Bar"
+#~ msgstr "Aña_dir a la barra de atajos"
+
+#~ msgid "Change the name of this folder"
+#~ msgstr "Cambiar el nombre de esta carpeta"
+
+#~ msgid "Copy this folder"
+#~ msgstr "Copiar esta carpeta"
+
+#~ msgid "Create a link to this folder in the shortcut bar"
+#~ msgstr "Crear un enlace a esta carpeta en la lista de atajos"
+
+#~ msgid "Create a new shortcut"
+#~ msgstr "Crear un nuevo atajo"
+
+#~ msgid "Create a new window displaying this folder"
+#~ msgstr "Crear una nueva ventana mostrando esta carpeta"
+
+#~ msgid "Delete this folder"
+#~ msgstr "Borrar esta carpeta"
+
+#~ msgid "Display a different folder"
+#~ msgstr "Mostrar una carpeta distinta"
+
+#~ msgid "Move this folder to another place"
+#~ msgstr "Mueve esta carpeta a otro sitio"
+
+#~ msgid "Open Other _User's Folder..."
+#~ 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"
+
+#~ msgid "Open this folder in an other window"
+#~ msgstr "Abre esta carpeta en una nueva ventana"
+
+#~ msgid "Remove a folder added with \"Open Other User's Folder\""
+#~ msgstr "Eliminar una carpeta añadida con «Abrir carpeta de otro usuario»"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar / Recibir"
+
+#~ msgid "Send queued items and retrieve new items"
+#~ msgstr "Enviar el correo en la cola y obtener el nuevo"
+
+#~ msgid "Toggle whether to show the folder bar"
+#~ msgstr "Activar si se muestra la barra de carpetas"
+
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Activar si se muestra la barra de atajos"
+
+#~ msgid "View the selected folder"
+#~ msgstr "Ver la carpeta seleccionada"
+
+#~ msgid "_Copy..."
+#~ msgstr "_Copiar..."
+
+#~ msgid "_Folder Bar"
+#~ msgstr "Barra de _carpetas"
+
+#~ msgid "_Folder..."
+#~ msgstr "Carp_eta..."
+
+#~ msgid "_Go to Folder..."
+#~ msgstr "_Ir a la carpeta..."
+
+#~ msgid "_Move..."
+#~ msgstr "_Mover..."
+
+#~ msgid "_New Folder"
+#~ msgstr "_Carpeta nueva"
+
+#~ msgid "_Remove Other User's Folder"
+#~ msgstr "Quita_r la carpeta de otro usuario"
+
+#~ msgid "_Rename..."
+#~ msgstr "_Renombrar..."
+
+#~ msgid "_Send / Receive"
+#~ msgstr "_Enviar / Recibir"
+
+#~ msgid "_Shortcut Bar"
+#~ msgstr "Barra de atajo_s"
+
+#~ msgid "_Shortcut..."
+#~ msgstr "_Atajo..."
+
+#~ msgid "Information"
+#~ msgstr "Información"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Question"
+#~ msgstr "Pregunta"
+
+#~ msgid "Evolution Addressbook local file backend"
+#~ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 
 #~ msgid ""
 #~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
@@ -27971,9 +26162,6 @@ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 #~ msgstr ""
 #~ "ping_timeout_calbak: no se pudo determinar si el objeto CORBA es nil o no"
 
-#~ msgid "Search"
-#~ msgstr "Buscar"
-
 #~ msgid "Automatically _detect links"
 #~ msgstr "_Detectar enlaces automáticamente"
 
@@ -27994,9 +26182,6 @@ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 #~ "Fuerza la actualización de los archivos de configuración de Evolution 1.0."
 #~ "x"
 
-#~ msgid "Email Address:"
-#~ msgstr "Dirección de correo:"
-
 #~ msgid "Check Full Name"
 #~ msgstr "Comprobar nombre completo"
 
@@ -28481,4 +26666,3 @@ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 
 #~ msgid "Salve file"
 #~ msgstr "Guardar archivo"
-
author	JP Rosevear <jpr@ximian.com>	2003-10-31 06:02:33 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2003-10-31 06:02:33 +0800
commit	fa2ae7d9e92893ce2b3ef0177619c53f05184d85 (patch)
tree	13dfd0cad4b9e0a28d09fdfac60fb37d39f1d43b /po/es.po
parent	e2e312d4102fc8ce3c540d85b6a998d68f528cf6 (diff)
download	gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.tar.gz gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.tar.zst gsoc2013-evolution-fa2ae7d9e92893ce2b3ef0177619c53f05184d85.zip