[geary] Updated Spanish translation

[Daniel Mustieles García <dmustieles src gnome org>]

commit 2c946cf069390c1cd3ad626e71335bb5dd9963ec
Author: Adolfo Jayme Barrientos <fitoschido ubuntu com>
Date:   Mon Jan 13 11:06:15 2014 +0100

    Updated Spanish translation

 po/es.po | 2519 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1334 insertions(+), 1185 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 5ffb2c1..e9ad1e0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,527 +11,470 @@
 # EaEnki <gonzalo gfernandez net>, 2013
 # pakitochus <pakitochus gmail com>, 2012
 # Rodrigo Cares <rcares gmail com>, 2012-2013
+# Daniel Mustieles <daniel mustieles gmail com>, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2013-09-20 12:16-0700\n"
-"PO-Revision-Date: 2013-09-25 16:22+0000\n"
-"Last-Translator: EaEnki <gonzalo gfernandez net>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/geary/language/";
-"es/)\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=geary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-01-11 19:08+0000\n"
+"PO-Revision-Date: 2014-01-13 11:05+0100\n"
+"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
+"Language-Team: Español <gnome-es-list gnome org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Error de conexión.\n"
+#: ../desktop/geary.desktop.in.h:1
+msgid "Geary"
+msgstr "Geary"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Ya se había añadido la dirección de correo a Geary.\n"
+#: ../desktop/geary.desktop.in.h:2
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Cliente de correo"
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; Error de conexión IMAP.\n"
+#: ../desktop/geary.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Correo Geary"
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; Nombre de usuario o contraseña IMAP incorrectos.\n"
+#: ../desktop/geary.desktop.in.h:4
+msgid "Send and receive email"
+msgstr "Envíe y reciba correos electrónicos"
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Nombre de Usuario Incorrecto.\n"
+#: ../desktop/geary.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
+msgstr "email;e-mail;correo electrónico;correo-e;"
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Error de conexión SMTP.\n"
+#: ../desktop/geary.desktop.in.h:6
+msgid "Compose Message"
+msgstr "Redactar mensaje"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; El nombre de usuario o contraseña SMTP incorrecto.\n"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Guardar"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; El nombre de usuario o contraseña incorrecto.\n"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Añadir"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr "(Inválido?)"
+#. Sets min size.
+#: ../src/client/accounts/account-dialog.vala:19
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Ya se adjuntó «%s» para la entrega."
+#. Copyright 2011-2013 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Page for adding or editing an account.
+#. / Placeholder text indicating that the user should type their first name and last name
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr "Nombre Apellido"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "No se pudo encontrar «%s»."
+#: ../src/client/accounts/add-edit-page.vala:190
+msgid "Welcome to Geary."
+msgstr "Bienvenido a Geary."
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "No se pudo abrir «%s» para su lectura."
+#: ../src/client/accounts/add-edit-page.vala:190
+msgid "Enter your account information to get started."
+msgstr "Introduzca la información de su cuenta para empezar. "
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» es una carpeta."
+#: ../src/client/accounts/add-edit-page.vala:210
+msgid "2 weeks back"
+msgstr "hace 2 semanas"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» es un archivo vacío."
+#. IDs are # of days
+#: ../src/client/accounts/add-edit-page.vala:211
+msgid "1 month back"
+msgstr "hace 1 mes"
 
-#. / Date format that shows the weekday (Monday, Tuesday, ...)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:182
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: ../src/client/accounts/add-edit-page.vala:212
+msgid "3 months back"
+msgstr "hace 3 meses"
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:91
-msgid "%B %-e, %Y %-H:%M"
-msgstr "%-e de %B de %Y a las %-H:%M."
+#: ../src/client/accounts/add-edit-page.vala:213
+msgid "6 months back"
+msgstr "hace 6 meses"
 
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:88
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e de %B de %Y a las %-l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:214
+msgid "1 year back"
+msgstr "hace 1 año"
 
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:94
-msgctxt "Default full date"
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%-e de %B de %Y a las %-l:%M %P"
+#. Separator
+#: ../src/client/accounts/add-edit-page.vala:216
+msgid "Everything"
+msgstr "Todo"
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:71
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/client/accounts/add-edit-page.vala:583
+msgid "Remem_ber passwords"
+msgstr "Recor_dar las contraseñas"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/engine/rfc822/rfc822-utils.vala:165
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e de %b %Y a las %-l:%M %p"
+#: ../src/client/accounts/add-edit-page.vala:590 ../ui/login.glade.h:6
+msgid "Remem_ber password"
+msgstr "Recor_dar la contraseña"
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:78
-msgid "%b %-e"
-msgstr "%-e %b"
+#: ../src/client/accounts/add-edit-page.vala:619
+msgid "Unable to validate:\n"
+msgstr "No se puede validar:\n"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d mensaje"
-msgstr[1] "%d mensajes"
+#: ../src/client/accounts/add-edit-page.vala:621
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Alias de cuenta no válido.\n"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d mensaje nuevo"
-msgstr[1] "%d mensajes nuevos"
+#: ../src/client/accounts/add-edit-page.vala:624
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Ya se había añadido la dirección de correo a Geary.\n"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d resultados"
+#: ../src/client/accounts/add-edit-page.vala:628
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Error de conexión IMAP.\n"
 
-#. / Label displaying number of unread email messages in a folder
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:37
-#, c-format
-msgid "%d unread"
-msgid_plural "%d unread"
-msgstr[0] "%d sin leer"
-msgstr[1] "%d sin leer"
+#: ../src/client/accounts/add-edit-page.vala:631
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nombre de usuario o contraseña IMAP incorrectos.\n"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "Hace %d h"
+#: ../src/client/accounts/add-edit-page.vala:634
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Error de conexión SMTP.\n"
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "Hace %d m"
+#: ../src/client/accounts/add-edit-page.vala:637
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; El nombre de usuario o contraseña SMTP incorrectos.\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i coincidencias"
+#: ../src/client/accounts/add-edit-page.vala:641
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Error de conexión.\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i coincidencias (compactadas)"
+#: ../src/client/accounts/add-edit-page.vala:645
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nombre de usuario o contraseña incorrectos.\n"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:68
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2013 Yorba Foundation"
+msgstr "Copyright 2011–2013 Fundación Yorba"
 
-#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visite el sitio web de Yorba"
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d mensaje nuevo más para %s)"
-msgstr[1] ""
-"%s\n"
-"(%d mensajes nuevos más para %s)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Output debugging information"
+msgstr "Salida de información de depuración"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../../src/client/composer/composer-window.vala:981
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Log conversation monitoring"
+msgstr "Registrar la monitorización de conversaciones"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s – Inspector de conversaciones"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log network deserialization"
+msgstr "Registrar la deserialización de red"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s – Mensajes nuevos"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network activity"
+msgstr "Registrar la actividad de red"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:178
-#, c-format
-msgid "%s wrote:"
-msgstr "%s escribió: "
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:16
+msgid "Log IMAP replay queue"
+msgstr "Registrar la cola de eventos IMAP"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, %d mensaje nuevo en total"
-msgstr[1] "%s, %d mensajes nuevos en total"
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:19
+msgid "Log network serialization"
+msgstr "Registrar la serialización de red"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:43
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
+#: ../src/client/application/geary-args.vala:20
+msgid "Log periodic activity"
+msgstr "Registrar la actividad periódica"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u conversaciones seleccionadas. "
+#: ../src/client/application/geary-args.vala:21
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registrar las consultas a la base de datos (genera muchos mensajes)"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u mensajes leídos"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:23
+msgid "Log folder normalization"
+msgstr "Registrar la normalización de carpetas"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+#: ../src/client/application/geary-args.vala:24
+msgid "Allow inspection of WebView"
+msgstr "Permitir la inspección de WebView"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(sin asunto)"
+#: ../src/client/application/geary-args.vala:25
+msgid "Display program version"
+msgstr "Mostrar la versión del programa"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mensaje reenviado ----------"
+#: ../src/client/application/geary-args.vala:47
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Envíe comentarios, sugerencias y errores a:"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 mes atrás"
+#. i18n: Command line arguments are invalid
+#: ../src/client/application/geary-args.vala:54
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "Falló al analizar las opciones de la línea de comandos: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 año atrás"
+#: ../src/client/application/geary-args.vala:65
+#, c-format
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opción de la línea de comandos no reconocida «%s»\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 semanas atrás"
+#: ../src/client/application/geary-controller.vala:44
+msgid "_Delete"
+msgstr "_Eliminar"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 meses atrás"
+#: ../src/client/application/geary-controller.vala:45
+msgid "Delete conversation (Shift+Delete)"
+msgstr "Eliminar conversación (Mayús+Supr)"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 meses atrás"
+#: ../src/client/application/geary-controller.vala:46
+msgid "Delete conversations (Shift+Delete)"
+msgstr "Eliminar conversaciones (Mayús+Supr)"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">¿Está seguro de que quiere eliminar "
-"esta cuenta?</span> "
+#: ../src/client/application/geary-controller.vala:49
+msgid "_Trash"
+msgstr "_Papelera"
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">No se puede eliminar la cuenta</span> "
+#: ../src/client/application/geary-controller.vala:50
+msgid "Move conversation to trash (Delete, Backspace)"
+msgstr "Mover conversación a la papelera (Supr, Retroceso)"
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Una ventana de composición asociada a esta cuenta se encuentra abierta. "
-"Enviar o descartar el mensaje e intentar nuevamente."
+#: ../src/client/application/geary-controller.vala:51
+msgid "Move conversations to trash (Delete, Backspace)"
+msgstr "Mover conversaciones a la papelera (Supr, Retroceso)"
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
+#: ../src/client/application/geary-controller.vala:54
+msgid "_Archive"
+msgstr "_Archivar"
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "_Cuentas"
+#: ../src/client/application/geary-controller.vala:55
+msgid "Archive conversation (A)"
+msgstr "Archivar conversación (A)"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Acerca de %s"
+#: ../src/client/application/geary-controller.vala:56
+msgid "Archive conversations (A)"
+msgstr "Archivar conversaciones (A)"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../src/client/application/geary-controller.vala:59
+msgid "Mark as S_pam"
+msgstr "Marcar como _spam"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Añadir una cuenta"
+#: ../src/client/application/geary-controller.vala:60
+msgid "Mark as not S_pam"
+msgstr "Marcar como no _spam"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Añadir etiqueta"
+#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:272
+msgid "Mark conversation"
+msgstr "Marcar conversación"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:63
+msgid "Mark conversations"
+msgstr "Marcar conversaciones"
+
+#: ../src/client/application/geary-controller.vala:64
 msgid "Add label to conversation"
 msgstr "Añadir etiqueta a la conversación"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:65
 msgid "Add label to conversations"
 msgstr "Añadir etiqueta a las conversaciones"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Todos"
-
-#: ../../ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Todos los correos electrónicos asociados con esta cuenta podrían ser "
-"eliminados de su equipo. Esto no afectará los correos en el servidor."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Permitir la inspección de WebView"
+#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:311
+msgid "Move conversation"
+msgstr "Mover conversación"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Mostrar siempre el Remitente"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversations"
+msgstr "Mover conversaciones"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archivar"
+#: ../src/client/application/geary-controller.vala:248
+msgid "A_ccounts"
+msgstr "_Cuentas"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Archivar conversación (Supr, Retroceso, A)"
+#: ../src/client/application/geary-controller.vala:253
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Preferencias"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Archivar conversaciones (Supr, Retroceso, A)"
+#: ../src/client/application/geary-controller.vala:257
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "Ay_uda"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "¿Está seguro de que quiere abrir «%s»?"
+#: ../src/client/application/geary-controller.vala:261
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_Acerca de"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Los archivos adjuntos podrían causar daños a su sistema. Solo abra los "
-"archivos que provengan de fuentes fiables."
+#: ../src/client/application/geary-controller.vala:265
+msgid "_Donate"
+msgstr "_Donar"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "CCO:"
+#: ../src/client/application/geary-controller.vala:269
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Salir"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Negrita (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:274
+msgid "_Mark as..."
+msgstr "_Marcar como…"
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "C_olor"
+#: ../src/client/application/geary-controller.vala:280
+msgid "Mark as _Read"
+msgstr "Marcar como _leído"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "No se puede adjuntar el archivo"
+#: ../src/client/application/geary-controller.vala:286
+msgid "Mark as _Unread"
+msgstr "Marcar como _no leído"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "CC:"
+#: ../src/client/application/geary-controller.vala:292
+msgid "_Star"
+msgstr "_Destacar"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:297
+msgid "U_nstar"
+msgstr "_No destacar"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Elija un archivo"
+#: ../src/client/application/geary-controller.vala:307
+msgid "Add label"
+msgstr "Añadir etiqueta"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Co_ntinuar"
+#: ../src/client/application/geary-controller.vala:308
+msgid "_Label"
+msgstr "_Etiquetar"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Redactar mensaje"
+#: ../src/client/application/geary-controller.vala:312
+msgid "_Move"
+msgstr "_Mover"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:316
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Redactar un mensaje nuevo (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Autor"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Copiar dirección de correo _electrónico"
+#. Reply to a message.
+#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1546
+msgid "_Reply"
+msgstr "_Responder"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Copiar el en_lace"
+#: ../src/client/application/geary-controller.vala:321
+msgid "Reply (Ctrl+R, R)"
+msgstr "Responder (Ctrl+R, R)"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011–2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:325
+msgid "R_eply All"
+msgstr "R_esponder a todos"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../src/client/application/geary-controller.vala:326
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Responder a todos (Ctrl+Mayús+R, Mayús+R)"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Fecha: "
+#. Forward a message.
+#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "_Forward"
+msgstr "_Reenviar"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Fecha: %s\n"
+#: ../src/client/application/geary-controller.vala:332
+msgid "Forward (Ctrl+L, F)"
+msgstr "Reenviar (Ctrl+L, F)"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Eliminar conversación (Supr, Retroceso, A)"
+#: ../src/client/application/geary-controller.vala:615
+msgid "Your settings are insecure"
+msgstr "Su configuración no es segura"
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Eliminar conversaciones (Supr, Retroceso, A)"
+#: ../src/client/application/geary-controller.vala:616
+msgid ""
+"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
+"username and password could be read by another person on the network.  Are "
+"you sure you want to do this?"
+msgstr ""
+"Los parámetros IMAP y/o SMTP no especifican SSL o TLS. Esto quiere decir que "
+"otra persona podría leer su nombre de usuario y contraseña en la misma red. "
+"¿Está seguro de que quiere hacer esto?"
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Mostrar la versión del programa"
+#: ../src/client/application/geary-controller.vala:617
+msgid "Co_ntinue"
+msgstr "Co_ntinuar"
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "¿Quiere descartar el mensaje sin guardar?"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:689
+#: ../src/client/components/status-bar.vala:28
+msgid "Error sending email"
+msgstr "Error al enviar el mensaje"
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "¿Quiere descartar este mensaje?"
+#: ../src/client/application/geary-controller.vala:690
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary encontró un error al enviar un mensaje. Si el problema persiste, "
+"elimine manualmente el mensaje de la bandeja de salida."
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "No volver a _preguntarme"
+#: ../src/client/application/geary-controller.vala:753
+msgid "Labels"
+msgstr "Etiquetas"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Borradores"
+#. give the user two options: reset the Account local store, or exit Geary.  A third
+#. could be done to leave the Account in an unopened state, but we don't currently
+#. have provisions for that.
+#: ../src/client/application/geary-controller.vala:765
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "No fue posible abrir la base de datos local para %s"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Suelte archivos aquí"
+#: ../src/client/application/geary-controller.vala:766
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"Hubo un error al abrir la base de datos local para esta cuenta. Esto puede "
+"deberse a que el archivo de base de datos localizado en la siguiente carpeta "
+"está corrupto:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary puede reconstruir la base de datos y volver a sincronizarse con el "
+"servidor al salir.\n"
+"\n"
+"Reconstruir la base de datos destruirá todo el correo guardado de forma "
+"local y sus adjuntos. <b>El correo del servidor permanecerá intacto.</b>"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "_Dirección de correo electrónico:"
+#: ../src/client/application/geary-controller.vala:768
+msgid "_Rebuild"
+msgstr "_Reconstruir"
 
-#: ../../src/client/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:768
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Editar el borrador"
-
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Editar la cuenta"
-
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Dirección de correo:"
-
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Correo electrónico;"
-
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Activar corrección _ortográfica"
-
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Ci_frado:"
-
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Cifra_do:"
-
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Introduzca la información de su cuenta para empezar. "
+#: ../src/client/application/geary-controller.vala:777
+#, c-format
+msgid "Unable to rebuild database for \"%s\""
+msgstr "No se posible reconstruir la base de datos para «%s»"
 
-#: ../../src/client/geary-controller.vala:714
+#: ../src/client/application/geary-controller.vala:778
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -542,1018 +485,1224 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Error al guardar"
-
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../../src/client/geary-controller.vala:625
-#: ../../src/client/ui/status-bar.vala:28
-msgid "Error sending email"
-msgstr "Error al enviar el mensaje"
-
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Todo"
-
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Ocurrió un error al abrir el editor de textos predeterminado."
+#. some other problem opening the account ... as with other flow path, can't run
+#. Geary today with an account in unopened state, so have to exit
+#: ../src/client/application/geary-controller.vala:800
+#: ../src/client/application/geary-controller.vala:810
+#: ../src/client/application/geary-controller.vala:821
+#, c-format
+msgid "Unable to open local mailbox for %s"
+msgstr "No se puede abrir el buzón local para %s"
 
-#: ../../src/client/geary-args.vala:54
+#: ../src/client/application/geary-controller.vala:801
 #, c-format
-msgid "Failed to parse command line options: %s\n"
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to a file permissions problem.\n"
+"\n"
+"Please check that you have read/write permissions for all files in this "
+"directory:\n"
+"\n"
+"%s"
 msgstr ""
-"Ocurrió un error al interpretar las opciones de la línea de órdenes: %s\n"
-
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Nombre Apellido"
-
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Ancho Fijo"
+"Hubo un error al abrir la base de datos de correo local para esta cuenta. "
+"Esto se debe posiblemente a un problema de permisos de archivo.\n"
+"\n"
+"Revise que cuentas con permisos de lectura y escritura en la siguiente "
+"carpeta:\n"
+"\n"
+"%s"
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Reenviar (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:811
+msgid ""
+"The version number of the local mail database is formatted for a newer "
+"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
+"La versión de la base de datos de correo local tiene el formato de una "
+"versión más reciente de Geary. Desafortunadamente, no se puede volver a una "
+"versión anterior para que funcione con esta versión de Geary.\n"
+"\n"
+"Instale la última versión de Geary e inténtelo de nuevo."
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "De: "
+#: ../src/client/application/geary-controller.vala:822
+msgid ""
+"There was an error opening the local account. This is probably due to "
+"connectivity issues.\n"
+"\n"
+"Please check your network connection and restart Geary."
+msgstr ""
+"Hubo un error al abrir la cuenta local. Esto puede ser debido a problemas de "
+"conectividad.\n"
+"\n"
+"Revise su conexión de red y reinicie Geary."
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/client/application/geary-controller.vala:1292
 #, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
+msgid "About %s"
+msgstr "Acerca de %s"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1295
+msgid "translator-credits"
+msgstr ""
+"Daniel Mustieles <daniel mustieles gmail com>, 2014\n"
+"Adolfo Jayme Barrientos <fitoschido ubuntu com>, 2012, 2014\n"
+"aldomann, pakitochuz, rcares a través de Transifex"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Correo Geary"
+#: ../src/client/application/geary-controller.vala:1552
+#, c-format
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "¿Está seguro de que quiere abrir «%s»?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:1553
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
-"Geary encontró un error al enviar un mensaje. Si el problema persiste, borra "
-"manualmente el mensaje de la Bandeja de Salida."
+"Los archivos adjuntos podrían causar daños a su sistema. Abra solo los "
+"archivos que provengan de fuentes fiables."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "General"
+#: ../src/client/application/geary-controller.vala:1554
+msgid "Don't _ask me again"
+msgstr "No volver a _preguntarme"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:1572
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "Credenciales de IMAP"
+#: ../src/client/application/geary-controller.vala:1574
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr "El archivo ya existe en «%s». Reemplazarlo sobrescribirá su contenido."
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "Contraseña de IMAP"
+#: ../src/client/application/geary-controller.vala:1577
+msgid "_Replace"
+msgstr "_Reemplazar"
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "Configuración de IMAP"
+#: ../src/client/components/conversation-find-bar.vala:214
+#, c-format
+msgid "%i matches"
+msgstr "%i coincidencias"
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "Nombre de usuario de IMAP"
+#: ../src/client/components/conversation-find-bar.vala:216
+#, c-format
+msgid "%i matches (wrapped)"
+msgstr "%i coincidencias (compactadas)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "no encontrado"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Buscar"
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Bandejas de entrada"
+#. Spacer.
+#. Search bar.
+#: ../src/client/components/main-toolbar.vala:84
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Buscar palabras en todo el correo de la cuenta (Ctrl+S)"
 
-#: ../../src/client/ui/main-toolbar.vala:163
+#: ../src/client/components/main-toolbar.vala:205
 #, c-format
 msgid "Indexing %s account"
-msgstr "Indizando la cuenta de %s"
-
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Itálica (Ctrl+I)"
-
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Etiquetas"
+msgstr "Indexando la cuenta %s"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "_Grande"
+#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr "Buscar la cuenta %s"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Grande"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:25
+msgid "Sending..."
+msgstr "Enviando…"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Enlace (Ctr+L)"
+#: ../src/client/components/stock.vala:18
+#: ../ui/account_cannot_remove.glade.h:3
+msgid "_OK"
+msgstr "_Aceptar"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: ../../src/client/geary-args.vala:16
-msgid "Log IMAP replay queue"
-msgstr "Registrar la cola de reproducción IMAP"
+#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Registrar el monitoreo de conversaciones"
+#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
+#: ../ui/composer.glade.h:46 ../ui/preferences.glade.h:1
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registrar las consultas a la base de datos (genera muchos mensajes)"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Descartar"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Registrar la normalización de carpetas"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Abrir"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Registar la actividad de red"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Imprimir…"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Registrar la des-serialización de red"
+#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+msgid "_Remove"
+msgstr "_Eliminar"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../../src/client/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "Registrar la serialización de red"
+#. Select all.
+#: ../src/client/components/stock.vala:32
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1015
+msgid "Select _All"
+msgstr "Seleccionar _todo"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Registrar la actividad periódica"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Mantener"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/composer/composer-window.vala:40
+msgid "New Message"
+msgstr "Mensaje nuevo"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Cliente de correo"
+#: ../src/client/composer/composer-window.vala:41
+msgid "Saved"
+msgstr "Guardado"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Marcar como no leído desde _aquí"
+#: ../src/client/composer/composer-window.vala:42
+msgid "Saving"
+msgstr "Guardando"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Marcar como S_pam"
+#: ../src/client/composer/composer-window.vala:43
+msgid "Error saving"
+msgstr "Error al guardar"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Marcar como _Leído"
+#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
+#: ../src/client/composer/composer-window.vala:95
+msgid "attach|enclosed|enclosing|cover letter"
+msgstr "adjuntar|insertado|insertando|portada"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Marcar como _No Leído"
+#: ../src/client/composer/composer-window.vala:681
+msgid "Do you want to discard the unsaved message?"
+msgstr "¿Quiere descartar el mensaje sin guardar?"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Marcar como No S_pam"
+#: ../src/client/composer/composer-window.vala:684
+msgid "Do you want to discard this message?"
+msgstr "¿Quiere descartar este mensaje?"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Marcar conversación"
+#: ../src/client/composer/composer-window.vala:761
+msgid "Send message with an empty subject and body?"
+msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Marcar conversaciones"
+#: ../src/client/composer/composer-window.vala:763
+msgid "Send message with an empty subject?"
+msgstr "¿Quiere enviar el mensaje sin asunto?"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Yo"
+#: ../src/client/composer/composer-window.vala:765
+msgid "Send message with an empty body?"
+msgstr "¿Quiere enviar el mensaje sin cuerpo?"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Mediano"
+#: ../src/client/composer/composer-window.vala:767
+msgid "Send message without an attachment?"
+msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Más opciones"
+#: ../src/client/composer/composer-window.vala:950
+msgid "Cannot add attachment"
+msgstr "No se puede adjuntar el archivo"
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Mover conversación"
+#: ../src/client/composer/composer-window.vala:961
+#, c-format
+msgid "\"%s\" could not be found."
+msgstr "No se pudo encontrar «%s»."
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Mover conversaciones"
+#: ../src/client/composer/composer-window.vala:968
+#, c-format
+msgid "\"%s\" is a folder."
+msgstr "«%s» es una carpeta."
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_ombre:"
+#: ../src/client/composer/composer-window.vala:975
+#, c-format
+msgid "\"%s\" is an empty file."
+msgstr "«%s» es un archivo vacío."
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "_Apodo"
+#: ../src/client/composer/composer-window.vala:989
+#, c-format
+msgid "\"%s\" could not be opened for reading."
+msgstr "No se pudo abrir «%s» para lectura."
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Mensaje nuevo"
+#: ../src/client/composer/composer-window.vala:996
+#, c-format
+msgid "\"%s\" already attached for delivery."
+msgstr "Ya se ha adjuntado «%s» para enviarlo."
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Apodo:"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-window.vala:1005
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "No se re_quiere autenticación"
+#: ../src/client/composer/composer-window.vala:1267
+msgid "Select Color"
+msgstr "Seleccionar color"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "No hay conversaciones en la carpeta."
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Yo"
 
-#: ../../src/client/views/conversation-viewer.vala:244
+#: ../src/client/conversation-viewer/conversation-viewer.vala:254
 msgid "No conversations selected."
 msgstr "No hay ninguna conversación seleccionada."
 
-#: ../../src/client/views/conversation-viewer.vala:273
+#: ../src/client/conversation-viewer/conversation-viewer.vala:256
+#, c-format
+msgid "%u conversations selected."
+msgstr "%u conversaciones seleccionadas."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:283
 msgid "No search results found."
 msgstr "No se encontraron resultados de búsqueda."
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Ninguno"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:285
+msgid "No conversations in folder."
+msgstr "No hay conversaciones en la carpeta."
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Notificaciones"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:524
+msgid "This message contains remote images."
+msgstr "Este mensaje contiene imágenes remotas."
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Ahora"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:524
+msgid "Show Images"
+msgstr "Mostrar imágenes"
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:171
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "El %1$s, %2$s escribió:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:525
+msgid "Always Show From Sender"
+msgstr "Mostrar siempre el remitente"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: ../../src/engine/rfc822/rfc822-utils.vala:184
-#, c-format
-msgid "On %s:"
-msgstr "El %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:549
+msgid "Edit Draft"
+msgstr "Editar borrador"
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Abrir"
+#. Geary account mail will be sent from
+#: ../src/client/conversation-viewer/conversation-viewer.vala:621
+#: ../ui/composer.glade.h:41
+msgid "From:"
+msgstr "De: "
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Otro"
+#. Address(es) e-mail is to be sent to
+#: ../src/client/conversation-viewer/conversation-viewer.vala:624
+#: ../ui/composer.glade.h:36
+msgid "To:"
+msgstr "Para: "
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:627
+#: ../ui/composer.glade.h:37
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:630
+#: ../ui/composer.glade.h:39
+msgid "Bcc:"
+msgstr "Cco:"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Salida de información de depuración"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:633
+#: ../ui/composer.glade.h:38
+msgid "Subject:"
+msgstr "Asunto:"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_uerto:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:636
+msgid "Date:"
+msgstr "Fecha: "
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Contrase_ña:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:842
+#, c-format
+msgid "%u read messages"
+msgstr "%u mensajes leídos"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Contraseña"
+#. Add a menu item for copying the current selection.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:988
+#: ../ui/composer.glade.h:4
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Contraseña:"
+#. Add a menu item for copying the address.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:996
+msgid "Copy _Email Address"
+msgstr "Copiar dirección de _correo-e"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Pegar con _formato"
+#. Add a menu item for copying the link.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1001
+#: ../ui/composer.glade.h:17
+msgid "Copy _Link"
+msgstr "Copiar en_lace"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Escriba la contraseña de su correo electrónico"
+#. Select message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1009
+msgid "Select _Message"
+msgstr "Seleccionar _mensaje"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Envíe comentarios, sugerencias y errores a:"
+#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
+msgid "_Inspect"
+msgstr "_Inspeccionar"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Por favor espere mientras Geary valida su cuenta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1246
+msgid "This link appears to go to"
+msgstr "Parece que este enlace apunta a"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Pue_rto:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1247
+msgid "but actually goes to"
+msgstr "pero en realidad apunta a "
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Puerto:"
+#. If href doesn't look like a URL, something is fishy, so warn the user
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1302
+msgid " (Invalid?)"
+msgstr "(¿No válido?)"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Citar el texto  (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1494
+msgid "_Save As..."
+msgstr "_Guardar como…"
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "R_esponder a Todos"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1499
+msgid "Save All A_ttachments..."
+msgstr "Guardar todos los a_djuntos…"
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Lectura"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1513
+msgid "_Save Image As..."
+msgstr "_Guardar imagen como…"
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Nombre real:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1536
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Guardar ad_junto…"
+msgstr[1] "Guardar todos los ad_juntos…"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Recor_dar la contraseña"
+#. Reply to all on a message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1551
+msgid "Reply to _All"
+msgstr "Responder a _todos"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "Recor_dar las contraseñas"
+#. Mark as read/unread.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1568
+msgid "_Mark as Read"
+msgstr "_Marcar como leído"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Eliminar la cuenta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
+msgid "_Mark as Unread"
+msgstr "_Marcar como no leído"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Eliminar formato (Ctrl+Espacio)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1578
+msgid "Mark Unread From _Here"
+msgstr "Marcar como no leído desde _aquí"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Responder (Ctrl+R, R)"
+#. Separator.
+#. View original message source.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
+msgid "_View Source"
+msgstr "_Ver fuente"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Responder a todos (Ctrl+Mayús+R, Mayús+R)"
+#. Generate the attachment table.
+#. / Placeholder filename for attachments with no filename.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1898
+#: ../src/engine/rfc822/rfc822-utils.vala:327
+msgid "none"
+msgstr "sin nombre"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Responder a _todos"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2028
+msgid "Failed to open default text editor."
+msgstr "Falló al abrir el editor de textos predeterminado."
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "Credenciales de SMTP"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:293
+#, c-format
+msgid "%s - Conversation Inspector"
+msgstr "%s – inspector de conversaciones"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "Contraseña de SMTP"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Elija un archivo"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "Configuración de SMTP"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Adjuntar"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "Nombre de usuario de SMTP"
+#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
+#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
+#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Please enter your email password"
+msgstr "Introduzca la contraseña de su correo electrónico"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
+#: ../src/client/dialogs/password-dialog.vala:17
+msgid "Unable to login to email server"
+msgstr "No se pudo contactar con el servidor de correo-e"
+
+#: ../src/client/dialogs/password-dialog.vala:124
 msgid "SSL"
 msgstr "SSL"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "Cifrado SSL/TLS:"
-
-#: ../../src/client/dialogs/password-dialog.vala:126
+#: ../src/client/dialogs/password-dialog.vala:126 ../ui/login.glade.h:26
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#: ../src/client/dialogs/password-dialog.vala:128
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:24
+msgid "None"
+msgstr "Ninguno"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#. Label displaying total number of email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#, c-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensaje"
+msgstr[1] "%d mensajes"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "S_ervicio:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:37
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d sin leer"
+msgstr[1] "%d sin leer"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#. / This string represents the divider between two messages: "n messages" and "n unread",
+#. / shown in the folder list as a tooltip.  Please use your languages conventions for
+#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:43
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Guardar ad_junto…"
-msgstr[1] "Guardar todos los ad_juntos…"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Bandejas de entrada"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Guardar todos los ad_juntos…"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultado"
+msgstr[1] "%d resultados"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Guardado"
+#: ../src/client/notification/libmessagingmenu.vala:75
+#, c-format
+msgid "%s - New Messages"
+msgstr "%s – mensajes nuevos"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Guardando"
+#: ../src/client/notification/libnotify.vala:72
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d mensaje nuevo"
+msgstr[1] "%d mensajes nuevos"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rvidor:"
+#: ../src/client/notification/libnotify.vala:75
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d mensaje nuevo en total"
+msgstr[1] "%s, %d mensajes nuevos en total"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../../src/client/ui/main-toolbar.vala:10
-#: ../../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Buscar"
+#: ../src/client/notification/libnotify.vala:107
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d mensaje nuevo más para %s)"
+msgstr[1] ""
+"%s\n"
+"(%d mensajes nuevos más para %s)"
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Abrir"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:68
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
+
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:71
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:74
+msgctxt "Default clock format"
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
+
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:78
+msgid "%b %-e"
+msgstr "%-e %b"
+
+#. / Date format for dates within a different year, i.e. 02/04/10
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:83
+#, no-c-format
+msgid "%x"
+msgstr "%x"
+
+#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:88
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e de %B de %Y a las %-l:%M %P"
+
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr "%-e de %B de %Y a las %-H:%M."
+
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e de %B de %Y a las %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Ahora"
+
+#: ../src/client/util/util-date.vala:167
 #, c-format
-msgid "Search %s account"
-msgstr "Buscar en la cuenta de %s"
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Hace %dm"
+msgstr[1] "Hace %dm"
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Buscar palabras en todo el correo de la cuenta (Ctrl+S)"
+#: ../src/client/util/util-date.vala:170
+#, c-format
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Hace %dh"
+msgstr[1] "Hace %dh"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Seleccionar Color"
+#: ../src/client/util/util-date.vala:177
+msgid "Yesterday"
+msgstr "Ayer"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#. / Date format that shows the weekday (Monday, Tuesday, ...)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:182
+#, c-format
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Seleccionar el _mensaje"
+#: ../src/client/util/util-email.vala:30
+#: ../src/engine/rfc822/rfc822-message.vala:734
+msgid "(no subject)"
+msgstr "(sin asunto)"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Envíe y reciba correos electrónicos"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "¿Quiere enviar el mensaje sin el cuerpo?"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
-msgstr "¿Quiere enviar el mensaje sin el asunto?"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
-msgid "Sending..."
-msgstr "Enviando…"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Enviados"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Correo Yahoo!"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_vidor:"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Otro"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Servidor:"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Bandeja de entrada"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Servicio:"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Borradores"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Mostrar las imágenes"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Enviados"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Destacados"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Pequeño"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
+
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Todos"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
+#: ../src/engine/api/geary-special-folder-type.vala:42
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Destacados"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papelera"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Almacenamiento"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Bandeja de salida"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Tachado (Ctrl+K)"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archivado"
+
+#. Map of user-supplied search field names to column names.
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.
+#: ../src/engine/imap-db/imap-db-account.vala:632
+msgid "attachment"
+msgstr "adjunto"
+
+#. / Can be typed in the search box like bcc:johndoe example com to find
+#. / messages bcc'd to a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:635
+msgid "bcc"
+msgstr "cco"
+
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.
+#: ../src/engine/imap-db/imap-db-account.vala:638
+msgid "body"
+msgstr "cuerpo"
+
+#. / Can be typed in the search box like cc:johndoe example com to find
+#. / messages cc'd to a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:641
+msgid "cc"
+msgstr "cc"
+
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.
+#: ../src/engine/imap-db/imap-db-account.vala:644
+msgid "from"
+msgstr "de"
+
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.
+#: ../src/engine/imap-db/imap-db-account.vala:647
+msgid "subject"
+msgstr "asunto"
+
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.
+#: ../src/engine/imap-db/imap-db-account.vala:650
+msgid "to"
+msgstr "para"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Asunto:"
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/engine/rfc822/rfc822-utils.vala:165
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e de %b %Y a las %-l:%M %p"
+
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:171
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "El %1$s, %2$s escribió:"
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:178
+#, c-format
+msgid "%s wrote:"
+msgstr "%s escribió: "
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: ../src/engine/rfc822/rfc822-utils.vala:184
+#, c-format
+msgid "On %s:"
+msgstr "El %s:"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:211
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mensaje reenviado ----------"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:215
+#, c-format
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
+#: ../src/engine/rfc822/rfc822-utils.vala:216
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../src/engine/rfc822/rfc822-utils.vala:217
+#, c-format
+msgid "Date: %s\n"
+msgstr "Fecha: %s\n"
 
-#: ../../src/client/geary-controller.vala:1493
+#: ../src/engine/rfc822/rfc822-utils.vala:220
 #, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"El archivo ya existe en «%s». Reemplazarlo sobreescribirá su contenido. "
+msgid "To: %s\n"
+msgstr "Para: %s\n"
 
-#: ../../src/client/geary-controller.vala:747
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
-"La versión de la base de datos de correo local tiene el formato de una "
-"versión más reciente de Geary. Desafortunadamente, la base de datos no puede "
-"ser \"des-actualizada\" para funcionar con esta versión de Geary."
+#: ../src/engine/rfc822/rfc822-utils.vala:223
+#, c-format
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#: ../../src/client/geary-controller.vala:758
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
+#: ../ui/account_cannot_remove.glade.h:1
+msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
-"Hubo un error al abrir la cuenta local. Esto puede ser debido a problemas de "
-"conectividad.\n"
-"\n"
-"Revisa tu conexión de red y reinicia Geary."
+"<span weight=\"bold\" size=\"larger\">No se puede eliminar la cuenta</span> "
 
-#: ../../src/client/geary-controller.vala:737
-#, c-format
+#: ../ui/account_cannot_remove.glade.h:2
 msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
+"A composer window associated with this account is currently open. Send or "
+"discard the message and try again."
 msgstr ""
-"Se encontró un error al abrir la base de datos de correo local para esta "
-"cuenta. Esto se debe posiblemente a un problema de permisos de archivo.\n"
-"\n"
-"Revisa que cuentas con permisos de lectura y escritura en el siguiente "
-"directorio:\n"
-"\n"
-"%s"
+"Hay Una ventana de composición asociada a esta cuenta abierta. Envíe o "
+"descarte el mensaje e inténtelo de nuevo."
 
-#: ../../src/client/geary-controller.vala:702
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr ""
-"Se encontró un error al abrir la base de datos local para esta cuenta. Esto "
-"puede deberse a que el archivo de base de datos localizado en el siguiente "
-"directorio está corrupto:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary puede reconstruír la base de datos y re-sincronizarse con el servidor "
-"al salir.\n"
-"\n"
-"Reconstruír la base de datos destruirá todo el correo guardado de forma "
-"local y sus adjuntos. <b>El correo del servidor permanecerá intacto.</b>"
+#: ../ui/account_list.glade.h:1
+msgid "Add account"
+msgstr "Añadir cuenta"
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "Parece que el enlace apunta a"
+#: ../ui/account_list.glade.h:2
+msgid "Edit account"
+msgstr "Editar cuenta"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "Este mensaje contiene imágenes remotas."
+#: ../ui/account_list.glade.h:3
+msgid "Remove account"
+msgstr "Eliminar cuenta"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Para añadirlos como adjuntos"
+#: ../ui/account_spinner.glade.h:1
+msgid "Please wait while Geary validates your account."
+msgstr "Espere mientras Geary valida su cuenta"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Para: "
+#: ../ui/composer.glade.h:1
+msgid "_Undo"
+msgstr "_Deshacer"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Para: %s\n"
+#: ../ui/composer.glade.h:2
+msgid "_Redo"
+msgstr "_Rehacer"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papelera"
+#: ../ui/composer.glade.h:3
+msgid "Cu_t"
+msgstr "Cor_tar"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "_No destacar"
+#: ../ui/composer.glade.h:5
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "No se ha podido contactar con el servidor del correo electrónico"
+#: ../ui/composer.glade.h:6
+msgid "_Left"
+msgstr "_Izquierda"
 
-#: ../../src/client/geary-controller.vala:736
-#: ../../src/client/geary-controller.vala:746
-#: ../../src/client/geary-controller.vala:757
-#, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "No fue posible abrir el buzón local para %s "
+#: ../ui/composer.glade.h:7
+msgid "_Right"
+msgstr "_Derecha"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "No fue posible abrir la base de datos local para %s"
+#: ../ui/composer.glade.h:8
+msgid "_Center"
+msgstr "_Centrado"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "No fue posible reconstruír la base de datos para \"%s\""
+#: ../ui/composer.glade.h:9
+msgid "_Justify"
+msgstr "_Justificado"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "No se puede validar:\n"
+#: ../ui/composer.glade.h:10
+msgid "Link (Ctrl+L)"
+msgstr "Enlace (Ctr+L)"
+
+#: ../ui/composer.glade.h:11
+msgid "C_olor"
+msgstr "C_olor"
+
+#: ../ui/composer.glade.h:12
+msgid "More options"
+msgstr "Más opciones"
+
+#: ../ui/composer.glade.h:13
+msgid "Quote text  (Ctrl+])"
+msgstr "Citar el texto  (Ctrl+])"
+
+#: ../ui/composer.glade.h:14
+msgid "Unquote text (Ctrl+[)"
+msgstr "Eliminar cita del texto (Ctrl+[)"
+
+#: ../ui/composer.glade.h:15
+msgid "Remove formatting (Ctrl+Space)"
+msgstr "Quitar formato (Ctrl+Espacio)"
+
+#: ../ui/composer.glade.h:16
+#| msgid "Paste _With Formatting"
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
+msgstr "Pegar con _formato"
+
+#: ../ui/composer.glade.h:18
+msgid "Bold (Ctrl+B)"
+msgstr "Negrita (Ctrl+B)"
+
+#: ../ui/composer.glade.h:19
+msgid "Italic (Ctrl+I)"
+msgstr "Cursiva (Ctrl+I)"
 
-#: ../../ui/composer.glade:127
+#: ../ui/composer.glade.h:20
 msgid "Underline (Ctrl+U)"
 msgstr "Subrayado (Ctrl+U)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Eliminar cita del texto"
+#: ../ui/composer.glade.h:21
+msgid "Strikethrough (Ctrl+K)"
+msgstr "Tachado (Ctrl+K)"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opción de la línea de órdenes no reconocida «%s»\n"
+#: ../ui/composer.glade.h:22
+msgid "_Rich Text"
+msgstr "Texto en_riquecido"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "_Nombre de usuario:"
+#: ../ui/composer.glade.h:23
+msgid "Lar_ge"
+msgstr "_Grande"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Nombre de usuario:"
+#: ../ui/composer.glade.h:24
+msgid "Large"
+msgstr "Grande"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Visite el sitio web de Yorba"
+#: ../ui/composer.glade.h:25
+msgid "_Medium"
+msgstr "_Mediano"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Bienvenido/a a Geary."
+#: ../ui/composer.glade.h:26
+msgid "Medium"
+msgstr "Mediano"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Trabajo, Casa, etc."
+#: ../ui/composer.glade.h:27
+msgid "_Small"
+msgstr "_Pequeño"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Correo Yahoo!"
+#: ../ui/composer.glade.h:28
+msgid "Small"
+msgstr "Pequeño"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Ayer"
+#: ../ui/composer.glade.h:29
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
 
-#: ../../src/client/geary-controller.vala:552
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"Los parámetros IMAP y/o SMTP no especifican SSL o TLS. Esto quiere decir que "
-"su nombre de usuario y contraseña podrían ser leídos por otra persona en la "
-"misma red. ¿Está seguro de que desea hacer esto?"
+#: ../ui/composer.glade.h:30
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Su configuración no es segura"
+#: ../ui/composer.glade.h:31
+msgid "S_erif"
+msgstr "S_erif"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_Acerca de"
+#: ../ui/composer.glade.h:32
+msgid "Serif"
+msgstr "Serif"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Agregar"
+#: ../ui/composer.glade.h:33
+msgid "_Fixed Width"
+msgstr "_Anchura Fija"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Archivar"
+#: ../ui/composer.glade.h:34
+msgid "Fixed Width"
+msgstr "Anchura Fija"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Adjuntar"
+#: ../ui/composer.glade.h:42
+msgid "Drop files here"
+msgstr "Suelte los archivos aquí"
+
+#: ../ui/composer.glade.h:43
+msgid "To add them as attachments"
+msgstr "Para añadirlos como adjuntos"
 
-#: ../../ui/composer.glade:525
+#: ../ui/composer.glade.h:44
 msgid "_Attach File"
 msgstr "_Adjuntar archivo"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "Seleccionar el mensaje siguiente _automáticamente"
-
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../ui/composer.glade.h:45
+msgid "_Include Original Attachments"
+msgstr "_Incluir adjuntos originales"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centrado"
+#: ../ui/composer.glade.h:47
+msgid "_Send"
+msgstr "_Enviar"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Cerrar"
+#: ../ui/find_bar.glade.h:1
+msgid "Find:"
+msgstr "Buscar:"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Copiar"
+#: ../ui/find_bar.glade.h:2
+msgid "_Previous"
+msgstr "_Anterior"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Eliminar"
+#: ../ui/find_bar.glade.h:3
+msgid "_Next"
+msgstr "_Siguiente"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Detalles"
+#: ../ui/find_bar.glade.h:4
+msgid "_Case sensitive"
+msgstr "_Sensible a capitalización"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Descartar"
+#: ../ui/find_bar.glade.h:5
+#| msgid "Labels"
+msgid "label"
+msgstr "etiqueta"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "_Mostrar previsualización de conversación"
+#: ../ui/login.glade.h:1
+msgid "Password"
+msgstr "Contraseña"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Donar"
+#: ../ui/login.glade.h:2
+msgid "E_mail address:"
+msgstr "_Dirección de correo-e:"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Descargar correo:"
+#: ../ui/login.glade.h:3 ../ui/password-dialog.glade.h:2
+msgid "_Password:"
+msgstr "_Contraseña:"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "_Ancho Fijo"
+#: ../ui/login.glade.h:4
+msgid "S_ervice:"
+msgstr "S_ervicio:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Reenviar"
+#: ../ui/login.glade.h:5
+msgid "N_ame:"
+msgstr "N_ombre:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "Ay_uda"
+#: ../ui/login.glade.h:7
+msgid "N_ickname:"
+msgstr "_Apodo:"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "_Incluir Adjuntos Originales"
+#: ../ui/login.glade.h:8
+msgid "Work, Home, etc."
+msgstr "Trabajo, casa, etc."
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Inspeccionar"
+#: ../ui/login.glade.h:9 ../ui/password-dialog.glade.h:9
+msgid "IMAP settings"
+msgstr "Configuración IMAP"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Justificado"
+#: ../ui/login.glade.h:10
+msgid "Se_rver:"
+msgstr "Se_rvidor:"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Mantener"
+#: ../ui/login.glade.h:11
+msgid "P_ort:"
+msgstr "P_uerto:"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Etiquetar"
+#: ../ui/login.glade.h:12
+msgid "Ser_ver:"
+msgstr "Ser_vidor:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Izquierda"
+#: ../ui/login.glade.h:13
+msgid "Por_t:"
+msgstr "Pue_rto:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Marcar como leído"
+#: ../ui/login.glade.h:14 ../ui/password-dialog.glade.h:13
+msgid "SMTP settings"
+msgstr "Configuración SMTP"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Marcar como no leído"
+#: ../ui/login.glade.h:15
+msgid "User_name:"
+msgstr "_Nombre de usuario:"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Marcar como…"
+#: ../ui/login.glade.h:16
+msgid "Pass_word:"
+msgstr "_Contraseña:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "_Mediano"
+#: ../ui/login.glade.h:17
+msgid "SMTP username"
+msgstr "Nombre de usuario de SMTP"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Mover"
+#: ../ui/login.glade.h:18
+msgid "SMTP password"
+msgstr "Contraseña de SMTP"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_Aceptar"
+#: ../ui/login.glade.h:19
+msgid "_Username:"
+msgstr "Nombre de _usuario:"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Abrir"
+#: ../ui/login.glade.h:20
+msgid "IMAP username"
+msgstr "Nombre de usuario de IMAP"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Contraseña:"
+#: ../ui/login.glade.h:21
+msgid "IMAP password"
+msgstr "Contraseña de IMAP"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "_Pegar"
+#: ../ui/login.glade.h:22
+msgid "Encr_yption:"
+msgstr "Ci_frado:"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Reproducir un sonido para las notificaciones"
+#: ../ui/login.glade.h:23
+msgid "Encrypt_ion:"
+msgstr "Cifra_do:"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Preferencias"
+#: ../ui/login.glade.h:25
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Imprimir…"
+#: ../ui/login.glade.h:27
+msgid "No authentication re_quired"
+msgstr "No se _requiere autenticación"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Salir"
+#: ../ui/login.glade.h:28
+msgid "Storage"
+msgstr "Almacenamiento"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "_Reconstruír"
+#: ../ui/login.glade.h:29
+msgid "_Download mail:"
+msgstr "_Descargar correo:"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Rehacer"
+#: ../ui/password-dialog.glade.h:1
+msgid "Username:"
+msgstr "Nombre de usuario:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Recordar contraseñas"
+#: ../ui/password-dialog.glade.h:3
+msgid "IMAP Credentials"
+msgstr "Credenciales de IMAP"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Eliminar"
+#: ../ui/password-dialog.glade.h:4
+msgid "SMTP Credentials"
+msgstr "Credenciales de SMTP"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Reemplazar"
+#: ../ui/password-dialog.glade.h:5
+msgid "Password:"
+msgstr "Contraseña:"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Responder"
+#: ../ui/password-dialog.glade.h:6
+msgid "Service:"
+msgstr "Servicio:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "Texto en_riquecido"
+#: ../ui/password-dialog.glade.h:7
+msgid "Real name:"
+msgstr "Nombre real:"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Derecha"
+#: ../ui/password-dialog.glade.h:8
+msgid "General"
+msgstr "General"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Guardar"
+#: ../ui/password-dialog.glade.h:10
+msgid "Server:"
+msgstr "Servidor:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Guardar como…"
+#: ../ui/password-dialog.glade.h:11
+msgid "Port:"
+msgstr "Puerto:"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Guardar la Imagen Como…"
+#: ../ui/password-dialog.glade.h:12
+msgid "SSL/TLS encryption:"
+msgstr "Cifrado SSL/TLS:"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Enviar"
+#: ../ui/password-dialog.glade.h:14
+msgid "_Details"
+msgstr "_Detalles"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Pequeño"
+#: ../ui/password-dialog.glade.h:15
+msgid "_Remember passwords"
+msgstr "_Recordar contraseñas"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Destacar"
+#: ../ui/preferences.glade.h:2
+msgid "Reading"
+msgstr "Lectura"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Deshacer"
+#: ../ui/preferences.glade.h:3
+msgid "_Automatically select next message"
+msgstr "Seleccionar el siguiente mensaje _automáticamente"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "Nombre de _usuario:"
+#: ../ui/preferences.glade.h:4
+msgid "_Display conversation preview"
+msgstr "_Mostrar la vista previa de la conversación"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_Ver fuente"
+#: ../ui/preferences.glade.h:5
+msgid "Composer"
+msgstr "Compositor"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "adjuntar|insertado|insertando|portada"
+#: ../ui/preferences.glade.h:6
+msgid "Enable _spell checking"
+msgstr "Activar corrección _ortográfica"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "pero en realidad va a "
+#: ../ui/preferences.glade.h:7
+msgid "Notifications"
+msgstr "Notificaciones"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#: ../ui/preferences.glade.h:8
+msgid "_Play notification sounds"
+msgstr "_Reproducir un sonido para las notificaciones"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "ninguno"
+#: ../ui/preferences.glade.h:9
+msgid "Show _notifications for new mail"
+msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "no encontrado"
+#: ../ui/remove_confirm.glade.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+"account?</span> "
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">¿Está seguro de que quiere eliminar "
+"esta cuenta?</span> "
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
+#: ../ui/remove_confirm.glade.h:2
+msgid ""
+"All email associated with this account will be removed from your computer. "
+"This will not affect email on the server."
 msgstr ""
-"Adolfo Jayme Barrientos <fitoschido ubuntu com>, 2012\n"
-"aldomann, pakitochuz, rcares a través de Transifex"
+"Todos los correos electrónicos asociados con esta cuenta eliminarse de su "
+"equipo. Esto no afectará los correos en el servidor."
+
+#: ../ui/remove_confirm.glade.h:3
+msgid "Nickname:"
+msgstr "Apodo:"
+
+#: ../ui/remove_confirm.glade.h:4
+msgid "Email address:"
+msgstr "Dirección de correo-e:"
+
+#: ../ui/upgrade_dialog.glade.h:1
+msgid "Geary upgrade in progress."
+msgstr "Actualización de Geary en proceso."
+
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Archivar conversación (Supr, Retroceso, A)"