Updated Spanish translation

1 files changed, 3444 insertions, 4190 deletions

diff --git a/help/es/es.po b/help/es/es.po
index 91cdb3b2e7..15f3029207 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -13,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-04 15:40+0200\n"
-"PO-Revision-Date: 2011-06-09 13:20+0200\n"
+"POT-Creation-Date: 2011-08-04 15:56+0000\n"
+"PO-Revision-Date: 2011-08-05 17:17+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -584,7 +584,7 @@ msgstr "Novell, Inc"
 #: C/calendar-classifications.page:18(p) C/calendar-caldav.page:18(p)
 #: C/calendar-alarms-and-reminders.page:18(p) C/backup-restore.page:16(p)
 msgid "Creative Commons Share Alike 3.0"
-msgstr ""
+msgstr "Creative Commons Compartir Igual 3.0"
 
 #: C/using-categories.page:25(title)
 #, fuzzy
@@ -623,40 +623,10 @@ msgstr ""
 "Pulse dos veces sobre la tarjeta para que aparezca la ventana del Editor de "
 "contactos."
 
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#, fuzzy
-msgid "Categories..."
-msgstr "Ca_tegorías…"
-
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#: C/mail-vertical-view.page:26(gui) C/mail-vertical-view.page:30(gui)
-#: C/mail-sorting-message-list.page:31(gui)
-#: C/mail-sorting-message-list.page:32(gui)
-#: C/mail-sorting-message-list.page:36(gui)
-#: C/mail-displaying-images-in-html.page:36(gui)
-#: C/mail-displaying-character-encodings.page:24(gui)
-#: C/mail-delete-and-undelete.page:32(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#: C/mail-composer-several-recipients.page:34(gui)
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:75(gui)
-#: C/intro-main-window.page:80(gui) C/intro-main-window.page:156(gui)
-#: C/change-switcher-appearance.page:21(gui)
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-#: C/calendar-layout-views.page:34(gui)
-#, fuzzy
-msgid "View"
-msgstr "Ver:"
-
-#: C/using-categories.page:35(gui) C/using-categories.page:47(gui)
-#: C/using-categories.page:50(gui) C/using-categories.page:54(gui)
-#: C/mail-labels.page:23(link) C/contacts-usage-add-contact.page:26(gui)
-msgid "Categories"
-msgstr "Categorías"
-
 #: C/using-categories.page:35(p) C/using-categories.page:47(p)
 msgid ""
-"Click <placeholder-1/>. (If this button is not available, select "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>.)"
+"Click <gui style=\"button\">Categories...</gui>. (If this button is not "
+"available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)"
 msgstr ""
 
 #: C/using-categories.page:36(p)
@@ -672,127 +642,11 @@ msgstr ""
 msgid "Adding and managing categories"
 msgstr "Añadir un certificado firmado"
 
-#: C/using-categories.page:44(gui) C/using-categories.page:54(gui)
-#: C/tasks-usage-delete-task.page:22(gui) C/tasks-searching.page:74(gui)
-#: C/tasks-display-settings.page:29(gui)
-#: C/sync-with-other-devices.page:38(gui)
-#: C/memos-usage-delete-memo.page:22(gui) C/memos-searching.page:74(gui)
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:36(gui)
-#: C/mail-spam-settings.page:45(gui) C/mail-spam-settings.page:60(gui)
-#: C/mail-several-pop-accounts.page:25(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-searching.page:70(gui) C/mail-search-folders-add.page:26(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-received-notification.page:27(gui) C/mail-read-receipts.page:39(gui)
-#: C/mail-labels.page:35(gui) C/mail-imap-headers.page:27(gui)
-#: C/mail-imap-headers.page:38(gui) C/mail-imap-headers.page:40(gui)
-#: C/mail-filters.page:27(gui) C/mail-filters.page:30(gui)
-#: C/mail-filters.page:36(gui) C/mail-filters.page:51(gui)
-#: C/mail-filters.page:53(gui) C/mail-filters.page:61(gui)
-#: C/mail-filters-not-working.page:29(gui)
-#: C/mail-error-no-provider-available.page:37(gui)
-#: C/mail-error-no-provider-available.page:38(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:30(gui)
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:32(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-encryption-gpg-set-up.page:30(gui)
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(gui) C/mail-composer-search.page:23(gui)
-#: C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:77(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-composer-custom-header-lines.page:31(gui)
-#: C/mail-change-time-format.page:20(gui) C/mail-cannot-see.page:38(gui)
-#: C/mail-cannot-see.page:41(gui) C/mail-attachments-sending.page:46(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/exporting-data-mail.page:25(gui)
-#: C/contacts-usage-delete-contact.page:22(gui)
-#: C/contacts-searching.page:74(gui) C/contacts-autocompletion.page:30(gui)
-#: C/contacts-add-automatically.page:27(gui)
-#: C/calendar-usage-delete-appointment.page:22(gui)
-#: C/calendar-timezones.page:30(gui) C/calendar-timezones.page:32(gui)
-#: C/calendar-searching.page:74(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-msgid "Edit"
-msgstr "Editar"
-
-#: C/using-categories.page:44(gui)
-#, fuzzy
-msgid "Available Categories"
-msgstr "Categorías _disponibles:"
-
 #: C/using-categories.page:44(p)
 msgid ""
 "If the default list of categories does not suit your needs, you can add your "
-"own categories either directly via <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>, or indirectly when editing an object:"
+"own categories either directly via <guiseq><gui>Edit</gui><gui>Available "
+"Categories</gui></guiseq>, or indirectly when editing an object:"
 msgstr ""
 
 #: C/using-categories.page:46(p)
@@ -807,118 +661,49 @@ msgid "Enter the new category in the entry box at the top."
 msgstr ""
 "Introduzca la nueva categoría en la caja de entrada de la parte superior."
 
-#: C/using-categories.page:49(gui) C/using-categories.page:51(gui)
-#: C/tasks-searching.page:54(gui) C/tasks-searching.page:67(gui)
-#: C/tasks-searching.page:76(gui) C/memos-searching.page:54(gui)
-#: C/memos-searching.page:67(gui) C/memos-searching.page:76(gui)
-#: C/mail-spam-groupwise-remove-from-list.page:28(gui)
-#: C/mail-spam-groupwise-manage-list.page:31(gui)
-#: C/mail-spam-groupwise-add-to-list.page:31(gui)
-#: C/mail-searching.page:50(gui) C/mail-searching.page:63(gui)
-#: C/mail-searching.page:72(gui) C/mail-search-folders-add.page:46(gui)
-#: C/mail-filters.page:43(gui) C/mail-filters.page:54(gui)
-#: C/mail-filters.page:64(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:34(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:35(gui)
-#: C/mail-encryption-gpg-set-up.page:34(gui)
-#: C/mail-composer-custom-header-lines.page:45(gui)
-#: C/mail-attachments-sending.page:32(gui)
-#: C/contacts-using-contact-lists.page:37(gui)
-#: C/contacts-usage-edit-contact.page:27(gui)
-#: C/contacts-usage-add-contact.page:27(gui)
-#: C/contacts-usage-add-contact.page:37(gui) C/contacts-searching.page:54(gui)
-#: C/contacts-searching.page:67(gui) C/contacts-searching.page:76(gui)
-#: C/calendar-searching.page:54(gui) C/calendar-searching.page:67(gui)
-#: C/calendar-searching.page:76(gui)
-#: C/calendar-meetings-replying-to-invitation.page:28(gui)
-#: C/calendar-meetings-delegating.page:38(gui)
-msgid "OK"
-msgstr "Aceptar"
-
 #: C/using-categories.page:49(p) C/using-categories.page:51(p)
-#: C/tasks-webdav.page:34(p) C/tasks-searching.page:76(p)
-#: C/tasks-local.page:28(p) C/tasks-caldav.page:32(p)
-#: C/memos-searching.page:76(p) C/mail-working-offline.page:34(p)
-#: C/mail-spam-settings.page:38(p)
 #: C/mail-spam-groupwise-remove-from-list.page:28(p)
-#: C/mail-searching.page:72(p) C/mail-search-folders-add.page:27(p)
-#: C/mail-search-folders-add.page:46(p) C/mail-imap-headers.page:40(p)
-#: C/mail-filters.page:37(p) C/mail-filters.page:43(p)
-#: C/mail-filters.page:53(p) C/mail-filters.page:63(p)
+#: C/mail-search-folders-add.page:46(p) C/mail-filters.page:43(p)
 #: C/mail-filters.page:64(p)
-#: C/mail-encryption-s-mime-signing-encrypting.page:30(p)
-#: C/mail-encryption-s-mime-signing-encrypting.page:31(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:34(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:32(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:33(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:35(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
 #: C/mail-encryption-gpg-set-up.page:34(p)
-#: C/mail-encryption-gpg-set-up.page:35(p)
-#: C/mail-composer-message-templates.page:68(p)
-#: C/mail-composer-message-templates.page:78(p)
-#: C/mail-composer-html-table.page:29(p) C/mail-composer-html-rule.page:28(p)
-#: C/mail-composer-html-link.page:29(p) C/mail-composer-html-image.page:27(p)
 #: C/mail-composer-custom-header-lines.page:45(p)
 #: C/mail-attachments-sending.page:32(p)
 #: C/contacts-using-contact-lists.page:37(p)
 #: C/contacts-usage-edit-contact.page:27(p)
-#: C/contacts-usage-add-contact.page:27(p) C/contacts-searching.page:76(p)
-#: C/contacts-local.page:27(p) C/contacts-ldap.page:36(p)
-#: C/contacts-google.page:31(p) C/calendar-webdav.page:34(p)
-#: C/calendar-weather.page:34(p) C/calendar-searching.page:76(p)
-#: C/calendar-meetings-delegating.page:32(p)
-#: C/calendar-meetings-delegating.page:38(p) C/calendar-local.page:28(p)
-#: C/calendar-google.page:35(p) C/calendar-caldav.page:35(p)
-#, fuzzy
-msgid "Click <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#: C/contacts-usage-add-contact.page:27(p)
+#: C/calendar-meetings-delegating.page:38(p)
+msgid "Click <gui style=\"button\">OK</gui>."
+msgstr "Pulse <gui style=\"button\">Aceptar</gui>."
 
 #: C/using-categories.page:50(p)
 #, fuzzy
 msgid ""
-"You can now see the category in the <placeholder-1/> text field in the "
+"You can now see the category in the <gui>Categories</gui> text field in the "
 "editor."
 msgstr ""
 "Puede ver que el nombre de la categoría aparece en el campo junto al botón "
 "Categorías en el Editor de contactos."
 
-#: C/using-categories.page:54(gui)
-msgid "Categories Editor"
-msgstr "Editor de categorías"
-
-#: C/using-categories.page:54(gui) C/tasks-usage-delete-task.page:22(gui)
-#: C/memos-usage-delete-memo.page:22(gui)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/mail-delete-and-undelete.page:30(gui)
-#: C/contacts-usage-delete-contact.page:22(gui)
-#: C/calendar-usage-delete-appointment.page:22(gui)
-msgid "Delete"
-msgstr "Eliminar"
-
 #: C/using-categories.page:54(p)
 #, fuzzy
 msgid ""
-"In the <placeholder-1/> you can edit or set the color and icon for each "
-"category available by clicking <placeholder-2/> at the bottom of the "
-"<placeholder-3/> window. Press <placeholder-4/> to delete categories from "
-"the list."
+"In the <gui>Categories Editor</gui> you can edit or set the color and icon "
+"for each category available by clicking <gui style=\"button\">Edit</gui> at "
+"the bottom of the <gui>Categories</gui> window. Press <gui style=\"button"
+"\">Delete</gui> to delete categories from the list."
 msgstr ""
 "Puede editar o establecer el color e icono para cada categoría disponible "
 "bajo la lista de categorías. Para ello pulse el botón Editar en la parte "
 "inferior de la ventana de Categorías. Pulse el botón Borrar para borrar "
 "elementos de la lista."
 
-#: C/using-categories.page:57(link) C/mail-search-folders.page:24(link)
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "search"
-msgstr "Buscar:"
-
 #: C/using-categories.page:57(p)
 msgid ""
 "To display only the objects in a particular category, select the "
-"corresponding category in the quick <placeholder-1/> bar."
+"corresponding category in the quick <link xref=\"searching-items\">search</"
+"link> bar."
 msgstr ""
 
 #: C/tasks-webdav.page:5(desc)
@@ -939,85 +724,17 @@ msgid ""
 "steps:"
 msgstr ""
 
-#: C/tasks-webdav.page:26(gui) C/tasks-usage-edit-task.page:27(gui)
-#: C/tasks-usage-add-task.page:26(gui) C/tasks-usage-add-task.page:29(gui)
-#: C/tasks-usage-add-task.page:42(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui) C/memos-usage-edit-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:26(gui) C/memos-usage-add-memo.page:29(gui)
-#: C/memos-usage-add-memo.page:43(gui) C/memos-usage-add-memo.page:49(gui)
-#: C/mail-working-offline.page:40(gui) C/mail-working-offline.page:41(gui)
-#: C/mail-send-and-receive-manual.page:21(gui) C/mail-not-sent.page:27(gui)
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-message-templates.page:41(gui)
-#: C/mail-composer-message-templates.page:52(gui)
-#: C/import-single-files.page:24(gui) C/import-apps-outlook.page:52(gui)
-#: C/import-apps-outlook.page:59(gui) C/import-apps-outlook.page:62(gui)
-#: C/import-apps-mozilla.page:24(gui) C/exporting-data-mail.page:22(gui)
-#: C/exporting-data-contacts.page:26(gui)
-#: C/exporting-data-contacts.page:27(gui) C/deleting-emails.page:31(gui)
-#: C/contacts-using-contact-lists.page:32(gui)
-#: C/contacts-usage-add-contact.page:23(gui) C/contacts-local.page:24(gui)
-#: C/contacts-ldap.page:31(gui) C/contacts-google.page:25(gui)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-edit-appointment.page:27(gui)
-#: C/calendar-usage-add-appointment.page:23(gui)
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-free-busy.page:33(gui) C/calendar-caldav.page:27(gui)
-#: C/backup-restore.page:28(gui) C/backup-restore.page:37(gui)
-#, fuzzy
-msgid "File"
-msgstr "Archivo:"
-
-#: C/tasks-webdav.page:26(gui) C/tasks-usage-add-task.page:26(gui)
-#: C/tasks-usage-add-task.page:42(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui) C/memos-usage-add-memo.page:26(gui)
-#: C/memos-usage-add-memo.page:43(gui) C/mail-folders.page:36(gui)
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-message-templates.page:49(gui)
-#: C/mail-composer-custom-header-lines.page:41(gui)
-#: C/import-apps-outlook.page:52(gui)
-#: C/contacts-using-contact-lists.page:32(gui)
-#: C/contacts-usage-add-contact.page:23(gui) C/contacts-local.page:24(gui)
-#: C/contacts-ldap.page:31(gui) C/contacts-google.page:25(gui)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-add-appointment.page:23(gui)
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-free-busy.page:33(gui) C/calendar-caldav.page:27(gui)
-msgid "New"
-msgstr "Nuevo"
-
-#: C/tasks-webdav.page:26(gui) C/tasks-local.page:24(gui)
-#: C/tasks-display-settings.page:29(gui) C/tasks-caldav.page:24(gui)
-msgid "Task List"
-msgstr "Lista de tareas"
-
-#: C/tasks-webdav.page:26(gui) C/tasks-local.page:24(gui)
-#: C/tasks-caldav.page:24(gui)
-msgid "Memo List"
-msgstr "Lista de notas"
-
 #: C/tasks-webdav.page:26(p) C/tasks-local.page:24(p)
 #: C/tasks-caldav.page:24(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> or "
-"<guiseq><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or "
+"<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>."
 msgstr ""
 
-#: C/tasks-webdav.page:27(gui) C/tasks-caldav.page:25(gui)
-#: C/calendar-webdav.page:27(gui)
+#: C/tasks-webdav.page:27(p) C/tasks-caldav.page:25(p)
+#: C/calendar-webdav.page:27(p)
 #, fuzzy
-msgid "On the Web"
-msgstr "en el futuro"
-
-#: C/tasks-webdav.page:27(p) C/tasks-local.page:25(p)
-#: C/tasks-caldav.page:25(p) C/contacts-local.page:25(p)
-#: C/contacts-google.page:26(p) C/calendar-webdav.page:27(p)
-#: C/calendar-weather.page:27(p) C/calendar-local.page:25(p)
-#: C/calendar-google.page:29(p) C/calendar-caldav.page:28(p)
-#, fuzzy
-msgid "Select the type <placeholder-1/>."
+msgid "Select the type <gui>On the Web</gui>."
 msgstr "gpg <placeholder-1/>"
 
 #: C/tasks-webdav.page:28(p) C/tasks-local.page:26(p)
@@ -1044,30 +761,17 @@ msgid ""
 "Choose if you want to be able to view the content also when being offline."
 msgstr ""
 
-#: C/tasks-webdav.page:31(gui) C/tasks-caldav.page:29(gui)
-#: C/mail-composer-html-link.page:28(gui) C/calendar-webdav.page:31(gui)
-#: C/calendar-caldav.page:32(gui)
-msgid "URL"
-msgstr "URL"
-
 #: C/tasks-webdav.page:31(p) C/tasks-caldav.page:29(p)
 #, fuzzy
-msgid "Enter the address of the list in the <placeholder-1/> field."
+msgid "Enter the address of the list in the <gui>URL</gui> field."
 msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 
-#: C/tasks-webdav.page:32(gui) C/tasks-caldav.page:30(gui)
-#: C/mail-sending-options-smtp.page:38(gui) C/contacts-google.page:30(gui)
-#: C/calendar-webdav.page:32(gui) C/calendar-weather.page:32(gui)
-#: C/calendar-caldav.page:33(gui)
-#, fuzzy
-msgid "Use secure connection"
-msgstr "Usar _conexión segura"
-
 #: C/tasks-webdav.page:32(p) C/tasks-caldav.page:30(p)
 #: C/mail-sending-options-smtp.page:38(p) C/contacts-google.page:30(p)
 #: C/calendar-webdav.page:32(p) C/calendar-weather.page:32(p)
 #: C/calendar-caldav.page:33(p)
-msgid "Choose <placeholder-1/> if you want to connect securely."
+msgid ""
+"Choose <gui>Use secure connection</gui> if you want to connect securely."
 msgstr ""
 
 #: C/tasks-webdav.page:33(p) C/mail-sending-options-smtp.page:35(p)
@@ -1076,14 +780,14 @@ msgstr ""
 msgid "Enter your username."
 msgstr "Introduzca el nombre de la búsqueda."
 
-#: C/tasks-webdav.page:34(gui) C/tasks-local.page:28(gui)
-#: C/tasks-caldav.page:32(gui) C/contacts-local.page:27(gui)
-#: C/contacts-ldap.page:36(gui) C/contacts-google.page:31(gui)
-#: C/calendar-webdav.page:34(gui) C/calendar-weather.page:34(gui)
-#: C/calendar-local.page:28(gui) C/calendar-google.page:35(gui)
-#: C/calendar-caldav.page:35(gui)
-msgid "Apply"
-msgstr ""
+#: C/tasks-webdav.page:34(p) C/tasks-local.page:28(p)
+#: C/tasks-caldav.page:32(p) C/contacts-local.page:27(p)
+#: C/contacts-ldap.page:36(p) C/contacts-google.page:31(p)
+#: C/calendar-webdav.page:34(p) C/calendar-weather.page:34(p)
+#: C/calendar-local.page:28(p) C/calendar-google.page:35(p)
+#: C/calendar-caldav.page:35(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
 
 #: C/tasks-webdav.page:37(p) C/calendar-webdav.page:37(p)
 #: C/calendar-weather.page:37(p) C/calendar-local.page:31(p)
@@ -1152,15 +856,10 @@ msgstr "Editar un contacto:"
 msgid "If you want to change a task that already exists in your task lists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/tasks-usage-edit-task.page:25(key)
-#, fuzzy
-msgid "Open Task"
-msgstr "_Abrir tarea"
-
 #: C/tasks-usage-edit-task.page:25(p)
 msgid ""
 "Double-click on the task that you want to edit in the list of contacts, or "
-"right-click on the task and click <placeholder-1/>."
+"right-click on the task and click <key>Open Task</key>."
 msgstr ""
 
 #: C/tasks-usage-edit-task.page:26(p)
@@ -1168,25 +867,13 @@ msgstr ""
 msgid "Edit the task information."
 msgstr "Rellene la información."
 
-#: C/tasks-usage-edit-task.page:27(gui) C/tasks-usage-add-task.page:29(gui)
-#: C/tasks-searching.page:67(gui) C/memos-usage-edit-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:29(gui) C/memos-usage-add-memo.page:49(gui)
-#: C/memos-searching.page:67(gui) C/mail-searching.page:63(gui)
-#: C/mail-attachments-received.page:26(gui) C/contacts-searching.page:67(gui)
-#: C/calendar-usage-edit-appointment.page:27(gui)
-#: C/calendar-searching.page:67(gui)
-#: C/calendar-meetings-sending-invitation.page:43(gui)
-#: C/backup-restore.page:29(gui)
-msgid "Save"
-msgstr "Guardar"
-
 #: C/tasks-usage-edit-task.page:27(p) C/tasks-usage-add-task.page:29(p)
 #: C/memos-usage-edit-memo.page:27(p) C/memos-usage-add-memo.page:29(p)
 #: C/memos-usage-add-memo.page:49(p)
 #: C/calendar-usage-edit-appointment.page:27(p)
 msgid ""
-"Click the <placeholder-1/> button, or <guiseq><placeholder-2/><placeholder-3/"
-"></guiseq>."
+"Click the <gui style=\"button\">Save</gui> button, or <guiseq><gui>File</"
+"gui><gui>Save</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-usage-delete-task.page:5(desc)
@@ -1199,53 +886,12 @@ msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 msgid "Deleting a Task"
 msgstr "Eliminar tarea"
 
-#: C/tasks-usage-delete-task.page:22(key) C/tasks-usage-add-task.page:26(key)
-#: C/tasks-searching.page:61(key) C/memos-usage-add-memo.page:26(key)
-#: C/memos-usage-add-memo.page:43(key) C/memos-searching.page:61(key)
-#: C/mail-spam-settings.page:45(key) C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-spam-groupwise-mark-message.page:25(key)
-#: C/mail-sorting-message-list.page:32(key)
-#: C/mail-sorting-message-list.page:36(key) C/mail-searching.page:57(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-#: C/mail-follow-up-flag.page:31(key) C/mail-folders.page:49(key)
-#: C/mail-filters.page:29(key) C/mail-filters.page:30(key)
-#: C/mail-displaying-images-in-html.page:36(key)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/mail-delete-and-undelete.page:34(key)
-#: C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-write-new-message.page:29(key)
-#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:45(key)
-#: C/mail-composer-reply.page:47(key) C/mail-composer-forward.page:31(key)
-#: C/mail-composer-forward.page:34(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/mail-attachments-sending.page:30(key) C/exporting-data-mail.page:25(key)
-#: C/deleting-emails.page:31(key) C/contacts-usage-delete-contact.page:22(key)
-#: C/contacts-usage-add-contact.page:23(key) C/contacts-searching.page:61(key)
-#: C/calendar-usage-delete-appointment.page:22(key)
-#: C/calendar-searching.page:61(key) C/calendar-layout-views.page:27(key)
-#: C/calendar-layout-views.page:28(key) C/calendar-layout-views.page:29(key)
-#: C/calendar-layout-views.page:30(key) C/calendar-layout-views.page:31(key)
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: C/tasks-usage-delete-task.page:22(key)
-#: C/mail-delete-and-undelete.page:30(key)
-#: C/contacts-usage-delete-contact.page:22(key)
-#: C/calendar-usage-delete-appointment.page:22(key)
-msgid "D"
-msgstr "D"
-
-#: C/tasks-usage-delete-task.page:22(gui)
-msgid "Delete Task"
-msgstr "Eliminar tarea"
-
 #: C/tasks-usage-delete-task.page:22(p)
 msgid ""
 "If you want to delete a task in your task lists, right-click on the task and "
-"select <placeholder-1/>, or click on the task and click <placeholder-2/> in "
-"the tool bar or press <keyseq><placeholder-3/><placeholder-4/></keyseq>, or "
-"click <guiseq><placeholder-5/><placeholder-6/></guiseq>."
+"select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> "
+"in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or "
+"click <guiseq><gui>Edit</gui><gui>Delete Task</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-usage-add-task.page:5(desc)
@@ -1259,44 +905,15 @@ msgstr "Añadir una dirección de correo electrónico a su lista de correo basur
 msgid "Adding a Task"
 msgstr "Crear una tarea nueva"
 
-#: C/tasks-usage-add-task.page:26(gui)
-msgid "Task"
-msgstr "Tarea"
-
-#: C/tasks-usage-add-task.page:26(key) C/tasks-searching.page:61(key)
-#: C/memos-usage-add-memo.page:26(key) C/memos-usage-add-memo.page:43(key)
-#: C/memos-searching.page:61(key) C/mail-spam-settings.page:45(key)
-#: C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-searching.page:57(key) C/mail-follow-up-flag.page:31(key)
-#: C/mail-folders.page:49(key) C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-reply.page:47(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/contacts-usage-add-contact.page:23(key) C/contacts-searching.page:61(key)
-#: C/calendar-searching.page:61(key)
-msgid "Shift"
-msgstr ""
-
-#: C/tasks-usage-add-task.page:26(key)
-#: C/mail-sorting-message-list.page:36(key)
-msgid "T"
-msgstr "T"
-
-#: C/tasks-usage-add-task.page:26(p) C/memos-usage-add-memo.page:26(p)
-#: C/memos-usage-add-memo.page:43(p)
+#: C/tasks-usage-add-task.page:26(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
-"press <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>."
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or "
+"press <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:27(gui) C/memos-usage-add-memo.page:27(gui)
-#: C/memos-usage-add-memo.page:46(gui)
-msgid "List"
-msgstr "Lista"
-
 #: C/tasks-usage-add-task.page:27(p)
 #, fuzzy
-msgid "Select a task list in the <placeholder-1/> dropdown list."
+msgid "Select a task list in the <gui>List</gui> dropdown list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
 #: C/tasks-usage-add-task.page:28(p)
@@ -1310,31 +927,11 @@ msgid ""
 "directly enter it in the list of tasks."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "time zone"
-msgstr "Zona horaria:"
-
-#: C/tasks-usage-add-task.page:34(link) C/memos-usage-add-memo.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "category"
-msgstr "Categoría"
-
-#: C/tasks-usage-add-task.page:34(link) C/memos-usage-add-memo.page:34(link)
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "classification"
-msgstr "Clasificación"
-
 #: C/tasks-usage-add-task.page:34(p)
 msgid ""
-"You can also define a <placeholder-1/>, a <placeholder-2/>, or a "
-"<placeholder-3/> for the task, or add an attachment."
+"You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
+"<link xref=\"using-categories\">category</link>, or a <link xref=\"calendar-"
+"classifications\">classification</link> for the task, or add an attachment."
 msgstr ""
 
 #: C/tasks-usage-add-task.page:37(title)
@@ -1358,26 +955,32 @@ msgstr ""
 "quote>. Cuando guarde la tarea, cada invitado recibirá un correo-e con los "
 "datos de la cita y tendrán la opción de responder."
 
-#: C/tasks-usage-add-task.page:41(link)
-#, fuzzy
-msgid "meetings"
-msgstr "Reunión"
-
 #: C/tasks-usage-add-task.page:41(p)
-#, fuzzy
-msgid "This is similar to <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
-
-#: C/tasks-usage-add-task.page:42(gui)
-#, fuzzy
-msgid "Assigned Task"
-msgstr "Tareas asignadas"
+msgid ""
+"This is similar to <link xref=\"calendar-meetings-sending-invitation"
+"\">meetings</link>."
+msgstr ""
 
 #: C/tasks-usage-add-task.page:42(p)
 msgid ""
-"To create an Assigned Task, click <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+"To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</"
+"gui><gui>Assigned Task</gui></guiseq>."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/tasks-searching.page:34(None) C/memos-searching.page:34(None)
+#: C/mail-searching.page:33(None) C/contacts-searching.page:34(None)
+#: C/calendar-searching.page:34(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/exchng-rec-options.png'; "
+#| "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
+msgid ""
+"@@image: 'figures/search-icon.png'; md5=cd4b82c84c628bfbbfa39d1e0d1eae89"
 msgstr ""
+"@@image: 'figures/exchng-rec-options.png'; "
+"md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
 
 #: C/tasks-searching.page:5(desc)
 #, fuzzy
@@ -1437,19 +1040,13 @@ msgstr ""
 msgid "Select the search condition from the list."
 msgstr "Seleccione el criterio de búsqueda de la lista."
 
-#: C/tasks-searching.page:36(key) C/memos-searching.page:36(key)
-#: C/mail-searching.page:36(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-#: C/contacts-usage-edit-contact.page:25(key)
-#: C/contacts-searching.page:36(key) C/calendar-searching.page:36(key)
-msgid "Enter"
-msgstr ""
-
 #: C/tasks-searching.page:36(p) C/memos-searching.page:36(p)
 #: C/mail-searching.page:36(p) C/contacts-searching.page:36(p)
 #: C/calendar-searching.page:36(p)
-msgid "Enter the text you want to search for and press <placeholder-1/>."
-msgstr ""
+#, fuzzy
+#| msgid "Type the search string in the search entry and press Enter."
+msgid "Enter the text you want to search for and press <key>Enter</key>."
+msgstr "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
 
 #: C/tasks-searching.page:37(p) C/tasks-searching.page:43(p)
 #: C/memos-searching.page:37(p) C/memos-searching.page:43(p)
@@ -1466,17 +1063,10 @@ msgstr "Evolution muestra los contactos deseados."
 msgid "Searching by category:"
 msgstr "Cualquier categoría:"
 
-# #En conflicto con _Mensaje
-#: C/tasks-searching.page:41(gui) C/memos-searching.page:41(gui)
-#: C/mail-cannot-see.page:27(gui) C/contacts-searching.page:41(gui)
-#: C/calendar-searching.page:41(gui)
-msgid "Show"
-msgstr "Mostrar"
-
 #: C/tasks-searching.page:41(p) C/memos-searching.page:41(p)
 #: C/contacts-searching.page:41(p) C/calendar-searching.page:41(p)
 #, fuzzy
-msgid "Click the <placeholder-1/> drop-down list."
+msgid "Click the <gui>Show</gui> drop-down list."
 msgstr "Pulse Mostrar la lista desplegable."
 
 #: C/tasks-searching.page:42(p) C/memos-searching.page:42(p)
@@ -1493,48 +1083,24 @@ msgid ""
 "search, which is described below."
 msgstr ""
 
-#: C/tasks-searching.page:49(title) C/tasks-searching.page:51(gui)
-#: C/memos-searching.page:49(title) C/memos-searching.page:51(gui)
-#: C/mail-searching.page:47(gui) C/contacts-searching.page:49(title)
-#: C/contacts-searching.page:51(gui) C/calendar-searching.page:49(title)
-#: C/calendar-searching.page:51(gui)
+#: C/tasks-searching.page:49(title) C/memos-searching.page:49(title)
+#: C/contacts-searching.page:49(title) C/calendar-searching.page:49(title)
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: C/tasks-searching.page:51(gui) C/tasks-searching.page:61(gui)
-#: C/tasks-searching.page:67(gui) C/tasks-searching.page:73(gui)
-#: C/memos-searching.page:51(gui) C/memos-searching.page:61(gui)
-#: C/memos-searching.page:67(gui) C/memos-searching.page:73(gui)
-#: C/mail-searching.page:47(gui) C/mail-searching.page:57(gui)
-#: C/mail-searching.page:63(gui) C/mail-searching.page:69(gui)
-#: C/mail-search-folders-add.page:26(gui) C/contacts-searching.page:51(gui)
-#: C/contacts-searching.page:61(gui) C/contacts-searching.page:67(gui)
-#: C/contacts-searching.page:73(gui) C/calendar-searching.page:51(gui)
-#: C/calendar-searching.page:61(gui) C/calendar-searching.page:67(gui)
-#: C/calendar-searching.page:73(gui)
-msgid "Search"
-msgstr "Buscar"
-
 #: C/tasks-searching.page:51(p) C/memos-searching.page:51(p)
 #: C/mail-searching.page:47(p) C/contacts-searching.page:51(p)
 #: C/calendar-searching.page:51(p)
 msgid ""
-"Select the <guiseq><placeholder-1/><placeholder-2/></guiseq> menu to open "
-"the dialog box."
+"Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu "
+"to open the dialog box."
 msgstr ""
 
-#: C/tasks-searching.page:52(gui) C/memos-searching.page:52(gui)
-#: C/mail-searching.page:48(gui) C/mail-search-folders-add.page:30(gui)
-#: C/mail-filters.page:40(gui) C/contacts-searching.page:52(gui)
-#: C/calendar-searching.page:52(gui)
-#, fuzzy
-msgid "Add Condition"
-msgstr "Añadir a_cción"
-
 #: C/tasks-searching.page:52(p) C/memos-searching.page:52(p)
 #: C/mail-searching.page:48(p) C/contacts-searching.page:52(p)
 #: C/calendar-searching.page:52(p)
-msgid "Click <placeholder-1/> to add any number of rules."
+msgid ""
+"Click <gui style=\"button\">Add Condition</gui> to add any number of rules."
 msgstr ""
 
 #: C/tasks-searching.page:53(p) C/memos-searching.page:53(p)
@@ -1552,7 +1118,8 @@ msgstr ""
 #: C/mail-searching.page:50(p) C/contacts-searching.page:54(p)
 #: C/calendar-searching.page:54(p)
 #, fuzzy
-msgid "Click <placeholder-1/> to get the search results displayed."
+msgid ""
+"Click <gui style=\"button\">OK</gui> to get the search results displayed."
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
 #: C/tasks-searching.page:60(title) C/memos-searching.page:60(title)
@@ -1562,30 +1129,16 @@ msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 msgid "Clearing the Search results"
 msgstr "Limpiar la búsqueda"
 
-# Conflicto con _Ver del menú principal
-#: C/tasks-searching.page:61(gui) C/memos-searching.page:61(gui)
-#: C/mail-searching.page:57(gui) C/contacts-searching.page:61(gui)
-#: C/calendar-searching.page:61(gui)
-#, fuzzy
-msgid "Clear"
-msgstr "_Vaciar"
-
-#: C/tasks-searching.page:61(key) C/memos-searching.page:61(key)
-#: C/mail-searching.page:57(key) C/contacts-searching.page:61(key)
-#: C/calendar-searching.page:61(key)
-msgid "Q"
-msgstr "Q"
-
 #: C/tasks-searching.page:61(p) C/memos-searching.page:61(p)
 #: C/mail-searching.page:57(p) C/contacts-searching.page:61(p)
 #: C/calendar-searching.page:61(p)
 #, fuzzy
 msgid ""
 "To clear your search view and get back to the default view, click the "
-"<placeholder-1/> icon in the search string field, or choose "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq> from the menubar. You can "
-"also press <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq> "
-"to clear the search."
+"<gui>Clear</gui> icon in the search string field, or choose "
+"<guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can "
+"also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to "
+"clear the search."
 msgstr ""
 "Para limpiar su búsqueda puede pulsar el botón o menú Limpiar en el campo de "
 "cadena de búsqueda, elegir Buscar &gt; Limpiar desde la barra de menú, o "
@@ -1607,21 +1160,15 @@ msgid ""
 "many times. In this case you can use saved searches."
 msgstr ""
 
-#: C/tasks-searching.page:67(gui) C/memos-searching.page:67(gui)
-#: C/mail-searching.page:63(gui) C/contacts-searching.page:67(gui)
-#: C/calendar-searching.page:67(gui)
-msgid "Save Search"
-msgstr "Guardar búsqueda"
-
 #: C/tasks-searching.page:67(p) C/memos-searching.page:67(p)
 #: C/mail-searching.page:63(p) C/contacts-searching.page:67(p)
 #: C/calendar-searching.page:67(p)
 msgid ""
-"To save your search results, either click <placeholder-1/> instead of "
-"<placeholder-2/> in the Search dialog, or in case the search results are "
-"already displayed, select <guiseq><placeholder-3/><placeholder-4/></guiseq>. "
-"From now on this search will be directly available from the <placeholder-5/> "
-"menu."
+"To save your search results, either click <gui>Save</gui> instead of "
+"<gui>OK</gui> in the Search dialog, or in case the search results are "
+"already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></"
+"guiseq>. From now on this search will be directly available from the "
+"<gui>Search</gui> menu."
 msgstr ""
 
 #: C/tasks-searching.page:71(title) C/memos-searching.page:71(title)
@@ -1631,19 +1178,12 @@ msgstr ""
 msgid "Editing a Saved Search"
 msgstr "Editar búsquedas guardadas:"
 
-#: C/tasks-searching.page:73(gui) C/memos-searching.page:73(gui)
-#: C/mail-searching.page:69(gui) C/contacts-searching.page:73(gui)
-#: C/calendar-searching.page:73(gui)
-#, fuzzy
-msgid "Edit Saved Searches"
-msgstr "Editar búsquedas guardadas:"
-
 #: C/tasks-searching.page:73(p) C/memos-searching.page:73(p)
 #: C/mail-searching.page:69(p) C/contacts-searching.page:73(p)
 #: C/calendar-searching.page:73(p)
 msgid ""
-"Select <guiseq><placeholder-1/><placeholder-2/></guiseq> from the menu bar "
-"to open the window."
+"Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from "
+"the menu bar to open the window."
 msgstr ""
 
 #: C/tasks-searching.page:73(item) C/memos-searching.page:73(item)
@@ -1653,19 +1193,15 @@ msgstr ""
 msgid "<placeholder-1/>."
 msgstr "gpg <placeholder-1/>"
 
-#: C/tasks-searching.page:74(gui) C/memos-searching.page:74(gui)
-#: C/mail-searching.page:70(gui) C/contacts-searching.page:74(gui)
-#: C/calendar-searching.page:74(gui)
-msgid "Edit Rule"
-msgstr "Editar regla"
-
 #: C/tasks-searching.page:74(p) C/memos-searching.page:74(p)
 #: C/mail-searching.page:70(p) C/contacts-searching.page:74(p)
 #: C/calendar-searching.page:74(p)
 #, fuzzy
-msgid "Click the <placeholder-1/> button to open the <placeholder-2/> window."
-msgstr ""
-"Pulse el botón Correo enviado para abrir la ventana de selección de carpeta."
+#| msgid "Click the Edit button to open the Edit Rule window."
+msgid ""
+"Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit "
+"Rule</gui> window."
+msgstr "Pulse el botón Editar para abrir la ventana Editar regla."
 
 #: C/tasks-searching.page:75(p) C/memos-searching.page:75(p)
 #: C/mail-searching.page:71(p) C/contacts-searching.page:75(p)
@@ -1674,6 +1210,13 @@ msgstr ""
 msgid "Edit the title or search conditions from the dialog box."
 msgstr "Edite el título o el criterio de búsqueda desde el cuadro de diálogo."
 
+#: C/tasks-searching.page:76(p) C/memos-searching.page:76(p)
+#: C/mail-searching.page:72(p) C/contacts-searching.page:76(p)
+#: C/calendar-searching.page:76(p)
+#| msgid "Click OK."
+msgid "Click <gui>OK</gui>."
+msgstr "Pulse <gui>Aceptar</gui>."
+
 #: C/tasks-organizing.page:5(desc)
 msgid "On task and memo lists, searching, and categories."
 msgstr ""
@@ -1695,10 +1238,11 @@ msgid ""
 "To add another local task list to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/tasks-local.page:25(gui) C/mail-composer-message-templates.page:35(gui)
-#: C/contacts-local.page:25(gui) C/calendar-local.page:25(gui)
-msgid "On This Computer"
-msgstr "En este equipo"
+#: C/tasks-local.page:25(p) C/contacts-local.page:25(p)
+#: C/calendar-local.page:25(p)
+#, fuzzy
+msgid "Select the type <gui>On This Computer</gui>."
+msgstr "gpg <placeholder-1/>"
 
 #: C/tasks-local.page:31(p) C/tasks-caldav.page:35(p)
 msgid "The task list will be added to the list of task lists in Evolution."
@@ -1713,111 +1257,12 @@ msgstr ""
 msgid "Displaying of tasks"
 msgstr "Mostrar elementos enviados"
 
-#: C/tasks-display-settings.page:29(gui)
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:45(gui)
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-read-receipts.page:39(gui) C/mail-labels.page:35(gui)
-#: C/mail-imap-headers.page:38(gui) C/mail-filters.page:27(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui) C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-change-time-format.page:20(gui) C/mail-cannot-see.page:41(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/contacts-autocompletion.page:30(gui)
-#: C/contacts-add-automatically.page:27(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-#, fuzzy
-msgid "Preferences"
-msgstr "Prefere_ncias"
-
-#: C/tasks-display-settings.page:29(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui) C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-#: C/calendar-alarms-and-reminders.page:28(gui)
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: C/tasks-display-settings.page:29(gui)
-#: C/calendar-layout-appointment-display.page:29(gui)
-msgid "Display"
-msgstr "Mostrar"
-
 #. TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655666 is fixed
 #: C/tasks-display-settings.page:29(p)
 msgid ""
-"The following task-related options are available under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>."
+"The following task-related options are available under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</"
+"gui><gui>Task List</gui></guiseq>."
 msgstr ""
 
 #: C/tasks-display-settings.page:32(p)
@@ -1877,44 +1322,29 @@ msgstr ""
 msgid "There are currently no \"recommended instructions\" for users."
 msgstr ""
 
-#: C/sync-with-other-devices.page:27(link)
-#, fuzzy
-msgid "SyncEvolution"
-msgstr "Evolution"
-
-#: C/sync-with-other-devices.page:27(link)
-#, fuzzy
-msgid "SyncML"
-msgstr "HotSync"
-
 #: C/sync-with-other-devices.page:27(p)
 msgid ""
-"Many distributions provide the application <placeholder-1/> that can be used "
-"in combination with devices that support <placeholder-2/>."
-msgstr ""
-
-#: C/sync-with-other-devices.page:29(link)
-msgid "ActiveSync protocol"
-msgstr ""
-
-#: C/sync-with-other-devices.page:29(link)
-msgid "list of collaborative software"
+"Many distributions provide the application <link href=\"http://syncevolution."
+"org/\">SyncEvolution</link> that can be used in combination with devices "
+"that support <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/"
+"SyncML\">SyncML</link>."
 msgstr ""
 
 #: C/sync-with-other-devices.page:29(p)
 msgid ""
 "Another option might be to use applications and devices that both support "
-"the <placeholder-1/>. A <placeholder-2/> is available on Wikipedia."
-msgstr ""
-
-#: C/sync-with-other-devices.page:31(link)
-msgid "GNOME's bug tracking system"
+"the <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/ActiveSync"
+"\">ActiveSync protocol</link>. A <link href=\"https://secure.wikimedia.org/"
+"wikipedia/en/wiki/List_of_collaborative_software\">list of collaborative "
+"software</link> is available on Wikipedia."
 msgstr ""
 
 #: C/sync-with-other-devices.page:31(p)
 msgid ""
 "If you can provide good practices or more information on this topic feel "
-"free to file a bug report in <placeholder-1/>."
+"free to file a bug report in <link href=\"https://bugzilla.gnome.org/"
+"enter_bug.cgi?product=evolution&amp;component=User%20Documentation\">GNOME's "
+"bug tracking system</link>."
 msgstr ""
 
 #: C/sync-with-other-devices.page:34(title)
@@ -1940,43 +1370,19 @@ msgstr ""
 msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
-#: C/sync-with-other-devices.page:38(gui)
-#, fuzzy
-msgid "GNOME Pilot Synchronization..."
-msgstr "_sincronización de GNOME Pilot…"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/pilot"
-msgstr "/dev/pilot"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/ttyS0"
-msgstr "/dev/ttyS0"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "/dev/ttyUSB1"
-msgstr "/dev/ttyUSB1"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "ttyUSB0"
-msgstr "ttyUSB0"
-
-#: C/sync-with-other-devices.page:38(file)
-msgid "ttyUSB1"
-msgstr "ttyUSB1"
-
 #: C/sync-with-other-devices.page:38(p)
 #, fuzzy
 msgid ""
 "If you have not used a handheld device with your computer before, you need "
-"to configure it via <guiseq><placeholder-1/><placeholder-2/></guiseq>. Make "
-"sure that you have read and write permissions on the device, which is "
-"normally in <placeholder-3/>. If that does not work, check in <placeholder-4/"
-"> if you have a serial connection, or in <placeholder-5/> for a USB "
-"connection. You can do this by becoming root user and adding your username "
-"to the group that owns this device node. For a USB device on sync, two "
-"device nodes are created, <placeholder-6/> and <placeholder-7/>. The second "
-"node is the one to be used in configuring the device."
+"to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot "
+"Synchronization...</gui></guiseq>. Make sure that you have read and write "
+"permissions on the device, which is normally in <file>/dev/pilot</file>. If "
+"that does not work, check in <file>/dev/ttyS0</file> if you have a serial "
+"connection, or in <file>/dev/ttyUSB1</file> for a USB connection. You can do "
+"this by becoming root user and adding your username to the group that owns "
+"this device node. For a USB device on sync, two device nodes are created, "
+"<file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to "
+"be used in configuring the device."
 msgstr ""
 "Si nunca antes utilizó un dispositivo de mano junto con su equipo, ejecute "
 "la herramienta Centro de control de GNOME pulsando Sistema &gt; Preferencias "
@@ -1993,31 +1399,15 @@ msgstr ""
 msgid "Selecting Conduits"
 msgstr "Seleccionar un conducto"
 
-#: C/sync-with-other-devices.page:42(gui)
-#, fuzzy
-msgid "Pilot Conduits"
-msgstr "Seleccionar un conducto"
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "EAddress"
-msgstr "EAddress"
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "ECalendar"
-msgstr "ECalendar"
-
-#: C/sync-with-other-devices.page:42(gui)
-msgid "ETodo"
-msgstr "ETodo"
-
 #: C/sync-with-other-devices.page:42(p)
 #, fuzzy
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
-"conduits you want under the <placeholder-1/> section. You can use conduits "
-"to synchronize data with several applications; the Evolution conduits are "
-"labeled <placeholder-2/> for the contacts in your address book; "
-"<placeholder-3/> for your calendar; and <placeholder-4/> for your task list."
+"conduits you want under the <gui>Pilot Conduits</gui> section. You can use "
+"conduits to synchronize data with several applications; the Evolution "
+"conduits are labeled <gui>EAddress</gui> for the contacts in your address "
+"book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for your "
+"task list."
 msgstr ""
 "Una vez que su equipo y el dispositivo Palm OS son capaces de comunicarse "
 "con fluidez, seleccione los <link linkend=\"conduit\">conductos</link> "
@@ -2027,20 +1417,10 @@ msgstr ""
 "libreta de direcciones, ECalendar, para el calendario y ETodo, para la lista "
 "de tareas."
 
-#: C/sync-with-other-devices.page:43(gui)
-#, fuzzy
-msgid "Enable"
-msgstr "Activado"
-
-#: C/sync-with-other-devices.page:43(gui)
-#: C/mail-access-gmail-pop-account.page:30(gui)
-msgid "Settings"
-msgstr "Ajustes"
-
 #: C/sync-with-other-devices.page:43(p)
 #, fuzzy
 msgid ""
-"Click <placeholder-1/>, then click <placeholder-2/> to change what the "
+"Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what the "
 "conduit does when activated. Your options can vary depending on the conduit, "
 "but typically they are as follows:"
 msgstr ""
@@ -2048,60 +1428,40 @@ msgstr ""
 "vez activado. Las opciones pueden variar en función del conducto, pero "
 "habitualmente son las siguientes:"
 
-#: C/sync-with-other-devices.page:45(gui)
-#, fuzzy
-msgid "Disabled"
-msgstr "Deshabilitado:"
-
 #: C/sync-with-other-devices.page:45(p)
 #, fuzzy
-msgid "<placeholder-1/>: Do nothing."
+msgid "<gui>Disabled</gui>: Do nothing."
 msgstr "gpg <placeholder-1/>"
 
-#: C/sync-with-other-devices.page:46(gui)
-#: C/sync-with-other-devices.page:50(gui)
-#, fuzzy
-msgid "Synchronize"
-msgstr "Sincronizar:"
-
 #: C/sync-with-other-devices.page:46(p)
 #, fuzzy
 msgid ""
-"<placeholder-1/>: Copy new data from the computer to the handheld, and from "
-"the handheld to the computer. Remove items that were on both systems but "
-"have been deleted on one."
+"<gui>Synchronize</gui>: Copy new data from the computer to the handheld, and "
+"from the handheld to the computer. Remove items that were on both systems "
+"but have been deleted on one."
 msgstr ""
 "Copia los datos nuevos del equipo y del dispositivo de mano en las dos "
 "direcciones. Elimina los elementos que se encontraban en los dos sistemas, "
 "pero que fueron eliminados en uno de ellos."
 
-#: C/sync-with-other-devices.page:47(gui)
-#, fuzzy
-msgid "Copy From Pilot"
-msgstr "Copiar desde Pilot:"
-
 #: C/sync-with-other-devices.page:47(p)
 #, fuzzy
 msgid ""
-"<placeholder-1/>: If there is any new data on the handheld device, copy it "
-"to the computer."
+"<gui>Copy From Pilot</gui>: If there is any new data on the handheld device, "
+"copy it to the computer."
 msgstr "Si el dispositivo de mano contiene datos nuevos, los copia al equipo."
 
-#: C/sync-with-other-devices.page:48(gui)
-#, fuzzy
-msgid "Copy To Pilot"
-msgstr "Copiar hacia Pilot:"
-
 #: C/sync-with-other-devices.page:48(p)
 #, fuzzy
-msgid "<placeholder-1/>: Copy new data from the computer to the handheld."
+msgid ""
+"<gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld."
 msgstr "Copia los datos nuevos del equipo hacia el dispositivo de mano."
 
 #: C/sync-with-other-devices.page:50(p)
 #, fuzzy
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
-"not sure, use <placeholder-1/>."
+"not sure, use <gui>Synchronize</gui>."
 msgstr ""
 "Seleccione el comportamiento de cada conducto elegido. Si no está seguro, "
 "use Sincronizar."
@@ -2118,28 +1478,21 @@ msgstr ""
 "Use el siguiente procedimiento para sincronizar los datos en su dispositivo "
 "Palm Os con sus datos almacenados en Evolution."
 
-#: C/sync-with-other-devices.page:57(file)
-msgid ".local/share/evolution"
-msgstr ".local/share/evolution"
-
 #: C/sync-with-other-devices.page:57(p)
 #, fuzzy
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
-"the <placeholder-1/> directory inside your home directory."
+"the <file>.local/share/evolution</file> directory inside your home directory."
 msgstr ""
 "Si quiere realizar una copia de seguridad de su información antes de "
 "sincronizar, haga una copia del directorio <command>.evolution</command> "
 "dentro de su directorio de inicio."
 
-#: C/sync-with-other-devices.page:58(gui)
-msgid "HotSync"
-msgstr "HotSync"
-
 #: C/sync-with-other-devices.page:58(p)
 #, fuzzy
 msgid ""
-"Put your handheld device in its cradle and press the <placeholder-1/> button."
+"Put your handheld device in its cradle and press the <gui style=\"button"
+"\">HotSync</gui> button."
 msgstr "Coloque el dispositivo de mano en su base y pulse el botón HotSync."
 
 #: C/sync-with-other-devices.page:59(p)
@@ -2164,14 +1517,8 @@ msgstr ""
 "Si siguió las instrucciones de configuración adecuadamente, los datos de su "
 "dispositivo Palm OS se podrán sincronizar con Evolution."
 
-#: C/searching-items.page:5(em) C/index.page:5(desc)
-#: C/exporting-data.page:5(em) C/exporting-data-mail.page:5(em)
-#: C/exporting-data-contacts.page:5(em) C/exporting-data-calendar.page:5(em)
-msgid "Evolution"
-msgstr "Evolution"
-
 #: C/searching-items.page:5(desc)
-msgid "Searching content and data within <placeholder-1/>."
+msgid "Searching content and data within <em>Evolution</em>."
 msgstr ""
 
 #: C/searching-items.page:18(title)
@@ -2187,25 +1534,15 @@ msgstr ""
 msgid "How to report bugs"
 msgstr ""
 
-#: C/problems-reporting-bugs.page:23(link)
-msgid "GNOME bug tracking system"
-msgstr ""
-
-#: C/problems-reporting-bugs.page:23(link)
-msgid "bug writing guidelines"
-msgstr ""
-
 #: C/problems-reporting-bugs.page:23(p)
 msgid ""
 "If you do not need help for configuration but you are sure that you have "
 "found a bug in the Evolution software, or if you want to request a feature "
-"you can file a bug report in the <placeholder-1/>. Note that this requires "
-"registration first. Please try to avoid filing duplicates and check the "
-"<placeholder-2/> first."
-msgstr ""
-
-#: C/problems-reporting-bugs.page:23(link)
-msgid "the bug tracker of your GNOME distribution"
+"you can file a bug report in the <link href=\"http://bugzilla.gnome.org"
+"\">GNOME bug tracking system</link>. Note that this requires registration "
+"first. Please try to avoid filing duplicates and check the <link href="
+"\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html\">bug writing "
+"guidelines</link> first."
 msgstr ""
 
 #: C/problems-reporting-bugs.page:23(p)
@@ -2213,7 +1550,9 @@ msgid ""
 "Also note that GNOME distributions sometimes introduce their own changes in "
 "Evolution that are not included in GNOME Evolution. This is hard to "
 "recognize for users but if you are aware of it please file a bug report in "
-"<placeholder-1/> instead."
+"<link xref=\"https://live.gnome.org/Bugsquad/TriageGuide/"
+"NonGnome#Bug_trackers_for_distributions\">the bug tracker of your GNOME "
+"distribution</link> instead."
 msgstr ""
 
 #: C/problems-getting-help.page:5(desc)
@@ -2221,19 +1560,15 @@ msgid "How to get help for problems."
 msgstr ""
 
 #: C/problems-getting-help.page:22(title)
-#: C/problems-debug-how-to.page:27(link)
 msgid "How to get help"
 msgstr ""
 
-#: C/problems-getting-help.page:24(link)
-#, fuzzy
-msgid "Evolution mailing list"
-msgstr "Lista de correo %s"
-
 #: C/problems-getting-help.page:24(p)
 msgid ""
-"To receive help on problems you can send an email to the <placeholder-1/> or "
-"ask a message in the IRC chat channel #evolution on the server irc.gimp.net."
+"To receive help on problems you can send an email to the <link href=\"http://"
+"mail.gnome.org/mailman/listinfo/evolution-list\">Evolution mailing list</"
+"link> or ask a message in the IRC chat channel #evolution on the server irc."
+"gimp.net."
 msgstr ""
 
 #: C/problems-debug-how-to.page:5(desc)
@@ -2253,20 +1588,17 @@ msgstr ""
 "Especifique la longitud de los mensajes de error que mostrar en la barra de "
 "estado."
 
-#: C/problems-debug-how-to.page:25(link)
-#, fuzzy
-msgid "Evolution project website"
-msgstr "Página web de Evolution"
-
 #: C/problems-debug-how-to.page:25(p)
 msgid ""
-"To further track down a problem, some debug options are listed on the "
-"<placeholder-1/>."
+"To further track down a problem, some debug options are listed on the <link "
+"href=\"http://projects.gnome.org/evolution/bugs.shtml\">Evolution project "
+"website</link>."
 msgstr ""
 
 #: C/problems-debug-how-to.page:27(p)
 msgid ""
-"To contact the Evolution community for help, please see <placeholder-1/>."
+"To contact the Evolution community for help, please see <link xref="
+"\"problems-getting-help\">How to get help</link>."
 msgstr ""
 
 #: C/organizing.page:5(desc)
@@ -2329,29 +1661,22 @@ msgstr "loonycookie@gmail.com"
 msgid "Minimizing Evolution to the system tray"
 msgstr "Configuración de Evolution para utilizar LDAP"
 
-#: C/minimize-to-system-tray.page:27(link)
-#, fuzzy
-msgid "notification area"
-msgstr "Mostrar icono en el área de _notificación"
-
 #: C/minimize-to-system-tray.page:27(p)
 msgid ""
-"GNOME, by default, has a <placeholder-1/> which includes an applet that "
-"informs users of any system updates, changes, or events. This includes the "
-"arrival of email messages on Evolution. You can refer to this built-in "
-"feature of GNOME for any email notifications."
-msgstr ""
-
-#: C/minimize-to-system-tray.page:29(link)
-msgid "Alltray"
+"GNOME, by default, has a <link xref=\"mail-received-notification"
+"\">notification area</link> which includes an applet that informs users of "
+"any system updates, changes, or events. This includes the arrival of email "
+"messages on Evolution. You can refer to this built-in feature of GNOME for "
+"any email notifications."
 msgstr ""
 
 #: C/minimize-to-system-tray.page:29(p)
 msgid ""
 "In GNOME version 2 you may modify the notification area and set it up to "
-"become a system tray by using external software such as <placeholder-1/> "
-"that might be available for installation in the software management tool of "
-"your distribution. This is not possible in GNOME 3 anymore."
+"become a system tray by using external software such as <link href=\"http://"
+"alltray.trausch.us/\"> Alltray</link> that might be available for "
+"installation in the software management tool of your distribution. This is "
+"not possible in GNOME 3 anymore."
 msgstr ""
 
 #: C/memos-usage.page:5(desc)
@@ -2384,15 +1709,10 @@ msgstr "Editar un contacto:"
 msgid "If you want to change a memo that already exists in your memo lists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/memos-usage-edit-memo.page:25(key)
-#, fuzzy
-msgid "Open Memo"
-msgstr "_Abrir nota"
-
 #: C/memos-usage-edit-memo.page:25(p)
 msgid ""
 "Double-click on the memo that you want to edit in the list of contacts, or "
-"right-click on the task and click <placeholder-1/>."
+"right-click on the task and click <key>Open Memo</key>."
 msgstr ""
 
 #: C/memos-usage-edit-memo.page:26(p)
@@ -2410,15 +1730,12 @@ msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 msgid "Deleting a Memo"
 msgstr "Borrar un elemento"
 
-#: C/memos-usage-delete-memo.page:22(gui)
-msgid "Delete Memo"
-msgstr "Eliminar nota"
-
 #: C/memos-usage-delete-memo.page:22(p)
 msgid ""
 "If you want to delete a memo in your memo lists, right-click on the memo and "
-"select <placeholder-1/>, or click on the task and click <placeholder-2/> in "
-"the tool bar, or click <guiseq><placeholder-3/><placeholder-4/></guiseq>."
+"select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> "
+"in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/memos-usage-add-memo.page:5(desc)
@@ -2431,18 +1748,15 @@ msgstr "Añadir una dirección de correo electrónico a su lista de correo basur
 msgid "Adding a Memo"
 msgstr "Añadir una columna:"
 
-#: C/memos-usage-add-memo.page:26(gui)
-msgid "Memo"
-msgstr "Nota"
-
-#: C/memos-usage-add-memo.page:26(key)
-#: C/mail-reading-keyboard-shortcuts.page:28(key)
-msgid "O"
-msgstr "O"
+#: C/memos-usage-add-memo.page:26(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or "
+"press <keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>."
+msgstr ""
 
 #: C/memos-usage-add-memo.page:27(p)
 #, fuzzy
-msgid "Select a memo list in the <placeholder-1/> dropdown list."
+msgid "Select a memo list in the <gui>List</gui> dropdown list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
 #: C/memos-usage-add-memo.page:28(p)
@@ -2458,7 +1772,8 @@ msgstr ""
 
 #: C/memos-usage-add-memo.page:34(p)
 msgid ""
-"You can also define a <placeholder-1/>, or a <placeholder-2/> for the memo, "
+"You can also define a <link xref=\"using-categories\">category</link>, or a "
+"<link xref=\"calendar-classifications\">classification</link> for the memo, "
 "or add an attachment."
 msgstr ""
 
@@ -2488,14 +1803,11 @@ msgstr ""
 msgid "To send a Shared Memo,"
 msgstr "Enviar una nota de recordatorio,"
 
-#: C/memos-usage-add-memo.page:43(gui)
-#, fuzzy
-msgid "Shared Memo"
-msgstr "Nota _compartida"
-
-#: C/memos-usage-add-memo.page:43(key)
-msgid "H"
-msgstr "H"
+#: C/memos-usage-add-memo.page:43(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, "
+"or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>."
+msgstr ""
 
 #: C/memos-usage-add-memo.page:44(p)
 msgid ""
@@ -2517,7 +1829,7 @@ msgstr ""
 #: C/memos-usage-add-memo.page:46(p)
 #, fuzzy
 msgid ""
-"Select the task list (under <placeholder-1/>) in which you would like to "
+"Select the task list (under <gui>List</gui>) in which you would like to "
 "create the entry."
 msgstr "Seleccione el grupo en el que quiere crear la entrada."
 
@@ -2559,46 +1871,20 @@ msgstr ""
 msgid "Message fonts are not the same fonts as in other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: C/mail-wrong-fonts-in-3-0.page:23(gui) C/mail-spam-settings.page:46(gui)
-#: C/mail-labels.page:35(gui) C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-change-time-format.page:20(gui)
-#: C/contacts-add-automatically.page:27(gui)
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-msgid "Message Fonts"
-msgstr "Tipografías del mensaje"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-#, fuzzy
-msgid "Use the same fonts as other applications"
-msgstr "_Usar las mismas tipografías que en otras aplicaciones"
-
 #: C/mail-wrong-fonts-in-3-0.page:23(p)
 msgid ""
-"It can happen that <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/></guiseq> is enabled but Evolution still "
-"uses different fonts than other parts of the system."
+"It can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail "
+"Preferences</gui><gui>Message Fonts</gui><gui>Use the same fonts as other "
+"applications</gui></guiseq> is enabled but Evolution still uses different "
+"fonts than other parts of the system."
 msgstr ""
 
-#: C/mail-wrong-fonts-in-3-0.page:25(link)
-#: C/mail-error-folder-mismatch.page:48(link)
-#: C/mail-error-failed-to-append-to-sent-folder.page:27(link)
-#, fuzzy
-msgid "bug report"
-msgstr "Envía un informe de fallos"
-
 #: C/mail-wrong-fonts-in-3-0.page:25(p)
-#: C/mail-error-failed-to-append-to-sent-folder.page:27(p)
 msgid ""
 "This bug is fixed in Evolution versions higher than 3.0.2 (stable series) "
 "and 3.1.3 (unstable development series). If this is not the case, please add "
-"a comment to the corresponding <placeholder-1/>."
+"a comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
+"show_bug.cgi?id=655002\">bug report</link>."
 msgstr ""
 
 #: C/mail-working-offline.page:5(desc)
@@ -2649,21 +1935,16 @@ msgstr "Para marcar una carpeta para su uso desconectado,"
 msgid "To mark a mail folder for offline use,"
 msgstr "Para marcar una carpeta para su uso desconectado,"
 
-#: C/mail-working-offline.page:33(gui)
-#, fuzzy
-msgid "Properties"
-msgstr "Propiedades:"
-
 #: C/mail-working-offline.page:33(p)
 #, fuzzy
-msgid "Right-click the folder, then click <placeholder-1/>."
+msgid "Right-click the folder, then click <gui>Properties</gui>."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la carpeta, después elija "
 "Propiedades."
 
-#: C/mail-working-offline.page:34(gui)
+#: C/mail-working-offline.page:34(p)
 #, fuzzy
-msgid "Copy folder content locally for offline operation"
+msgid "Click <gui>Copy folder content locally for offline operation</gui>."
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
 #: C/mail-working-offline.page:39(title)
@@ -2671,35 +1952,33 @@ msgstr "Copiar la li_breta localmente para trabajar desconectado"
 msgid "Syncing messages for offline usage"
 msgstr "_Descargar correos para trabajar sin conexión"
 
-#: C/mail-working-offline.page:40(gui)
-msgid "Work Offline"
-msgstr "Trabajar desconectado"
-
 #: C/mail-working-offline.page:40(p)
 #, fuzzy
 msgid ""
 "Your connection status is shown by the small icon in the lower left corner "
 "of the Evolution main window. When you are online, it displays two connected "
-"cables. When you go offline via clicking the icon or via "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>, the cables separate. You "
-"will be asked whether you want to go offline immediately or synchronize "
-"folders locally before you go offline."
+"cables. When you go offline via clicking the icon or via <guiseq><gui>File</"
+"gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked "
+"whether you want to go offline immediately or synchronize folders locally "
+"before you go offline."
 msgstr ""
 "El estado de la conexión lo muestra un icono en la esquina inferior "
 "izquierda de la ventana principal de Evolution. Cuando está conectado "
 "mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
 "desenchufados."
 
-#: C/mail-working-offline.page:41(gui)
-#, fuzzy
-msgid "Download Messages for Offline Usage"
-msgstr "_Descargar correos para trabajar sin conexión"
-
 #: C/mail-working-offline.page:41(p)
+#, fuzzy
+#| msgid ""
+#| "To download messages for offline operations, select File &gt; Download "
+#| "messages for offline."
 msgid ""
 "To download Messages for Offline Operations without immediately going "
-"offline, select <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+"offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline "
+"Usage</gui></guiseq>."
 msgstr ""
+"Para descargar los mensajes para operaciones en modo desconectado, "
+"seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
 
 #: C/mail-working-offline.page:45(title)
 msgid "Automatic Network State Handling"
@@ -2732,27 +2011,11 @@ msgid ""
 "hardcoded and cannot be changed."
 msgstr ""
 
-#: C/mail-word-wrap.page:23(gui) C/mail-composer-html-text.page:25(gui)
-#: C/mail-composer-html.page:27(gui)
-#, fuzzy
-msgid "Format"
-msgstr "Formato:"
-
-#: C/mail-word-wrap.page:23(gui)
-#, fuzzy
-msgid "Paragraph Style"
-msgstr "Paraguay"
-
-#: C/mail-word-wrap.page:23(gui)
-#, fuzzy
-msgid "Preformatted"
-msgstr "Ver _sin formato"
-
 #: C/mail-word-wrap.page:23(p)
 msgid ""
 "To avoid line breaks within a paragraph, mark the paragraph and choose "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> in the "
-"mail composer."
+"<guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></"
+"guiseq> in the mail composer."
 msgstr ""
 
 #: C/mail-vertical-view.page:5(desc)
@@ -2779,22 +2042,16 @@ msgstr ""
 "vista vertical le permite usar la anchura adicional en los monitores de "
 "pantalla panorámica."
 
-#: C/mail-vertical-view.page:26(gui) C/mail-vertical-view.page:30(gui)
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:80(gui)
-#: C/intro-main-window.page:156(gui)
-msgid "Preview"
-msgstr "Vista previa"
-
-#: C/mail-vertical-view.page:26(gui)
-#, fuzzy
-msgid "Vertical View"
-msgstr "Vista vertical:"
-
 #: C/mail-vertical-view.page:26(p)
+#, fuzzy
+#| msgid ""
+#| "To switch to vertical view, click View &gt; Preview &gt; Vertical View."
 msgid ""
-"To switch to vertical view, click <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+"To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</"
+"gui><gui>Vertical View</gui></guiseq>."
 msgstr ""
+"Para cambiar a la vista vertical, pulse Ver &gt; Vista previa &gt; Vista "
+"vertical."
 
 #: C/mail-vertical-view.page:28(p)
 msgid ""
@@ -2809,16 +2066,16 @@ msgstr ""
 "correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
 "en la segunda línea."
 
-#: C/mail-vertical-view.page:30(gui)
-#, fuzzy
-msgid "Classical View"
-msgstr "Vista clásica:"
-
 #: C/mail-vertical-view.page:30(p)
+#, fuzzy
+#| msgid ""
+#| "To switch to classical view, click View &gt; Preview &gt; Classical View."
 msgid ""
-"To switch back to classical view, click <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+"To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</"
+"gui><gui>Classical View</gui></guiseq>."
 msgstr ""
+"Para cambiar a la vista clásica, pulse Ver &gt; Vista previa &gt; Vista "
+"clásica."
 
 #: C/mail-usenet-subscriptions.page:5(desc)
 msgid "Subscribing to Usenet newsgroups."
@@ -2837,28 +2094,8 @@ msgstr ""
 "Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
 "grupo. Para suscribirse a un grupo de noticias:"
 
-#: C/mail-usenet-subscriptions.page:29(gui)
-#: C/mail-refresh-folders.page:22(gui) C/mail-imap-subscriptions.page:30(gui)
-#: C/mail-folders.page:36(gui) C/mail-delete-and-undelete.page:34(gui)
-#: C/deleting-emails.page:31(gui)
-msgid "Folder"
-msgstr "Carpeta"
-
-#: C/mail-usenet-subscriptions.page:29(gui)
-#: C/mail-imap-subscriptions.page:30(gui)
-#, fuzzy
-msgid "Subscriptions"
-msgstr "_Suscripciones…"
-
 #: C/mail-usenet-subscriptions.page:29(p) C/mail-imap-subscriptions.page:30(p)
-#: C/mail-composer-message-templates.page:41(p)
-#: C/mail-composer-message-templates.page:52(p)
-#: C/mail-composer-message-templates.page:77(p)
-#: C/mail-composer-custom-header-lines.page:31(p)
-#: C/mail-composer-custom-header-lines.page:42(p)
-#: C/mail-attachments-sending.page:46(p) C/backup-restore.page:28(p)
-#: C/backup-restore.page:37(p)
-msgid "Select <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>."
 msgstr ""
 
 #: C/mail-usenet-subscriptions.page:30(p) C/mail-imap-subscriptions.page:31(p)
@@ -2894,38 +2131,23 @@ msgid ""
 "Evolution."
 msgstr ""
 
-#: C/mail-two-trash-folders.page:24(gui) C/mail-two-trash-folders.page:26(gui)
-msgid "Trash"
-msgstr "Papelera"
-
-#: C/mail-two-trash-folders.page:24(link)
-#, fuzzy
-msgid "Search folder"
-msgstr "carpeta de búsqueda"
-
 #: C/mail-two-trash-folders.page:24(p)
 msgid ""
-"Evolution's <placeholder-1/> folder is a <placeholder-2/>. It does not "
-"really exist but simply displays all the messages that are marked for "
-"deletion in any folders of that account."
+"Evolution's <gui>Trash</gui> folder is a <link xref=\"mail-search-folders"
+"\">Search folder</link>. It does not really exist but simply displays all "
+"the messages that are marked for deletion in any folders of that account."
 msgstr ""
 
 #: C/mail-two-trash-folders.page:26(p)
 msgid ""
 "You can easily tell the two Trash folders apart by looking at their icons. "
-"The Evolution <placeholder-1/> folder has a special icon whereas the other "
+"The Evolution <gui>Trash</gui> folder has a special icon whereas the other "
 "physical Trash folder looks like any other folder."
 msgstr ""
 
-#: C/mail-two-trash-folders.page:29(gui) C/mail-spam-settings.page:47(gui)
-#: C/mail-spam-groupwise-mark-message.page:25(gui)
-#: C/mail-cannot-see.page:33(gui)
-msgid "Junk"
-msgstr "SPAM"
-
 #: C/mail-two-trash-folders.page:29(p)
 msgid ""
-"Note that the <placeholder-1/> folder is also a search folder and may also "
+"Note that the <gui>Junk</gui> folder is also a search folder and may also "
 "appear twice."
 msgstr ""
 
@@ -2934,9 +2156,6 @@ msgid "How to set up handling unwanted junk and spam mail."
 msgstr ""
 
 #: C/mail-spam-settings.page:28(title)
-#: C/mail-spam-groupwise-remove-from-list.page:26(gui)
-#: C/mail-spam-groupwise-manage-list.page:29(gui)
-#: C/mail-spam-groupwise-add-to-list.page:29(gui)
 msgid "Junk Mail Settings"
 msgstr "Configuración de SPAM"
 
@@ -2961,21 +2180,8 @@ msgstr ""
 msgid "To enable the plugins:"
 msgstr "Activar complementos anti SPAM:"
 
-#: C/mail-spam-settings.page:36(gui) C/mail-received-notification.page:27(gui)
-#: C/mail-imap-headers.page:27(gui)
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:77(gui)
-#: C/mail-composer-custom-header-lines.page:31(gui)
-#: C/mail-attachments-sending.page:46(gui)
-#: C/contacts-add-automatically.page:27(gui)
-#, fuzzy
-msgid "Plugins"
-msgstr "Com_plementos"
-
-#: C/mail-spam-settings.page:36(p) C/mail-filters.page:51(p)
-#: C/mail-filters.page:61(p) C/import-single-files.page:24(p)
-#: C/import-apps-outlook.page:59(p) C/import-apps-mozilla.page:24(p)
-msgid "Click <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+#: C/mail-spam-settings.page:36(p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
 msgstr ""
 
 #: C/mail-spam-settings.page:37(p)
@@ -2987,15 +2193,11 @@ msgstr ""
 "Seleccione los complementos de filtro de SPAM que quiera. Puede seleccionar "
 "tanto Bogofilter como SpamAssasin, o puede seleccionar los dos."
 
-#: C/mail-spam-settings.page:38(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:36(gui)
-#: C/mail-encryption-gpg-set-up.page:35(gui)
-#: C/mail-composer-html-table.page:29(gui)
-#: C/mail-composer-html-rule.page:28(gui)
-#: C/mail-composer-html-link.page:29(gui) C/calendar-free-busy.page:36(gui)
-#, fuzzy
-msgid "Close"
-msgstr "_Cerrar"
+#: C/mail-spam-settings.page:38(p) C/mail-composer-html-table.page:29(p)
+#: C/mail-composer-html-rule.page:28(p) C/mail-composer-html-link.page:29(p)
+#| msgid "Click Close."
+msgid "Click <gui>Close</gui>."
+msgstr "Pulse <gui>Cerrar</gui>."
 
 #: C/mail-spam-settings.page:42(title)
 msgid "Junk Mail Preferences"
@@ -3007,25 +2209,20 @@ msgid ""
 "Preferences:"
 msgstr ""
 
-#: C/mail-spam-settings.page:45(key)
-msgid "S"
-msgstr "S"
-
 #: C/mail-spam-settings.page:45(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/><placeholder-5/></keyseq>."
+"Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
 msgstr ""
 
 #: C/mail-spam-settings.page:46(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:34(p)
-#: C/contacts-usage-add-contact.page:36(p)
 #, fuzzy
-msgid "Select <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#| msgid "Select Mail Preferences."
+msgid "Select <gui>Mail Preferences</gui>."
+msgstr "Seleccione Opciones de correo."
 
 #: C/mail-spam-settings.page:47(p)
-msgid "Click on the <placeholder-1/> tab. Here, you can specify the following:"
+msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
 msgstr ""
 
 #: C/mail-spam-settings.page:49(p)
@@ -3062,92 +2259,12 @@ msgid ""
 "plugins are enabled."
 msgstr ""
 
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-read-receipts.page:39(gui) C/mail-imap-headers.page:38(gui)
-#: C/mail-filters.page:27(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:28(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:30(gui)
-#: C/mail-encryption-gpg-set-up.page:29(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui)
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-usenet-news.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-pop.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-novell-groupwise.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-mh-format-directories.page:25(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:25(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:25(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:25(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-account-manage-imap.page:25(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
-
-#: C/mail-spam-settings.page:60(gui)
-#: C/mail-receiving-options-usenet-news.page:34(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(gui)
-#: C/mail-receiving-options-pop.page:39(gui)
-#: C/mail-receiving-options-novell-groupwise.page:35(gui)
-#: C/mail-receiving-options-mh-format-directories.page:26(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:26(gui)
-#: C/mail-receiving-options-local-delivery.page:27(gui)
-#: C/mail-receiving-options-imap-plus.page:34(gui)
-#: C/mail-receiving-options-imap.page:34(gui)
-#: C/mail-receiving-options-exchange-mapi.page:33(gui)
-#: C/mail-receiving-options-evolution-exchange.page:36(gui)
-#: C/mail-filters.page:27(gui)
-msgid "Receiving Options"
-msgstr "Opciones de recepción"
-
 #: C/mail-spam-settings.page:60(p)
 msgid ""
 "The junk mail options discussed in this page refer only to POP and Local "
 "Delivery. For handling junk mails on IMAP, see the Evolution settings under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>."
 msgstr ""
 
 #: C/mail-spam.page:5(desc)
@@ -3209,29 +2326,16 @@ msgid ""
 "junk mail."
 msgstr ""
 
-#: C/mail-spam-marking.page:30(gui)
-#: C/mail-spam-groupwise-unmark-message.page:27(gui)
-#, fuzzy
-msgid "Mark as Not Junk"
-msgstr "Marcar como no _SPAM"
-
-#: C/mail-spam-marking.page:30(key)
-#: C/mail-spam-groupwise-unmark-message.page:27(key)
-#: C/mail-spam-groupwise-mark-message.page:25(key)
-#: C/calendar-layout-views.page:28(key)
-msgid "J"
-msgstr "J"
-
 #: C/mail-spam-marking.page:30(p)
 #, fuzzy
 msgid ""
 "If legitimate mail is incorrectly flagged, remove it from the Junk folder by "
-"right-clicking it and selecting <placeholder-1/> or pressing "
-"<keyseq><placeholder-2/><placeholder-3/><placeholder-4/></keyseq>. If "
-"Evolution misses junk mail, right-click the message, then click Mark as Junk "
-"or press <keyseq><placeholder-5/><placeholder-6/></keyseq>. When you correct "
-"it, the filter can recognize similar messages in the future, and becomes "
-"more accurate as time goes on."
+"right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution "
+"misses junk mail, right-click the message, then click Mark as Junk or press "
+"<keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct it, the "
+"filter can recognize similar messages in the future, and becomes more "
+"accurate as time goes on."
 msgstr ""
 "El filtro de correo basura puede aprender qué tipos de correo son legítimos "
 "y cuales no, si lo entrena. Cuando comience a usar el bloqueador de correo "
@@ -3243,15 +2347,11 @@ msgstr ""
 "como SPAM o Ctrl+J. Cuando lo corrija, el filtro puede reconocer mensajes "
 "similares para el futuro y se hace más preciso a medida que pasa el tiempo."
 
-#: C/mail-spam-marking.page:31(gui)
-msgid "Not Junk"
-msgstr "No es SPAM"
-
 #: C/mail-spam-marking.page:31(p)
 msgid ""
 "You can also flag mail as junk by selecting it and clicking the Junk icon in "
 "the menu bar; you can flag mail in the junk folder as \"Not Junk\" by "
-"selecting it and clicking the <placeholder-1/> icon."
+"selecting it and clicking the <gui>Not Junk</gui> icon."
 msgstr ""
 
 #: C/mail-spam-marking.page:32(p)
@@ -3277,8 +2377,9 @@ msgstr ""
 
 #: C/mail-spam-groupwise-unmark-message.page:27(p)
 msgid ""
-"Right-click the message, then click <placeholder-1/>, or select the message "
-"and press <keyseq><placeholder-2/><placeholder-3/><placeholder-4/></keyseq>."
+"Right-click the message, then click <gui>Mark as Not Junk</gui>, or select "
+"the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></"
+"keyseq>."
 msgstr ""
 
 #: C/mail-spam-groupwise-unmark-message.page:30(p)
@@ -3301,18 +2402,12 @@ msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:26(p)
 #, fuzzy
-msgid "Right-click a message, then click <placeholder-1/>."
+msgid "Right-click a message, then click <gui>Junk Mail Settings</gui>."
 msgstr "Pulse con el botón derecho, después pulse Opciones de spam."
 
-#: C/mail-spam-groupwise-remove-from-list.page:27(gui)
-#: C/mail-filters.page:63(gui)
-#, fuzzy
-msgid "Remove"
-msgstr "_Quitar"
-
 #: C/mail-spam-groupwise-remove-from-list.page:27(p)
 #, fuzzy
-msgid "Select the email address to remove, then click <placeholder-1/>."
+msgid "Select the email address to remove, then click <gui>Remove</gui>."
 msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
 #: C/mail-spam-groupwise-mark-message.page:5(desc)
@@ -3326,8 +2421,8 @@ msgstr "Marcar un mensaje como spam"
 #: C/mail-spam-groupwise-mark-message.page:25(p)
 #, fuzzy
 msgid ""
-"Select the message to mark as junk, then click the <placeholder-1/> button "
-"or press <keyseq><placeholder-2/><placeholder-3/></keyseq>."
+"Select the message to mark as junk, then click the <gui>Junk</gui> button or "
+"press <keyseq><key>Ctrl</key><key>J</key></keyseq>."
 msgstr ""
 "Seleccione el mensaje marcado como spam, después pulse el icono de SPAM o "
 "pulse Ctrl+J."
@@ -3350,16 +2445,20 @@ msgstr "Activar o desactivar su lista de correo basura"
 
 #: C/mail-spam-groupwise-manage-list.page:29(p)
 #: C/mail-spam-groupwise-add-to-list.page:29(p)
-msgid "Right-click on a message and select the <placeholder-1/> option."
+#, fuzzy
+msgid ""
+"Right-click on a message and select the <gui>Junk Mail Settings</gui> option."
 msgstr ""
+"Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
+"mensajes."
 
 #: C/mail-spam-groupwise-manage-list.page:30(p)
 #, fuzzy
 msgid "Specify whether you wish to Enable or Disable junk mail handling."
 msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
-#: C/mail-spam-groupwise-manage-list.page:31(p) C/mail-folders.page:38(p)
-msgid "Click on the <placeholder-1/> button."
+#: C/mail-spam-groupwise-manage-list.page:31(p)
+msgid "Click on the <gui style=\"button\">OK</gui> button."
 msgstr ""
 
 #: C/mail-spam-groupwise-add-to-list.page:5(desc)
@@ -3370,44 +2469,17 @@ msgstr ""
 msgid "Adding an Email Address to Your Junk List"
 msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
 
-#: C/mail-spam-groupwise-add-to-list.page:30(gui)
-msgid "Email"
-msgstr "Correo-e"
-
 #: C/mail-spam-groupwise-add-to-list.page:30(p)
 #, fuzzy
 msgid ""
-"Type in the email address you wish to block in the <placeholder-1/> field."
+"Type in the email address you wish to block in the <gui>Email</gui> field."
 msgstr ""
 "Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
 
-#: C/mail-spam-groupwise-add-to-list.page:31(gui)
-#: C/mail-several-pop-accounts.page:25(gui)
-#: C/mail-search-folders-add.page:27(gui)
-#: C/mail-search-folders-add.page:43(gui) C/mail-filters.page:37(gui)
-#: C/mail-attachments-sending.page:49(gui)
-#: C/mail-account-manage-usenet-news.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-account-manage-pop.page:24(gui)
-#: C/mail-account-manage-novell-groupwise.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(gui)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(gui)
-#: C/mail-account-manage-mh-format-directories.page:24(gui)
-#: C/mail-account-manage-maildir-format-directories.page:24(gui)
-#: C/mail-account-manage-local-delivery.page:24(gui)
-#: C/mail-account-manage-imap-plus.page:24(gui)
-#: C/mail-account-manage-imap.page:24(gui)
-#: C/mail-access-gmail-pop-account.page:39(gui) C/intro-first-run.page:84(gui)
-#: C/calendar-publishing.page:24(gui)
-#: C/calendar-meetings-sending-invitation.page:34(gui)
-#: C/calendar-free-busy.page:34(gui)
-#, fuzzy
-msgid "Add"
-msgstr "_Añadir"
-
 #: C/mail-spam-groupwise-add-to-list.page:31(p)
-msgid "Click <placeholder-1/> and then click on the <placeholder-2/> button."
+msgid ""
+"Click <gui style=\"button\">Add</gui> and then click on the <gui style="
+"\"button\">OK</gui> button."
 msgstr ""
 
 #: C/mail-spam-groupwise-add-to-list.page:34(p)
@@ -3437,32 +2509,25 @@ msgstr "Ordenación de la lista de mensajes"
 msgid "Evolution lets you organize your emails by letting you sort messages."
 msgstr ""
 
-#: C/mail-sorting-message-list.page:31(gui)
-#, fuzzy
-msgid "All Message Headers"
-msgstr "_Todas las cabeceras del mensaje"
-
 #: C/mail-sorting-message-list.page:31(p)
+#, fuzzy
+#| msgid ""
+#| "To look at the complete headers for a message, click View &gt; All "
+#| "Message Headers. To see all message data, click View &gt; Message Source."
 msgid ""
-"To view the complete headers for a message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. This will display the complete header data on "
-"the viewing pane."
+"To view the complete headers for a message, click <guiseq><gui>View</"
+"gui><gui>All Message Headers</gui></guiseq>. This will display the complete "
+"header data on the viewing pane."
 msgstr ""
-
-#: C/mail-sorting-message-list.page:32(gui)
-#, fuzzy
-msgid "Message Source"
-msgstr "Me_nsaje en bruto"
-
-#: C/mail-sorting-message-list.page:32(key)
-msgid "U"
-msgstr "U"
+"Para ver todas las cabeceras de un mensaje, pulse Ver &gt; Todas las "
+"cabeceras del mensaje. Para ver todos los datos del mensaje, pulse Ver &gt; "
+"Mensaje en bruto."
 
 #: C/mail-sorting-message-list.page:32(p)
 msgid ""
-"To view the message data, click on <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq> or press <keyseq><placeholder-3/><placeholder-4/></keyseq>. This "
-"will display the message data in a pop-up window."
+"To view the message data, click on <guiseq><gui>View</gui><gui>Message "
+"Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. "
+"This will display the message data in a pop-up window."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:35(title)
@@ -3470,16 +2535,11 @@ msgstr ""
 msgid "Sorting Mail in Email Threads"
 msgstr "Ordenar los correos por conversaciones"
 
-#: C/mail-sorting-message-list.page:36(gui)
-#, fuzzy
-msgid "Group By Threads"
-msgstr "A_grupar por conversaciones"
-
 #: C/mail-sorting-message-list.page:36(p)
 msgid ""
 "You can use a threaded message view to sort emails. To enable this feature, "
-"click on <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+"click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or "
+"press <keyseq><key>Ctrl</key><key>T</key></keyseq>."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:37(p)
@@ -3530,25 +2590,16 @@ msgstr ""
 msgid "Right-click on the header."
 msgstr "Pulse con el botón derecho en el calendario."
 
-#: C/mail-sorting-message-list.page:49(gui)
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Remove This Column"
-msgstr "Quitar esta c_olumna"
-
-#: C/mail-sorting-message-list.page:49(gui)
-msgid "Add a Column"
-msgstr "Añadir una columna"
-
 #: C/mail-sorting-message-list.page:49(p)
-msgid "Select the <placeholder-1/> or <placeholder-2/> option."
+msgid ""
+"Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:46(list)
-msgid ""
-"<item><placeholder-1/></item><item><placeholder-2/></item>S "
-"<item><placeholder-3/></item>"
+#, fuzzy
+msgid "<placeholder-1/><placeholder-2/>S <placeholder-3/>"
 msgstr ""
+"Pulse el botón Correo enviado para abrir la ventana de selección de carpeta."
 
 #: C/mail-sorting-message-list.page:52(p)
 msgid ""
@@ -3568,14 +2619,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-sorting-message-list.page:59(title)
-#: C/mail-sorting-message-list.page:60(gui)
-#: C/mail-sorting-message-list.page:63(gui)
 #, fuzzy
 msgid "Sort By"
 msgstr "_Ordenar por"
 
 #: C/mail-sorting-message-list.page:60(p)
-msgid "You can also sort email messages using the <placeholder-1/> list."
+msgid "You can also sort email messages using the <gui>Sort By</gui> list."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:62(p)
@@ -3589,11 +2638,8 @@ msgstr ""
 "mensajes."
 
 #: C/mail-sorting-message-list.page:63(p)
-#: C/mail-sorting-message-list.page:93(p)
-#: C/mail-sorting-message-list.page:102(p)
-#: C/mail-sorting-message-list.page:111(p)
 #, fuzzy
-msgid "Select the <placeholder-1/> option."
+msgid "Select the <gui>Sort By</gui> option."
 msgstr "Seleccione las opciones apropiadas."
 
 #: C/mail-sorting-message-list.page:63(p)
@@ -3601,11 +2647,10 @@ msgid "This brings up this list of criteria for sorting email messages:"
 msgstr ""
 
 #: C/mail-sorting-message-list.page:65(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
-#: C/mail-sorting-message-list.page:66(p) C/mail-labels.page:35(gui)
+#: C/mail-sorting-message-list.page:66(p)
 msgid "Labels"
 msgstr "Etiquetas"
 
@@ -3614,13 +2659,10 @@ msgid "Recipients"
 msgstr "Destinatarios"
 
 #: C/mail-sorting-message-list.page:68(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Sender"
 msgstr "Remitente"
 
 #: C/mail-sorting-message-list.page:69(p)
-#: C/calendar-usage-add-appointment.page:27(gui)
-#: C/calendar-meetings-sending-invitation.page:37(gui)
 msgid "Location"
 msgstr "Lugar"
 
@@ -3649,25 +2691,18 @@ msgid "Received"
 msgstr "Recibido"
 
 #: C/mail-sorting-message-list.page:76(p)
-#: C/mail-change-time-format.page:20(gui)
-#: C/calendar-layout-appointment-display.page:50(gui)
 msgid "Date"
 msgstr "Fecha"
 
 #: C/mail-sorting-message-list.page:77(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Subject"
 msgstr "Asunto"
 
 #: C/mail-sorting-message-list.page:78(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "From"
 msgstr "De"
 
 #: C/mail-sorting-message-list.page:79(p)
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#: C/mail-attachments-sending.page:30(gui)
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -3676,7 +2711,6 @@ msgid "Flagged"
 msgstr "Marcado"
 
 #: C/mail-sorting-message-list.page:81(p)
-#: C/calendar-meetings-sending-invitation.page:35(gui)
 msgid "Status"
 msgstr "Estado"
 
@@ -3690,11 +2724,15 @@ msgid "Select the option you wish to use in sorting email messages."
 msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
 #: C/mail-sorting-message-list.page:90(title)
-#: C/mail-sorting-message-list.page:93(gui)
 #, fuzzy
 msgid "Sort Ascending"
 msgstr "Orden ascendente:"
 
+#: C/mail-sorting-message-list.page:93(p)
+#, fuzzy
+msgid "Select the <gui>Sort Ascending</gui> option."
+msgstr "Seleccione las opciones apropiadas."
+
 #: C/mail-sorting-message-list.page:95(p)
 #, fuzzy
 msgid "The messages will be displayed with the most recent at the bottom."
@@ -3703,11 +2741,15 @@ msgstr ""
 "estado."
 
 #: C/mail-sorting-message-list.page:99(title)
-#: C/mail-sorting-message-list.page:102(gui)
 #, fuzzy
 msgid "Sort Descending"
 msgstr "Orden descendente:"
 
+#: C/mail-sorting-message-list.page:102(p)
+#, fuzzy
+msgid "Select the <gui>Sort Descending</gui> option."
+msgstr "Seleccione las opciones apropiadas."
+
 #: C/mail-sorting-message-list.page:104(p)
 #, fuzzy
 msgid "The messages will be displayed with the most recent at the top."
@@ -3716,11 +2758,15 @@ msgstr ""
 "fecha actual del momento del filtrado."
 
 #: C/mail-sorting-message-list.page:108(title)
-#: C/mail-sorting-message-list.page:111(gui)
 #, fuzzy
 msgid "Unsort"
 msgstr "Desordenar:"
 
+#: C/mail-sorting-message-list.page:111(p)
+#, fuzzy
+msgid "Select the <gui>Unsort</gui> option."
+msgstr "Seleccione las opciones apropiadas."
+
 #: C/mail-sorting-message-list.page:113(p)
 #, fuzzy
 msgid ""
@@ -3745,28 +2791,14 @@ msgid ""
 "pane. Evolution only has one unique inbox for incoming email."
 msgstr ""
 
-#: C/mail-several-pop-accounts.page:25(link)
-#, fuzzy
-msgid "creating folders"
-msgstr "Creando carpeta «%s»"
-
-#: C/mail-several-pop-accounts.page:25(link)
-#, fuzzy
-msgid "creating filters"
-msgstr "Borrar filtros"
-
-#: C/mail-several-pop-accounts.page:25(gui)
-#, fuzzy
-msgid "Message Filters..."
-msgstr "Filtros de mensajes"
-
 #: C/mail-several-pop-accounts.page:25(p)
 msgid ""
 "You can either use IMAP instead of POP, or move incoming emails into "
-"different folders by <placeholder-1/> and <placeholder-2/>: Create a new "
-"folder and create two subfolders (for incoming and for sent mail of that "
-"account). Now set up an incoming filter via <guiseq><placeholder-3/"
-"><placeholder-4/><placeholder-5/></guiseq> to move incoming mail to the "
+"different folders by <link xref=\"mail-folders\">creating folders</link> and "
+"<link xref=\"mail-filters\">creating filters</link>: Create a new folder and "
+"create two subfolders (for incoming and for sent mail of that account). Now "
+"set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters..."
+"</gui><gui style=\"button\">Add</gui></guiseq> to move incoming mail to the "
 "incoming folder by filtering on the recipient's address and set up an "
 "outgoing filter to move outgoing mail to the sent folder by filtering on the "
 "sender's address."
@@ -3784,20 +2816,10 @@ msgstr "Envío de invitaciones por correo"
 msgid "SMTP sending options"
 msgstr "Opciones de envío"
 
-#: C/mail-sending-options-smtp.page:30(gui)
-#: C/mail-receiving-options-usenet-news.page:27(gui)
-#: C/mail-receiving-options-pop.page:31(gui)
-#: C/mail-receiving-options-novell-groupwise.page:28(gui)
-#: C/mail-receiving-options-imap-plus.page:27(gui)
-#: C/mail-receiving-options-imap.page:27(gui)
-#: C/mail-receiving-options-exchange-mapi.page:25(gui)
-msgid "Server"
-msgstr "Servidor"
-
 #: C/mail-sending-options-smtp.page:30(p)
 msgid ""
-"Enter the address of your mail server for sending mail in the <placeholder-1/"
-"> field and select if the server requires authentication (entering a "
+"Enter the address of your mail server for sending mail in the <gui>Server</"
+"gui> field and select if the server requires authentication (entering a "
 "username and a password)."
 msgstr ""
 
@@ -3827,73 +2849,25 @@ msgstr ""
 "Si seleccionó que su servidor requiere autenticación, necesita proporcionar "
 "la siguiente información:"
 
-#: C/mail-sending-options-smtp.page:34(gui)
-#: C/mail-receiving-options-usenet-news.page:30(gui)
-#: C/mail-receiving-options-pop.page:34(gui)
-#: C/mail-receiving-options-novell-groupwise.page:31(gui)
-#: C/mail-receiving-options-imap-plus.page:30(gui)
-#: C/mail-receiving-options-imap.page:30(gui)
-#: C/mail-receiving-options-exchange-mapi.page:28(gui)
-#: C/mail-receiving-options-evolution-exchange.page:32(gui)
-#, fuzzy
-msgid "Check for Supported Types"
-msgstr "C_omprobar tipos soportados"
-
 #: C/mail-sending-options-smtp.page:34(p)
 #, fuzzy
 msgid ""
 "Select the authentication type in the Authentication list, or click "
-"<placeholder-1/> to have Evolution check. Some servers do not support this, "
-"so clicking this button is not a guarantee that available mechanisms "
-"actually work."
+"<gui>Check for Supported Types</gui> to have Evolution check. Some servers "
+"do not support this, so clicking this button is not a guarantee that "
+"available mechanisms actually work."
 msgstr ""
 "Pulse «Comprobar tipos soportados» para que Evolution compruebe qué tipos "
 "están soportados. Algunos servidores no anuncian los mecanismos de "
 "autenticación que soportan, así que pulsar este botón no garantiza que el "
 "mecanismo disponible funcione realmente."
 
-#: C/mail-sending-options-smtp.page:42(link)
-#: C/mail-receiving-options-usenet-news.page:43(link)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:33(link)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(link)
-#: C/mail-receiving-options-pop.page:48(link)
-#: C/mail-receiving-options-novell-groupwise.page:45(link)
-#: C/mail-receiving-options-mh-format-directories.page:31(link)
-#: C/mail-receiving-options-maildir-format-directories.page:32(link)
-#: C/mail-receiving-options-local-delivery.page:32(link)
-#: C/mail-receiving-options-imap-plus.page:45(link)
-#: C/mail-receiving-options-imap.page:45(link)
-#: C/mail-receiving-options-exchange-mapi.page:40(link)
-#: C/mail-receiving-options-evolution-exchange.page:47(link)
-#: C/intro-first-run.page:32(link) C/intro-first-run.page:45(link)
-#: C/intro-first-run.page:46(link) C/intro-first-run.page:48(link)
-#: C/intro-first-run.page:49(link) C/intro-first-run.page:50(link)
-#: C/intro-first-run.page:59(link) C/intro-first-run.page:62(link)
-#: C/intro-first-run.page:65(link) C/intro-first-run.page:73(link)
-#: C/intro-first-run.page:75(link) C/intro-first-run.page:77(link)
-#: C/intro-first-run.page:79(link) C/intro-first-run.page:81(link)
-#: C/intro-first-run.page:93(link)
-#, fuzzy
-msgid "here"
-msgstr "Dónde:"
-
 #. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
 #: C/mail-sending-options-smtp.page:42(p)
-#: C/mail-receiving-options-usenet-news.page:43(p)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:33(p)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(p)
-#: C/mail-receiving-options-pop.page:48(p)
-#: C/mail-receiving-options-novell-groupwise.page:45(p)
-#: C/mail-receiving-options-mh-format-directories.page:31(p)
-#: C/mail-receiving-options-maildir-format-directories.page:32(p)
-#: C/mail-receiving-options-local-delivery.page:32(p)
-#: C/mail-receiving-options-imap-plus.page:45(p)
-#: C/mail-receiving-options-imap.page:45(p)
-#: C/mail-receiving-options-exchange-mapi.page:40(p)
-#: C/mail-receiving-options-evolution-exchange.page:47(p)
 msgid ""
-"If you came to this page from the first-run wizard help page, click "
-"<placeholder-1/> to continue with the next step."
+"If you came to this page from the first-run wizard help page, click <link "
+"xref=\"intro-first-run#account-information\">here</link> to continue with "
+"the next step."
 msgstr ""
 
 #: C/mail-send-and-receive.page:5(desc)
@@ -3905,15 +2879,11 @@ msgstr ""
 msgid "Sending and receiving mail"
 msgstr "Enviar y recibir correo"
 
-#: C/mail-send-and-receive.page:22(link)
-#, fuzzy
-msgid "Composing mail"
-msgstr "Importando buzón de correo"
-
 #: C/mail-send-and-receive.page:22(p)
 msgid ""
 "This section refers to receiving mail and sending written emails. For "
-"writing a new message, please refer to the <placeholder-1/> section."
+"writing a new message, please refer to the <link type=\"guide\" xref="
+"\"index#mail-composing\">Composing mail</link> section."
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:5(desc)
@@ -3926,28 +2896,20 @@ msgstr "Enviar y recibir correo"
 msgid "Manually send and receive message"
 msgstr "Falló al obtener los mensajes."
 
-#: C/mail-send-and-receive-manual.page:21(gui)
-#: C/mail-send-and-receive-manual.page:22(gui)
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: C/mail-send-and-receive-manual.page:21(key)
-msgid "F9"
-msgstr "F9"
-
 #: C/mail-send-and-receive-manual.page:21(p)
 msgid ""
 "To receive new messages from the mail server and to send messages you have "
-"written that are in the local Outbox, click the <placeholder-1/> button in "
-"the toolbar, or press <placeholder-2/>, or choose <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq> from the main menu."
+"written that are in the local Outbox, click the <gui style=\"button\">Send / "
+"Receive</gui> button in the toolbar, or press <key>F9</key>, or choose "
+"<guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main "
+"menu."
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:22(p)
 msgid ""
 "To send and receive only for one of your mail accounts, or to only send or "
-"only receive, click the small down-arrow next to the <placeholder-1/> button "
-"and choose the corresponding option."
+"only receive, click the small down-arrow next to the <gui style=\"button"
+"\">Send / Receive</gui> button and choose the corresponding option."
 msgstr ""
 
 #: C/mail-send-and-receive-automatically.page:5(desc)
@@ -3959,46 +2921,14 @@ msgstr ""
 msgid "Automatically check for new mail"
 msgstr "Lanzar automáticamente al editar un correo nuevo"
 
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:36(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:29(gui)
-#: C/mail-receiving-options-pop.page:41(gui)
-#: C/mail-receiving-options-novell-groupwise.page:37(gui)
-#: C/mail-receiving-options-mh-format-directories.page:28(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:28(gui)
-#: C/mail-receiving-options-local-delivery.page:29(gui)
-#: C/mail-receiving-options-imap-plus.page:36(gui)
-#: C/mail-receiving-options-imap.page:37(gui)
-#: C/mail-receiving-options-exchange-mapi.page:35(gui)
-#: C/mail-receiving-options-evolution-exchange.page:38(gui)
-#, fuzzy
-msgid "Check for new messages every ... minutes"
-msgstr "Comprobar los mensajes nuevos cada x minutos"
-
-#: C/mail-send-and-receive-automatically.page:21(gui)
-#: C/mail-receiving-options-usenet-news.page:25(gui)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:22(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:22(gui)
-#: C/mail-receiving-options-pop.page:29(gui)
-#: C/mail-receiving-options-novell-groupwise.page:26(gui)
-#: C/mail-receiving-options-mh-format-directories.page:22(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:22(gui)
-#: C/mail-receiving-options-local-delivery.page:22(gui)
-#: C/mail-receiving-options-imap-plus.page:25(gui)
-#: C/mail-receiving-options-imap.page:25(gui)
-#: C/mail-receiving-options-exchange-mapi.page:22(gui)
-#: C/mail-receiving-options-evolution-exchange.page:25(gui)
-#: C/intro-first-run.page:36(title)
-msgid "Receiving Email"
-msgstr "Recepción de correo"
-
 #: C/mail-send-and-receive-automatically.page:21(p)
 msgid ""
 "If you want Evolution to check automatically for new messages, enable the "
-"option <placeholder-1/> in the <placeholder-2/> page of the mail account "
-"settings (accessible via <guiseq><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>) and select the "
-"frequency in minutes."
+"option <gui>Check for new messages every ... minutes</gui> in the "
+"<gui>Receiving Email</gui> page of the mail account settings (accessible via "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Receiving Email</gui></guiseq>) and select "
+"the frequency in minutes."
 msgstr ""
 
 #: C/mail-searching.page:5(desc)
@@ -4036,16 +2966,12 @@ msgid ""
 "subjects and addresses and scope will be \"Current folder\"."
 msgstr ""
 
-#: C/mail-searching.page:40(link)
-msgid "Using Search Folders"
-msgstr "Usar las carpetas de búsqueda"
-
 #: C/mail-searching.page:40(p)
 #, fuzzy
 msgid ""
 "If you search for messages that are not in the same folder rather often you "
-"might want to create a search folder instead; see <placeholder-1/> for more "
-"detail."
+"might want to create a search folder instead; see <link xref=\"mail-search-"
+"folders\">Using Search Folders</link> for more detail."
 msgstr ""
 "Evolution le muestra los resultados en la lista de mensajes. Puede querer "
 "crear una carpeta de búsqueda en su lugar, para obtener más información vea "
@@ -4087,17 +3013,11 @@ msgid ""
 "that the list of emails in the folder is not up-to-date."
 msgstr ""
 
-#: C/mail-search-folders-refresh.page:28(gui)
-#: C/mail-refresh-folders.page:22(gui)
-#, fuzzy
-msgid "Refresh"
-msgstr "Actualizar"
-
 #: C/mail-search-folders-refresh.page:28(p)
 msgid ""
 "You can get an updated view of the search folder either by switching to "
 "another folder and then back again, or by right-clicking on the search "
-"folder and choosing <placeholder-1/>."
+"folder and choosing <gui>Refresh</gui>."
 msgstr ""
 
 #: C/mail-search-folders.page:5(desc)
@@ -4111,37 +3031,23 @@ msgstr ""
 msgid "Using Search folders"
 msgstr "Usar las carpetas de búsqueda"
 
-#: C/mail-search-folders.page:24(link)
-#: C/mail-search-folders-conditions.page:52(link) C/mail-folders.page:55(link)
-#: C/mail-filters-conditions.page:52(link)
-#, fuzzy
-msgid "filters"
-msgstr "filtro"
-
 #: C/mail-search-folders.page:24(p)
 msgid ""
-"If <placeholder-1/> are not flexible enough, or you find yourself performing "
-"the same <placeholder-2/> again and again, consider a search folder."
+"If <link xref=\"mail-filters\">filters</link> are not flexible enough, or "
+"you find yourself performing the same <link xref=\"mail-searching\">search</"
+"link> again and again, consider a search folder."
 msgstr ""
 
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "folder"
-msgstr "Carpeta:"
-
-#: C/mail-search-folders.page:26(link)
-msgid "filter"
-msgstr "filtro"
-
 #: C/mail-search-folders.page:26(p)
 #, fuzzy
 msgid ""
-"A search folder looks like a <placeholder-1/>, it acts like a <placeholder-2/"
-">, and you set it up like a <placeholder-3/>. While a conventional folder "
-"actually contains messages, a search folder is a view of messages that might "
-"be in several different folders. The messages it contains are determined on "
-"the fly using a set of criteria that you have chosen when setting up the "
-"search folder."
+"A search folder looks like a <link xref=\"mail-folders\">folder</link>, it "
+"acts like a <link xref=\"mail-searching\">search</link>, and you set it up "
+"like a <link xref=\"mail-filters\">filter</link>. While a conventional "
+"folder actually contains messages, a search folder is a view of messages "
+"that might be in several different folders. The messages it contains are "
+"determined on the fly using a set of criteria that you have chosen when "
+"setting up the search folder."
 msgstr ""
 "Una carpeta de búsqueda es realmente un híbrido de todas las demás "
 "herramientas de organización: es parecido a una carpeta, opera como una "
@@ -4157,15 +3063,11 @@ msgid ""
 "are received or message are deleted."
 msgstr ""
 
-#: C/mail-search-folders.page:30(gui) C/mail-search-folders.page:32(gui)
-msgid "Unmatched"
-msgstr "No coincidente"
-
 #: C/mail-search-folders.page:30(p)
 #, fuzzy
 msgid ""
-"The <placeholder-1/> search folder is the opposite of other search folders: "
-"it displays all messages that do not appear in other search folders."
+"The <gui>Unmatched</gui> search folder is the opposite of other search "
+"folders: it displays all messages that do not appear in other search folders."
 msgstr ""
 "La carpeta de búsqueda no coincidente es el espejo de todas las demás "
 "carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
@@ -4175,10 +3077,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "If you use remote email storage like IMAP, and have created search folders "
-"to search through them, the <placeholder-1/> search folder also searches the "
-"remote folders. If you do not create any search folders that search remote "
-"mail stores, the <placeholder-2/> search folder does not search in them "
-"either."
+"to search through them, the <gui>Unmatched</gui> search folder also searches "
+"the remote folders. If you do not create any search folders that search "
+"remote mail stores, the <gui>Unmatched</gui> search folder does not search "
+"in them either."
 msgstr ""
 "Si usa un sistema de almacenamiento remoto como IMAP o Microsoft Exchange, y "
 "ha creado carpetas de búsqueda en ellos, la carpeta de búsqueda no "
@@ -4259,7 +3161,7 @@ msgstr ""
 "La dirección de correo electrónico del remitente o el nombre del remitente."
 
 #: C/mail-search-folders-conditions.page:41(p)
-#: C/mail-filters-conditions.page:41(p) C/mail-composer-reply.page:27(gui)
+#: C/mail-filters-conditions.page:41(p)
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -4274,17 +3176,12 @@ msgstr "La línea asunto del mensaje."
 msgid "Specific Header:"
 msgstr "Cabecera específica:"
 
-#: C/mail-search-folders-conditions.page:45(link)
-#: C/mail-filters-conditions.page:45(link)
-#, fuzzy
-msgid "custom ones"
-msgstr "Usar tipografía personalizada"
-
 #: C/mail-search-folders-conditions.page:45(p)
 #: C/mail-filters-conditions.page:45(p)
-#, fuzzy
-msgid "Any header including <placeholder-1/>."
-msgstr "Cualquier cabecera, incluyendo las personalizadas."
+msgid ""
+"Any header including <link xref=\"mail-composer-custom-header-lines\">custom "
+"ones</link>."
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:46(p)
 #: C/mail-filters-conditions.page:46(p)
@@ -4326,7 +3223,8 @@ msgstr "Expresión:"
 #, fuzzy
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
-"in the Scheme language used to define <placeholder-1/> in Evolution."
+"in the Scheme language used to define <link xref=\"mail-filters\">filters</"
+"link> in Evolution."
 msgstr ""
 "(Sólo para programadores) busca un mensaje que corresponda a una expresión "
 "escrita en lenguaje Scheme, usado para definir filtros en Evolution."
@@ -4377,18 +3275,13 @@ msgstr ""
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: C/mail-search-folders-conditions.page:61(link)
-#: C/mail-filters-conditions.page:61(link)
-#, fuzzy
-msgid "labels"
-msgstr "Etiquetas"
-
 #: C/mail-search-folders-conditions.page:61(p)
 #: C/mail-filters-conditions.page:61(p)
 #, fuzzy
 msgid ""
-"Messages can have <placeholder-1/> of Important, Work, Personal, To Do, or "
-"Later. You can set labels with other filters or manually."
+"Messages can have <link xref=\"mail-labels\">labels</link> of Important, "
+"Work, Personal, To Do, or Later. You can set labels with other filters or "
+"manually."
 msgstr ""
 "Los mensajes pueden tener las etiquetas Importante, Trabajo, personal, "
 "Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
@@ -4446,23 +3339,17 @@ msgstr ""
 msgid "Follow Up:"
 msgstr "Seguimiento:"
 
-#: C/mail-search-folders-conditions.page:73(link)
-#: C/mail-filters-conditions.page:73(link)
-#, fuzzy
-msgid "flagged for follow-up"
-msgstr "Marcar los mensajes seleccionados para seguimiento"
-
 #: C/mail-search-folders-conditions.page:73(p)
 #: C/mail-filters-conditions.page:73(p)
-#, fuzzy
-msgid "Checks whether the message is <placeholder-1/>."
-msgstr "Comprueba si el mensaje está marcado para seguimiento."
+msgid ""
+"Checks whether the message is <link xref=\"mail-follow-up-flag\">flagged for "
+"follow-up</link>."
+msgstr ""
 
 #: C/mail-search-folders-conditions.page:75(p)
 #: C/mail-filters-conditions.page:75(p)
-#, fuzzy
 msgid "Completed On:"
-msgstr "Completado en"
+msgstr "Completado en:"
 
 #: C/mail-search-folders-conditions.page:77(p)
 #: C/mail-filters-conditions.page:77(p)
@@ -4500,16 +3387,12 @@ msgstr ""
 msgid "Regex Match:"
 msgstr "Coincide con la expresión regular:"
 
-#: C/mail-search-folders-conditions.page:84(link)
-#: C/mail-filters-conditions.page:84(link)
-msgid "regex"
-msgstr ""
-
 #: C/mail-search-folders-conditions.page:84(p)
 #: C/mail-filters-conditions.page:84(p)
 #, fuzzy
 msgid ""
-"(For programmers only) If you know your way around a <placeholder-1/>, or "
+"(For programmers only) If you know your way around a <link href=\"https://"
+"secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">regex</link>, or "
 "regular expression, this option allows you to search for complex patterns of "
 "letters, so that you can find, for example, all words that start with a and "
 "end with m, and are between six and fifteen letters long, or all messages "
@@ -4545,45 +3428,22 @@ msgstr "Configurando carpeta de búsqueda: %s"
 msgid "Creating A Search Folder"
 msgstr "Crear una carpeta de búsqueda"
 
-#: C/mail-search-folders-add.page:26(gui)
-msgid "Search Folders"
-msgstr "Carpetas de búsqueda"
-
-#: C/mail-search-folders-add.page:26(gui) C/mail-follow-up-flag.page:31(gui)
-#: C/mail-follow-up-flag.page:43(gui) C/mail-folders.page:50(gui)
-#: C/mail-filters.page:29(gui) C/mail-filters.page:36(gui)
-#: C/mail-duplicates.page:28(gui) C/mail-composer-forward.page:31(gui)
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#: C/deleting-emails.page:36(gui)
-#, fuzzy
-msgid "Message"
-msgstr "Mensaje"
-
-#: C/mail-search-folders-add.page:26(gui) C/mail-filters.page:36(gui)
-#, fuzzy
-msgid "Create Rule"
-msgstr "Crear _regla"
-
-#: C/mail-search-folders-add.page:26(gui)
-#, fuzzy
-msgid "Create Search Folder From Search..."
-msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
-
 #: C/mail-search-folders-add.page:26(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, or click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq> and select the criterion "
-"the search folder will be based on, or if you have run a search, click "
-"<guiseq><placeholder-5/><placeholder-6/></guiseq>."
+"Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click "
+"<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
+"criterion the search folder will be based on, or if you have run a search, "
+"click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</"
+"gui></guiseq>."
 msgstr ""
 
-#: C/mail-search-folders-add.page:28(gui) C/mail-filters.page:38(gui)
-msgid "Rule name"
-msgstr "Nombre de la regla"
+#: C/mail-search-folders-add.page:27(p) C/mail-filters.page:37(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Pulse <gui style=\"button\">Añadir</gui>."
 
 #: C/mail-search-folders-add.page:28(p) C/mail-filters.page:38(p)
 #, fuzzy
-msgid "Enter a name in the <placeholder-1/> field."
+msgid "Enter a name in the <gui>Rule name</gui> field."
 msgstr "Introduzca el límite en el campo."
 
 #: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
@@ -4592,39 +3452,27 @@ msgid ""
 "which part of the message will be checked and then define the comparison."
 msgstr ""
 
-#: C/mail-search-folders-add.page:29(link)
+#: C/mail-search-folders-add.page:29(p)
 #, fuzzy
-msgid "Available Search Folder conditions"
-msgstr "Activar las Carpetas de _búsqueda"
-
-#: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
-#, fuzzy
-msgid "For more information on the available conditions see <placeholder-1/>."
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"search-folders-conditions\">Available Search Folder conditions</link>."
 msgstr ""
 "Para obtener más información acerca de los recordatorios, vea <link linkend="
 "\"bshly4v\">Recordatorios</link>."
 
-#: C/mail-search-folders-add.page:30(gui) C/mail-filters.page:40(gui)
-#, fuzzy
-msgid "Find items"
-msgstr "_Buscar elementos:"
-
 #: C/mail-search-folders-add.page:30(p) C/mail-filters.page:40(p)
 msgid ""
-"If you want to define multiple conditions, define under <placeholder-1/> if "
-"any or if all conditions have to apply, and click <placeholder-2/> and "
-"repeat the previous step."
+"If you want to define multiple conditions, define under <gui>Find items</"
+"gui> if any or if all conditions have to apply, and click <gui style=\"button"
+"\">Add Condition</gui> and repeat the previous step."
 msgstr ""
 
-#: C/mail-search-folders-add.page:31(gui)
-msgid "Search Folder Sources"
-msgstr "Orígenes de las carpetas de búsqueda"
-
 #: C/mail-search-folders-add.page:31(p)
 #, fuzzy
 msgid ""
 "Select which folders will be used for the search folder in the section "
-"<placeholder-1/>. Options are:"
+"<gui>Search Folder Sources</gui>. Options are:"
 msgstr ""
 "Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
 
@@ -4676,7 +3524,7 @@ msgstr "Únicamente carpetas especificadas:"
 #, fuzzy
 msgid ""
 "Uses individual folders for the search folder source. In this case, click "
-"the <placeholder-1/> to select folders."
+"the <gui style=\"button\">Add</gui> to select folders."
 msgstr "Usa carpetas individuales para la fuente de carpeta de búsqueda."
 
 #: C/mail-refresh-folders.page:5(desc)
@@ -4691,20 +3539,16 @@ msgstr ""
 #: C/mail-refresh-folders.page:22(p)
 msgid ""
 "To make sure that your local email folders are updated, go to "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>. This will ensure that all "
-"of your emails have been downloaded from the mail server onto your computer "
-"so that you can read them all, and that the read status is synced with the "
-"mail server."
+"<guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that "
+"all of your emails have been downloaded from the mail server onto your "
+"computer so that you can read them all, and that the read status is synced "
+"with the mail server."
 msgstr ""
 
-#: C/mail-refresh-folders.page:24(key)
-msgid "F5"
-msgstr "F5"
-
 #: C/mail-refresh-folders.page:24(p)
 msgid ""
 "You can also double-click on the folder name to refresh it, or press "
-"<placeholder-1/>."
+"<key>F5</key>."
 msgstr ""
 
 #: C/mail-recognized-thread-related-headers.page:5(desc)
@@ -4730,14 +3574,9 @@ msgstr "Prefere_ncias"
 msgid "In-Reply-To"
 msgstr "Responder a"
 
-#: C/mail-recognized-thread-related-headers.page:29(gui)
-#, fuzzy
-msgid "Thread-*"
-msgstr "_Conversación siguiente"
-
 #: C/mail-recognized-thread-related-headers.page:29(p)
 msgid ""
-"<placeholder-1/> headers are Microsoft's proprietary headers and not "
+"<gui>Thread-*</gui> headers are Microsoft's proprietary headers and not "
 "supported."
 msgstr ""
 
@@ -4750,34 +3589,22 @@ msgstr ""
 msgid "Usenet news receiving options"
 msgstr "Siguiente - Opciones de recepción"
 
-#. TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong.
 #: C/mail-receiving-options-usenet-news.page:25(p)
-#: C/mail-receiving-options-usenet-news.page:34(p)
 #: C/mail-receiving-options-unix-mbox-spool-file.page:22(p)
-#: C/mail-receiving-options-unix-mbox-spool-file.page:27(p)
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:22(p)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(p)
 #: C/mail-receiving-options-pop.page:29(p)
-#: C/mail-receiving-options-pop.page:39(p)
 #: C/mail-receiving-options-novell-groupwise.page:26(p)
-#: C/mail-receiving-options-novell-groupwise.page:35(p)
 #: C/mail-receiving-options-mh-format-directories.page:22(p)
-#: C/mail-receiving-options-mh-format-directories.page:26(p)
 #: C/mail-receiving-options-maildir-format-directories.page:22(p)
-#: C/mail-receiving-options-maildir-format-directories.page:26(p)
 #: C/mail-receiving-options-local-delivery.page:22(p)
-#: C/mail-receiving-options-local-delivery.page:27(p)
 #: C/mail-receiving-options-imap-plus.page:25(p)
-#: C/mail-receiving-options-imap-plus.page:34(p)
 #: C/mail-receiving-options-imap.page:25(p)
-#: C/mail-receiving-options-imap.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:22(p)
-#: C/mail-receiving-options-exchange-mapi.page:33(p)
 #: C/mail-receiving-options-evolution-exchange.page:25(p)
-#: C/mail-receiving-options-evolution-exchange.page:36(p)
 msgid ""
-"On the <placeholder-1/> page (accessible via <guiseq><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>):"
+"On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
+"\">Edit</gui><gui>Receiving Email</gui></guiseq>):"
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:27(p)
@@ -4787,7 +3614,7 @@ msgstr ""
 #: C/mail-receiving-options-imap.page:27(p)
 #: C/mail-receiving-options-exchange-mapi.page:25(p)
 msgid ""
-"Enter the address of the email server in the <placeholder-1/> field and "
+"Enter the address of the email server in the <gui>Server</gui> field and "
 "enter your username for that server."
 msgstr ""
 
@@ -4817,11 +3644,11 @@ msgstr "Debería activar esta opción si su servidor la soporta."
 #: C/mail-receiving-options-evolution-exchange.page:32(p)
 #, fuzzy
 msgid ""
-"Select your authentication type in the Authentication list, or click "
-"<placeholder-1/> to have Evolution check for supported authentication "
-"mechanisms. Some servers do not announce the authentication mechanisms they "
-"support, so clicking this button is not a guarantee that available "
-"mechanisms actually work."
+"Select your authentication type in the Authentication list, or click <gui "
+"style=\"button\">Check for Supported Types</gui> to have Evolution check for "
+"supported authentication mechanisms. Some servers do not announce the "
+"authentication mechanisms they support, so clicking this button is not a "
+"guarantee that available mechanisms actually work."
 msgstr ""
 "Pulse «Comprobar tipos soportados» para que Evolution compruebe qué tipos "
 "están soportados. Algunos servidores no anuncian los mecanismos de "
@@ -4836,6 +3663,25 @@ msgstr ""
 msgid "Select if you want Evolution to remember your password."
 msgstr "Marque si quiere que Evolution recuerde su contraseña."
 
+#. TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong.
+#: C/mail-receiving-options-usenet-news.page:34(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:27(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:26(p)
+#: C/mail-receiving-options-pop.page:39(p)
+#: C/mail-receiving-options-novell-groupwise.page:35(p)
+#: C/mail-receiving-options-mh-format-directories.page:26(p)
+#: C/mail-receiving-options-maildir-format-directories.page:26(p)
+#: C/mail-receiving-options-local-delivery.page:27(p)
+#: C/mail-receiving-options-imap-plus.page:34(p)
+#: C/mail-receiving-options-imap.page:34(p)
+#: C/mail-receiving-options-exchange-mapi.page:33(p)
+#: C/mail-receiving-options-evolution-exchange.page:36(p)
+msgid ""
+"On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
+"\">Edit</gui><gui>Receiving Options</gui></guiseq>):"
+msgstr ""
+
 #: C/mail-receiving-options-usenet-news.page:36(p)
 #: C/mail-receiving-options-unix-mbox-spool-file.page:29(p)
 #: C/mail-receiving-options-pop.page:41(p)
@@ -4849,7 +3695,8 @@ msgstr "Marque si quiere que Evolution recuerde su contraseña."
 #: C/mail-receiving-options-evolution-exchange.page:38(p)
 msgid ""
 "If you want Evolution to check automatically for new messages, click the "
-"<placeholder-1/> option and select the frequency in minutes."
+"<gui>Check for new messages every ... minutes</gui> option and select the "
+"frequency in minutes."
 msgstr ""
 
 #: C/mail-receiving-options-usenet-news.page:37(p)
@@ -4860,15 +3707,11 @@ msgstr "Seleccione si quiere mostrar las carpetas en notación corta."
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Por ejemplo, com.os.linux aparecería como c.o.linux."
 
-#: C/mail-receiving-options-usenet-news.page:39(link)
-#, fuzzy
-msgid "subscriptions window"
-msgstr "Anchura de la ventana «Suscripciones de carpetas»"
-
 #: C/mail-receiving-options-usenet-news.page:39(p)
 #, fuzzy
 msgid ""
-"Select if you want to show relative folder names in the <placeholder-1/>."
+"Select if you want to show relative folder names in the <link xref=\"mail-"
+"imap-subscriptions\">subscriptions window</link>."
 msgstr ""
 "Seleccione si quiere mostrar los nombres de carpetas relativos en la caja de "
 "suscripción del diálogo."
@@ -4883,6 +3726,24 @@ msgstr ""
 "suscripción, se muestra sólo el nombre de la carpeta. Por ejemplo, la "
 "carpeta evolution.mail aparecería como evolution."
 
+#. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
+#: C/mail-receiving-options-usenet-news.page:43(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:33(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:31(p)
+#: C/mail-receiving-options-pop.page:48(p)
+#: C/mail-receiving-options-novell-groupwise.page:45(p)
+#: C/mail-receiving-options-mh-format-directories.page:31(p)
+#: C/mail-receiving-options-maildir-format-directories.page:32(p)
+#: C/mail-receiving-options-local-delivery.page:32(p)
+#: C/mail-receiving-options-imap-plus.page:45(p)
+#: C/mail-receiving-options-imap.page:45(p)
+#: C/mail-receiving-options-exchange-mapi.page:40(p)
+#: C/mail-receiving-options-evolution-exchange.page:47(p)
+msgid ""
+"If you came to this page from the first-run wizard help page, click <link "
+"xref=\"intro-first-run#sending\">here</link> to continue with the next step."
+msgstr ""
+
 #: C/mail-receiving-options-unix-mbox-spool-file.page:5(desc)
 #, fuzzy
 msgid "Receiving options for standard Unix mbox spool file accounts."
@@ -4893,55 +3754,20 @@ msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
 msgid "Standard Unix mbox spool file receiving options"
 msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
 
-#: C/mail-receiving-options-unix-mbox-spool-file.page:24(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-#: C/mail-receiving-options-local-delivery.page:24(gui)
-#, fuzzy
-msgid "Path"
-msgstr "R_uta:"
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:24(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-#: C/mail-receiving-options-local-delivery.page:24(gui)
-#: C/mail-received-notification.page:27(gui)
-#: C/mail-composer-message-templates.page:79(gui)
-#: C/mail-composer-custom-header-lines.page:33(gui)
-#: C/mail-attachments-sending.page:48(gui)
-msgid "Configuration"
-msgstr "Configuración"
-
 #: C/mail-receiving-options-unix-mbox-spool-file.page:24(p)
 #: C/mail-receiving-options-local-delivery.page:24(p)
 msgid ""
-"Choose the file by clicking on the button next to <placeholder-1/> in the "
-"<placeholder-2/> section. This will open a file chooser window."
-msgstr ""
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:30(link)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(link)
-#: C/mail-receiving-options-maildir-format-directories.page:29(link)
-#, fuzzy
-msgid "Filters"
-msgstr "filtro"
-
-#: C/mail-receiving-options-unix-mbox-spool-file.page:30(gui)
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:29(gui)
-#, fuzzy
-msgid "Apply filters to new messages in INBOX"
+"Choose the file by clicking on the button next to <gui>Path</gui> in the "
+"<gui>Configuration</gui> section. This will open a file chooser window."
 msgstr ""
-"Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este servidor"
 
 #: C/mail-receiving-options-unix-mbox-spool-file.page:30(p)
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:28(p)
 #: C/mail-receiving-options-maildir-format-directories.page:29(p)
 msgid ""
-"If you want <placeholder-1/> to be automatically used for new messages in "
-"your inbox, enable <placeholder-2/>."
+"If you want <link xref=\"mail-filters\">Filters</link> to be automatically "
+"used for new messages in your inbox, enable <gui>Apply filters to new "
+"messages in INBOX</gui>."
 msgstr ""
 
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:5(desc)
@@ -4956,20 +3782,14 @@ msgstr ""
 "Opciones de recepción para directorios de correo mbox en formato estándar de "
 "Unix"
 
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:24(gui)
-#: C/mail-receiving-options-mh-format-directories.page:24(gui)
-#: C/mail-receiving-options-maildir-format-directories.page:24(gui)
-msgid "Other..."
-msgstr "Otro…"
-
 #: C/mail-receiving-options-unix-mbox-spool-directory.page:24(p)
 #: C/mail-receiving-options-mh-format-directories.page:24(p)
 #: C/mail-receiving-options-maildir-format-directories.page:24(p)
 msgid ""
-"Choose the directory by clicking on the button next to <placeholder-1/> in "
-"the <placeholder-2/> section. Some default folders are available in the "
-"list. If the directory is not among those folders, choose the last option "
-"<placeholder-3/>. This will open a directory chooser window."
+"Choose the directory by clicking on the button next to <gui>Path</gui> in "
+"the <gui>Configuration</gui> section. Some default folders are available in "
+"the list. If the directory is not among those folders, choose the last "
+"option <gui>Other...</gui>. This will open a directory chooser window."
 msgstr ""
 
 #: C/mail-receiving-options-pop.page:5(desc)
@@ -4982,35 +3802,21 @@ msgstr "Recibir correo nuevo para todas las cuentas"
 msgid "POP receiving options"
 msgstr "Opciones de recepción POP"
 
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-#, fuzzy
-msgid "Leave messages on server"
-msgstr "¿Borrar los mensajes en la carpeta de búsqueda?"
-
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-msgid "Delete after ... days"
-msgstr ""
-
 #: C/mail-receiving-options-pop.page:43(p)
 #: C/mail-receiving-options-novell-groupwise.page:39(p)
 msgid ""
 "If you want the messages to remain on the server for a period of time, click "
-"the <placeholder-1/> option and the <placeholder-2/> option and select the "
-"number of days to allow messages to remain on the server."
-msgstr ""
-
-#: C/mail-receiving-options-pop.page:45(gui)
-msgid "Disable support for all POP3 extensions"
+"the <gui>Leave messages on server</gui> option and the <gui>Delete after ... "
+"days</gui> option and select the number of days to allow messages to remain "
+"on the server."
 msgstr ""
 
 #: C/mail-receiving-options-pop.page:45(p)
 msgid ""
-"The option <placeholder-1/> is only useful when accessing old or "
-"misconfigured mail servers. Such POP3 extensions provide enhanced "
-"functionality, however only some servers support them. In case of problems "
-"with receiving mail, enabling this setting might help."
+"The option <gui>Disable support for all POP3 extensions</gui> is only useful "
+"when accessing old or misconfigured mail servers. Such POP3 extensions "
+"provide enhanced functionality, however only some servers support them. In "
+"case of problems with receiving mail, enabling this setting might help."
 msgstr ""
 
 #: C/mail-receiving-options.page:5(desc)
@@ -5109,13 +3915,11 @@ msgstr "Configurar sus cuentas IMAP."
 msgid "IMAP+ receiving options"
 msgstr "Opciones de recepción IMAP"
 
-#: C/mail-receiving-options-imap-plus.page:37(link)
-msgid "IMAP4 Extensions for Quick Mailbox Resynchronization"
-msgstr ""
-
 #: C/mail-receiving-options-imap-plus.page:37(p)
 msgid ""
-"Select \"Use Quick Resync\" if the IMAP server supports <placeholder-1/>."
+"Select \"Use Quick Resync\" if the IMAP server supports <link href=\"http://"
+"tools.ietf.org/html/rfc5162\">IMAP4 Extensions for Quick Mailbox "
+"Resynchronization</link>."
 msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:38(p)
@@ -5136,16 +3940,12 @@ msgstr ""
 "Seleccione si quiere que Evolution use comandos personalizados para "
 "conectarse al servidor IMAP."
 
-#: C/mail-receiving-options-imap-plus.page:40(link)
-#: C/mail-receiving-options-imap.page:40(link)
-#, fuzzy
-msgid "subscribed folders"
-msgstr "Desuscribirse de carpetas"
-
 #: C/mail-receiving-options-imap-plus.page:40(p)
 #: C/mail-receiving-options-imap.page:40(p)
 #, fuzzy
-msgid "Select if you want Evolution to show only <placeholder-1/>."
+msgid ""
+"Select if you want Evolution to show only <link xref=\"mail-imap-"
+"subscriptions\">subscribed folders</link>."
 msgstr "Marque si quiere que Evolution sólo muestre las carpetas suscritas."
 
 #: C/mail-receiving-options-imap-plus.page:41(p)
@@ -5180,16 +3980,10 @@ msgstr "Opciones de recepción Exchange MAPI"
 msgid "Enter the Domain name for that server."
 msgstr ""
 
-#: C/mail-receiving-options-exchange-mapi.page:30(gui)
-#: C/mail-receiving-options-evolution-exchange.page:33(gui)
-#, fuzzy
-msgid "Authenticate"
-msgstr "A_utenticar"
-
 #: C/mail-receiving-options-exchange-mapi.page:30(p)
 #: C/mail-receiving-options-evolution-exchange.page:33(p)
 #, fuzzy
-msgid "Click <placeholder-1/> and enter your password."
+msgid "Click <gui style=\"button\">Authenticate</gui> and enter your password."
 msgstr "Introduzca su contraseña."
 
 #: C/mail-receiving-options-exchange-mapi.page:37(p)
@@ -5225,15 +4019,11 @@ msgid ""
 "the mailbox name."
 msgstr ""
 
-#: C/mail-receiving-options-evolution-exchange.page:42(gui)
-#, fuzzy
-msgid "Global Address List/Active Directory"
-msgstr "Lista de direcciones global"
-
 #: C/mail-receiving-options-evolution-exchange.page:42(p)
 msgid ""
-"In the section <placeholder-1/>, specify the name of the Global Catalog "
-"server. The Global Catalog Server contains the user information for users."
+"In the section <gui>Global Address List/Active Directory</gui>, specify the "
+"name of the Global Catalog server. The Global Catalog Server contains the "
+"user information for users."
 msgstr ""
 
 #: C/mail-receiving-options-evolution-exchange.page:43(p)
@@ -5246,18 +4036,37 @@ msgstr ""
 "Seleccione si quiere limitar el número de «Listas de direcciones globales "
 "(GAL)»."
 
-#: C/mail-receiving-options-evolution-exchange.page:44(link)
-#: C/mail-composer-several-recipients.page:48(link)
-#, fuzzy
-msgid "contact lists"
-msgstr "Lista de contactos"
-
 #: C/mail-receiving-options-evolution-exchange.page:44(p)
 msgid ""
 "You also have to define the Authentication type, and whether you want groups "
-"of contacts in GAL to be represented in the Evolution address book by "
-"<placeholder-1/>."
+"of contacts in GAL to be represented in the Evolution address book by <link "
+"xref=\"contacts-using-contact-lists\">contact lists</link>."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:23(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/exchng-rec-mails.png'; "
+#| "md5=b56dfa570c8d1c9b942c6493fd973d68"
+msgid ""
+"@@image: './figures/new-mail-switcher.png'; "
+"md5=be4dbdb5f6e3dcbd5111b87169cae268"
+msgstr ""
+"@@image: 'figures/exchng-rec-mails.png'; md5=b56dfa570c8d1c9b942c6493fd973d68"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:28(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgid ""
+"@@image: './figures/new-mail-notification.png'; "
+"md5=25a4373da392793406910cd883f0c21c"
 msgstr ""
+"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 
 #: C/mail-received-notification.page:5(desc)
 msgid "Options on notifications of newly received mail."
@@ -5268,15 +4077,11 @@ msgstr ""
 msgid "Getting notified of new mail"
 msgstr "Comprobando correo nuevo"
 
-#: C/mail-received-notification.page:22(link)
-#: C/intro-main-window.page:125(gui)
-msgid "switcher"
-msgstr "selector"
-
 #: C/mail-received-notification.page:22(p)
 msgid ""
 "Evolution always notifies you of new messages by adding a yellow star to the "
-"mailer icon in the window <placeholder-1/>."
+"mailer icon in the window <link xref=\"change-switcher-appearance.page"
+"\">switcher</link>."
 msgstr ""
 
 #: C/mail-received-notification.page:24(p)
@@ -5285,16 +4090,12 @@ msgstr ""
 msgid "Switcher layout when a new message has arrived"
 msgstr "_Reproducir un sonido cuando llegue correo nuevo"
 
-#: C/mail-received-notification.page:27(gui)
-msgid "Mail Notification"
-msgstr "Notificación de correo"
-
 #: C/mail-received-notification.page:27(p)
 msgid ""
 "In order to get also notified of new messages in the GNOME Notification area "
-"at the bottom of the screen, make sure that <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq> is enabled and that you have set "
-"your prefered options in the <placeholder-4/> tab."
+"at the bottom of the screen, make sure that <guiseq><gui>Edit</"
+"gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and "
+"that you have set your prefered options in the <gui>Configuration</gui> tab."
 msgstr ""
 
 #: C/mail-read-receipts.page:5(desc)
@@ -5315,60 +4116,19 @@ msgid ""
 "your emails have been received by someone."
 msgstr ""
 
-#: C/mail-read-receipts.page:37(gui) C/mail-filters.page:27(gui)
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/calendar-usage-add-appointment.page:28(gui)
-#: C/calendar-usage-add-appointment.page:32(gui)
-#: C/calendar-recurrence.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:38(gui)
-#: C/calendar-meetings-sending-invitation.page:42(gui)
-#: C/calendar-free-busy.page:35(gui) C/calendar-classifications.page:26(gui)
-#: C/calendar-alarms-and-reminders.page:37(gui)
-msgid "Options"
-msgstr "Opciones"
-
-#: C/mail-read-receipts.page:37(gui)
-#, fuzzy
-msgid "Request Read Receipt"
-msgstr "_Solicitar confirmación de lectura"
-
 #: C/mail-read-receipts.page:37(p)
 msgid ""
 "You can request read receipts by enabling this option in the email "
-"composer's menu. To do so, go to <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>."
+"composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read "
+"Receipt</gui></guiseq>."
 msgstr ""
 
-#: C/mail-read-receipts.page:39(gui)
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#: C/mail-default-folder-locations.page:33(gui)
-#: C/mail-default-CC-and-BCC.page:29(gui) C/mail-cannot-see.page:41(gui)
-#: C/mail-account-manage-usenet-news.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
-#: C/mail-account-manage-pop.page:43(title)
-#: C/mail-account-manage-novell-groupwise.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
-#: C/mail-account-manage-mh-format-directories.page:43(title)
-#: C/mail-account-manage-maildir-format-directories.page:43(title)
-#: C/mail-account-manage-local-delivery.page:43(title)
-#: C/mail-account-manage-imap-plus.page:43(title)
-#: C/mail-account-manage-imap.page:43(title)
-msgid "Defaults"
-msgstr "Predeterminados"
-
-#: C/mail-read-receipts.page:39(gui)
-msgid "Message Receipts"
-msgstr "Destinatarios del mensaje"
-
 #: C/mail-read-receipts.page:39(p)
 msgid ""
 "For read receipts that you receive you can define Evolution's behavior by "
-"going to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
+"going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Defaults</gui><gui>Message "
+"Receipts</gui></guiseq>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:5(desc)
@@ -5386,34 +4146,34 @@ msgid "Viewing an email"
 msgstr "Enviar un correo-e"
 
 #: C/mail-reading-keyboard-shortcuts.page:28(p)
+#, fuzzy
+#| msgid ""
+#| "If you are not already viewing mail, switch to the mail tool by clicking "
+#| "the Mail shortcut button, or press Ctrl+1. To read a message, select it "
+#| "in the message list; if you'd like to see it in its own window, either "
+#| "double-click it, press Enter, or press Ctrl+O."
 msgid ""
 "In the Mail window you read a message by selecting it in the message list. "
 "If you would like to see the message in its own window, either double-click "
-"it, press <placeholder-1/>, or press <keyseq><placeholder-2/><placeholder-3/"
-"></keyseq>."
+"it, press <key>Enter</key>, or press <keyseq><key>Ctrl</key><key>O</key></"
+"keyseq>."
 msgstr ""
+"Si no está viendo ya el correo, cambie la la herramienta de correo pulsando "
+"en el botón Correo, o pulsando Ctrl+1. Para leer un mensaje, selecciónelo en "
+"la lista de mensajes, si quiere verlo en su propia ventana, puede o bien "
+"pulsar dos veces en él, pulsar Intro o pulsar Ctrl+O."
 
 #: C/mail-reading-keyboard-shortcuts.page:32(title)
 #, fuzzy
 msgid "Navigating in a message"
 msgstr "Formateando el mensaje"
 
-#: C/mail-reading-keyboard-shortcuts.page:33(key)
-#: C/mail-reading-keyboard-shortcuts.page:49(key)
-msgid "Spacebar"
-msgstr ""
-
-#: C/mail-reading-keyboard-shortcuts.page:33(key)
-#, fuzzy
-msgid "Backspace"
-msgstr "_Respaldo"
-
 #: C/mail-reading-keyboard-shortcuts.page:33(p)
 #, fuzzy
 msgid ""
-"To read mail with the keyboard, you can click the <placeholder-1/> to page "
-"down and press <placeholder-2/> to page up while reading an email. Ensure "
-"that you use the keys when the message list is focused."
+"To read mail with the keyboard, you can click the <key>Spacebar</key> to "
+"page down and press <key>Backspace</key> to page up while reading an email. "
+"Ensure that you use the keys when the message list is focused."
 msgstr ""
 "Para leer correo con el teclado puede pulsar la barra espaciadora para "
 "avanzar una página y pulsar Retroceso para retroceder una página mientras "
@@ -5437,40 +4197,16 @@ msgstr "Navegar por la lista de mensajes mediante el teclado:"
 msgid "Navigating in a folder's unread mail in the message list"
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "."
-msgstr "."
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid ","
-msgstr ","
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "&gt;"
-msgstr "&gt;"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "&lt;"
-msgstr "&lt;"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "]"
-msgstr "]"
-
-#: C/mail-reading-keyboard-shortcuts.page:43(key)
-msgid "["
-msgstr "["
-
 #: C/mail-reading-keyboard-shortcuts.page:43(p)
 #, fuzzy
 msgid ""
-"To go to the next or previous unread messages, press the period "
-"(<placeholder-1/>) or comma (<placeholder-2/>) keys. On some keyboards, "
-"these keys are also marked with the <placeholder-3/> and <placeholder-4/> "
-"symbols, which is a convenient way to remember that they move you forward "
-"and backward in your message list. You can also use the right square bracket "
-"(<placeholder-5/>) for the next unread message, and the left square bracket "
-"(<placeholder-6/>) for the previous unread message."
+"To go to the next or previous unread messages, press the period (<key>.</"
+"key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also "
+"marked with the <key>&gt;</key> and <key>&lt;</key> symbols, which is a "
+"convenient way to remember that they move you forward and backward in your "
+"message list. You can also use the right square bracket (<key>]</key>) for "
+"the next unread message, and the left square bracket (<key>[</key>) for the "
+"previous unread message."
 msgstr ""
 "Navegue por la lista de mensajes usando las teclas de flechas en el teclado. "
 "Para ir al siguiente mensaje no leído o al anterior, pulse el punto (.) o la "
@@ -5488,7 +4224,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "You can easily read the unread messages in all the mail folders by using the "
-"<placeholder-1/>."
+"<key>Spacebar</key>."
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
 #: C/mail-reading-keyboard-shortcuts.page:51(p)
@@ -5507,16 +4243,11 @@ msgstr ""
 "Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
 "correo no leído."
 
-#: C/mail-reading-keyboard-shortcuts.page:54(key)
-#, fuzzy
-msgid "Page Down"
-msgstr "Página %d"
-
 #: C/mail-reading-keyboard-shortcuts.page:54(p)
 #, fuzzy
 msgid ""
-"If the message is more than one screen long, the Spacebar works as "
-"<placeholder-1/>."
+"If the message is more than one screen long, the Spacebar works as <key>Page "
+"Down</key>."
 msgstr ""
 "Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
 "como avance de página."
@@ -5595,22 +4326,13 @@ msgid ""
 "prevent emails from being sent"
 msgstr ""
 
-#: C/mail-not-sent.page:27(gui)
-#, fuzzy
-msgid "Send and Receive"
-msgstr "Enviar / Recibir"
-
-#: C/mail-not-sent.page:27(gui)
-#, fuzzy
-msgid "Work online"
-msgstr "_Trabajar conectado"
-
 #: C/mail-not-sent.page:27(p)
 msgid ""
-"Offline status. Evolution may be offline. Check on the <placeholder-1/> "
-"button; if it is greyed out, then you are offline. To go online, go to "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>. You should now be able to "
-"use the <placeholder-4/> button."
+"Offline status. Evolution may be offline. Check on the <gui style=\"button"
+"\">Send and Receive</gui> button; if it is greyed out, then you are offline. "
+"To go online, go to <guiseq><gui>File</gui><gui>Work online</gui></guiseq>. "
+"You should now be able to use the <gui style=\"button\">Send and Receive</"
+"gui> button."
 msgstr ""
 
 #: C/mail-moving-emails.page:5(desc)
@@ -5629,15 +4351,11 @@ msgid ""
 "deletion."
 msgstr ""
 
-#: C/mail-moving-emails.page:28(link)
-#, fuzzy
-msgid "deleting emails"
-msgstr "Borrado de correo"
-
 #: C/mail-moving-emails.page:28(p)
 msgid ""
-"See the topic on <placeholder-1/> for instructions on how to expunge email "
-"messages. Note that this applies to other types of accounts as well."
+"See the topic on <link xref=\"mail-delete-and-undelete\">deleting emails</"
+"link> for instructions on how to expunge email messages. Note that this "
+"applies to other types of accounts as well."
 msgstr ""
 
 #: C/mail-layout-changing.page:5(desc)
@@ -5662,22 +4380,15 @@ msgstr "Etiquetas"
 #: C/mail-labels.page:23(p)
 msgid ""
 "You can add colored labels to emails in order to categorize them. This is "
-"similar to <placeholder-1/> in the other Evolution windows."
+"similar to <link xref=\"using-categories\">Categories</link> in the other "
+"Evolution windows."
 msgstr ""
 
-#: C/mail-labels.page:25(link)
-msgid "quick search dropdown"
-msgstr ""
-
-#: C/mail-labels.page:25(link)
-#, fuzzy
-msgid "search folders"
-msgstr "carpeta de búsqueda"
-
 #: C/mail-labels.page:25(p)
 msgid ""
-"You can search for messages with specific labels by using the <placeholder-1/"
-">. Also, <placeholder-2/> can be created based on labels."
+"You can search for messages with specific labels by using the <link xref="
+"\"mail-searching\">quick search dropdown</link>. Also, <link xref=\"mail-"
+"search-folders\">search folders</link> can be created based on labels."
 msgstr ""
 
 # index.docbook:41, index.docbook:293
@@ -5686,23 +4397,14 @@ msgstr ""
 msgid "Adding a label to a message"
 msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
-#: C/mail-labels.page:29(gui)
-msgid "Label"
-msgstr "Etiqueta"
-
 #: C/mail-labels.page:29(p)
 msgid ""
-"To assign a label to a message, right-click the message, click "
-"<placeholder-1/>, and choose the label to apply."
+"To assign a label to a message, right-click the message, click <gui>Label</"
+"gui>, and choose the label to apply."
 msgstr ""
 
-#: C/mail-labels.page:30(gui)
-#, fuzzy
-msgid "New Label"
-msgstr "Etiqueta n_ueva"
-
 #: C/mail-labels.page:30(p)
-msgid "You can also quickly add a new label by choosing <placeholder-1/>."
+msgid "You can also quickly add a new label by choosing <gui>New Label</gui>."
 msgstr ""
 
 #: C/mail-labels.page:34(title)
@@ -5712,9 +4414,9 @@ msgstr "Gestionar los elementos enviados"
 
 #: C/mail-labels.page:35(p)
 msgid ""
-"You can add, edit and delete all labels under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq>. Note that you "
-"cannot remove the default labels."
+"You can add, edit and delete all labels under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></"
+"guiseq>. Note that you cannot remove the default labels."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:5(desc)
@@ -5727,15 +4429,11 @@ msgstr "Suscripciones de carpetas"
 msgid "IMAP Subscriptions"
 msgstr "Gestor de suscripciones IMAP"
 
-#: C/mail-imap-subscriptions.page:28(gui)
-msgid "IMAP Subscriptions Manager"
-msgstr "Gestor de suscripciones IMAP"
-
 #: C/mail-imap-subscriptions.page:28(p)
 msgid ""
 "As opening many IMAP folders on the server takes time you can define which "
 "IMAP folders to check and display in Evolution, and which ones to ignore for "
-"the time being, via the <placeholder-1/>."
+"the time being, via the <gui>IMAP Subscriptions Manager</gui>."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:32(p)
@@ -5770,44 +4468,16 @@ msgstr ""
 msgid "Define which mail headers to download when using IMAP."
 msgstr ""
 
-#: C/mail-imap-headers.page:25(title) C/mail-imap-headers.page:27(gui)
-#: C/mail-imap-headers.page:41(gui) C/mail-account-manage-imap.page:51(title)
+#: C/mail-imap-headers.page:25(title)
+#: C/mail-account-manage-imap.page:51(title)
 msgid "IMAP Headers"
 msgstr "Cabeceras IMAP"
 
-#: C/mail-imap-headers.page:27(gui)
-#: C/mail-account-manage-usenet-news.page:23(title)
-#: C/mail-account-manage-usenet-news.page:54(gui)
-#: C/mail-account-manage-unix-mbox-spool-file.page:23(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:54(gui)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:23(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:54(gui)
-#: C/mail-account-manage-pop.page:23(title)
-#: C/mail-account-manage-pop.page:54(gui)
-#: C/mail-account-manage-novell-groupwise.page:24(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:23(title)
-#: C/mail-account-manage-mh-format-directories.page:23(title)
-#: C/mail-account-manage-mh-format-directories.page:54(gui)
-#: C/mail-account-manage-maildir-format-directories.page:23(title)
-#: C/mail-account-manage-maildir-format-directories.page:54(gui)
-#: C/mail-account-manage-local-delivery.page:23(title)
-#: C/mail-account-manage-local-delivery.page:54(gui)
-#: C/mail-account-manage-imap-plus.page:23(title)
-#: C/mail-account-manage-imap-plus.page:56(gui)
-#: C/mail-account-manage-imap.page:23(title)
-#: C/mail-account-manage-imap.page:58(gui)
-msgid "Account Editor"
-msgstr "Editor de cuentas"
-
-#: C/mail-imap-headers.page:27(gui)
-msgid "IMAP Features"
-msgstr "Características IMAP"
-
 #: C/mail-imap-headers.page:27(p)
 msgid ""
-"The <placeholder-1/> tab is only displayed in the <placeholder-2/> if "
-"<guiseq><placeholder-3/><placeholder-4/><placeholder-5/></guiseq> is enabled."
+"The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account "
+"Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</"
+"gui></guiseq> is enabled."
 msgstr ""
 
 #: C/mail-imap-headers.page:29(p)
@@ -5873,11 +4543,6 @@ msgstr ""
 "correo, el propietario de la lista de correo y demás, con lo que puede crear "
 "un filtro para listas de correo."
 
-#: C/mail-imap-headers.page:33(gui)
-#, fuzzy
-msgid "Basic Headers"
-msgstr "Cabeceras básicas:"
-
 #: C/mail-imap-headers.page:33(p)
 #, fuzzy
 msgid ""
@@ -5885,7 +4550,7 @@ msgid ""
 "option is chosen, Evolution will download a basic set of headers (as "
 "described above) along with a set of headers that are needed for client-side "
 "filters based on mailing lists. If you do not have any filters on Evolution, "
-"it is recommended to switch to the <placeholder-1/> option."
+"it is recommended to switch to the <gui>Basic Headers</gui> option."
 msgstr ""
 "Estas son las preferencias predeterminadas en Evolution para las Cabeceras. "
 "Cuando se elige esta opción, Evolution descargará un juego básico de "
@@ -5903,29 +4568,27 @@ msgstr "Para establecer las cabeceras de correo IMAP:"
 #: C/mail-encryption-gpg-signing-encrypting.page:30(p)
 #: C/mail-encryption-gpg-set-up.page:29(p)
 msgid ""
-"Select <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui></guiseq>."
 msgstr ""
 
 #: C/mail-imap-headers.page:39(p)
 msgid "Select the IMAP account."
 msgstr "Seleccione la cuenta IMAP."
 
-#: C/mail-imap-headers.page:41(p) C/mail-encryption-gpg-set-up.page:31(p)
-#: C/mail-composer-message-templates.page:79(p)
-#: C/mail-composer-custom-header-lines.page:33(p)
-#: C/mail-attachments-sending.page:48(p)
+#: C/mail-imap-headers.page:40(p)
+msgid "Click <gui>Edit</gui>."
+msgstr "Pulse <gui>Editar</gui>."
+
+#: C/mail-imap-headers.page:41(p)
 #, fuzzy
-msgid "Click the <placeholder-1/> tab."
+msgid "Click the <gui>IMAP Headers</gui> tab."
 msgstr "gpg <placeholder-1/>"
 
-#: C/mail-imap-headers.page:42(gui)
-msgid "Custom Headers"
-msgstr "Cabeceras personalizadas"
-
 #: C/mail-imap-headers.page:42(p)
 msgid ""
 "Optionally: If you want to define extra headers to download you can add "
-"these in the <placeholder-1/> section."
+"these in the <gui>Custom Headers</gui> section."
 msgstr ""
 
 #: C/mail-imap-headers.page:45(p)
@@ -5960,35 +4623,17 @@ msgstr "Seleccione uno o más mensajes."
 msgid "Right-click one of the messages."
 msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/mail-follow-up-flag.page:29(gui)
-#, fuzzy
-msgid "Mark for Follow Up..."
-msgstr "Marcar para se_guimiento…"
-
 #: C/mail-follow-up-flag.page:29(p)
 #, fuzzy
-msgid "Click <placeholder-1/>"
-msgstr "gpg <placeholder-1/>"
-
-#: C/mail-follow-up-flag.page:31(gui) C/mail-follow-up-flag.page:43(gui)
-#, fuzzy
-msgid "Mark as"
-msgstr "Marcar como _SPAM"
-
-#: C/mail-follow-up-flag.page:31(gui)
-#, fuzzy
-msgid "Follow Up..."
-msgstr "Se_guimiento…"
-
-#: C/mail-follow-up-flag.page:31(key)
-msgid "G"
-msgstr "G"
+#| msgid "Click Mark for Follow Up."
+msgid "Click <gui>Mark for Follow Up...</gui>"
+msgstr "Pulse Marca para seguimiento."
 
 #: C/mail-follow-up-flag.page:31(p)
 msgid ""
 "You can also do this by selecting the message(s) and clicking "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq> or by "
-"pressing <keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>."
+"<guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> "
+"or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>."
 msgstr ""
 
 #: C/mail-follow-up-flag.page:33(p)
@@ -6007,22 +4652,12 @@ msgstr ""
 "varias disponibles, como Llamar, Reenviar y Responder, pero puede escribir "
 "la nota o acción que prefiera."
 
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Flag Completed"
-msgstr "Ma_rcar como terminado"
-
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Clear Flag"
-msgstr "_Quitar marca"
-
 #: C/mail-follow-up-flag.page:37(p)
 #, fuzzy
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
-"entirely by right-clicking the message and clicking either <placeholder-1/> "
-"or <placeholder-2/>."
+"entirely by right-clicking the message and clicking either <gui>Flag "
+"Completed</gui> or <gui>Clear Flag</gui>."
 msgstr ""
 "Una vez que ha añadido una marca, puede remarcar el mensaje como terminado o "
 "eliminar la marca pinchando con el botón derecho sobre el mensaje y "
@@ -6040,23 +4675,15 @@ msgstr ""
 "un mensaje atrasado podrá decirle algo como <quote>Llamar antes del 7 de "
 "abril de 2003 a las 17:00</quote>."
 
-#: C/mail-follow-up-flag.page:41(link)
-#, fuzzy
-msgid "add a Flag Status column"
-msgstr "Marca de estado"
-
-#: C/mail-follow-up-flag.page:41(link)
-msgid "search folder"
-msgstr "carpeta de búsqueda"
-
 #: C/mail-follow-up-flag.page:41(p)
 #, fuzzy
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
-"might <placeholder-1/> to your message list and sort that way. Alternately, "
-"you could create a <placeholder-2/> that displays all your flagged messages, "
-"then clear the flags when you're done, so the search folder contains only "
-"messages with upcoming deadlines."
+"might <link xref=\"mail-change-columns-in-message-list\">add a Flag Status "
+"column</link> to your message list and sort that way. Alternately, you could "
+"create a <link xref=\"mail-search-folders\">search folder</link> that "
+"displays all your flagged messages, then clear the flags when you're done, "
+"so the search folder contains only messages with upcoming deadlines."
 msgstr ""
 "Las marcas le pueden ayudar a organizar su correo de varias maneras. Por "
 "ejemplo, puede añadir a la lista de mensajes una columna de Marca de "
@@ -6065,22 +4692,13 @@ msgstr ""
 "quitarles las marcas cuando haya acabado, de manera que la carpeta sólo "
 "contenga mensajes pendientes."
 
-#: C/mail-follow-up-flag.page:43(gui)
-#, fuzzy
-msgid "Mark as Important"
-msgstr "Marcar como imp_ortante"
-
-#: C/mail-follow-up-flag.page:43(gui)
-msgid "Important"
-msgstr "Importante"
-
 #: C/mail-follow-up-flag.page:43(p)
 #, fuzzy
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
-"them as important by right-clicking the message, then click <placeholder-1/"
-">, or by selecting <guiseq><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq> from the menubar."
+"them as important by right-clicking the message, then click <gui>Mark as "
+"Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</"
+"gui><gui>Important</gui></guiseq> from the menubar."
 msgstr ""
 "Si prefiere una forma más sencilla de recordarse a sí mismo los mensajes, "
 "puede marcarlos como importantes pulsando con el botón derecho del ratón "
@@ -6091,7 +4709,7 @@ msgstr ""
 msgid "Use folders to organize your mail."
 msgstr ""
 
-#: C/mail-folders.page:28(title) C/intro-main-window.page:66(link)
+#: C/mail-folders.page:28(title)
 #, fuzzy
 msgid "Using Folders"
 msgstr "Usar las carpetas de búsqueda"
@@ -6119,15 +4737,11 @@ msgstr "Crear una carpeta de búsqueda"
 msgid "To create a folder:"
 msgstr "Para crear una carpeta nueva:"
 
-#: C/mail-folders.page:36(gui)
-#, fuzzy
-msgid "New Folder"
-msgstr "Carpeta nueva:"
-
 #: C/mail-folders.page:36(p)
 msgid ""
-"Click on <placeholder-1/> and select <placeholder-2/>. You can also right-"
-"click anywhere on the folder list and select the <placeholder-3/> option."
+"Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-"
+"click anywhere on the folder list and select the <gui>New Folder</gui> "
+"option."
 msgstr ""
 
 #: C/mail-folders.page:37(p)
@@ -6135,10 +4749,11 @@ msgstr ""
 msgid "Specify the name and the location of the folder."
 msgstr "Seleccione la ubicación de la carpeta nueva."
 
-#: C/mail-folders.page:38(gui)
+#: C/mail-folders.page:38(p)
 #, fuzzy
-msgid "Create"
-msgstr "Creado"
+#| msgid "Click the Categories button at the left."
+msgid "Click on the <gui>Create</gui> button."
+msgstr "Pulse el botón Categorías de la izquierda."
 
 #: C/mail-folders.page:40(p)
 msgid ""
@@ -6162,31 +4777,24 @@ msgstr "Puede ver el tamaño de la carpeta usando los siguientes métodos:"
 msgid "Drag and drop the messages into the folder."
 msgstr "Marca todos los mensajes en la carpeta como leídos."
 
-#: C/mail-folders.page:48(gui) C/mail-folders.page:50(gui)
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
-
 #: C/mail-folders.page:48(p)
 #, fuzzy
-msgid "Right-click on the message and select the <placeholder-1/> option."
+msgid ""
+"Right-click on the message and select the <gui>Move to Folder</gui> option."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
 "mensajes."
 
-#: C/mail-folders.page:49(key)
-msgid "V"
-msgstr "V"
-
 #: C/mail-folders.page:49(p)
 msgid ""
-"Select a message and press <keyseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></keyseq>."
+"Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</"
+"key></keyseq>."
 msgstr ""
 
 #: C/mail-folders.page:50(p)
 msgid ""
-"Select a message and click on <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq>."
+"Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</"
+"gui></guiseq>."
 msgstr ""
 
 #: C/mail-folders.page:53(p)
@@ -6194,7 +4802,9 @@ msgid "The steps for copying are similar."
 msgstr ""
 
 #: C/mail-folders.page:55(p)
-msgid "Moving files can be done automatically by setting up <placeholder-1/>."
+msgid ""
+"Moving files can be done automatically by setting up <link xref=\"mail-"
+"filters\">filters</link>."
 msgstr ""
 
 #: C/mail-folders.page:60(p)
@@ -6228,132 +4838,114 @@ msgid ""
 "defined. You can define filters for both incoming and outgoing emails."
 msgstr ""
 
-#: C/mail-filters.page:27(gui)
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este servidor"
-
 #: C/mail-filters.page:27(p)
 msgid ""
 "Filters will be automatically applied to incoming messages for local "
 "accounts (such as POP). Mail serves for remote accounts (such as IMAP) often "
 "already filter mail directly on the server as this is faster. If you want to "
 "apply your Evolution filters to remote accounts, you can enable this under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply "
+"filters to new messages in Inbox on this server</gui></guiseq>."
 msgstr ""
 
-# Colisión en la A
-#: C/mail-filters.page:29(gui)
-#, fuzzy
-msgid "Apply Filters"
-msgstr "Aplicar _filtros"
-
-#: C/mail-filters.page:29(key) C/calendar-layout-views.page:27(key)
-msgid "Y"
-msgstr "Y"
-
 #: C/mail-filters.page:29(p)
+#, fuzzy
 msgid ""
 "To manually apply filters on messages in a folder, select the messages and "
-"click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+"click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press "
+"<keyseq><key>Ctrl</key><key>Y</key></keyseq>."
 msgstr ""
-
-#: C/mail-filters.page:30(gui) C/exporting-data-mail.page:25(gui)
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: C/mail-filters.page:30(key) C/exporting-data-mail.page:25(key)
-msgid "A"
-msgstr "A"
+"Para borrar permanentemente todos los mensajes borrados en una carpeta, "
+"pulse Carpeta &gt; Purgar o pulse Ctrl+E."
 
 #: C/mail-filters.page:30(p) C/exporting-data-mail.page:25(p)
+#, fuzzy
 msgid ""
-"You can select all messages in a folder by clicking <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or pressing <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>."
+"You can select all messages in a folder by clicking <guiseq><gui>Edit</"
+"gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</"
+"key><key>A</key></keyseq>."
 msgstr ""
+"Para borrar permanentemente todos los mensajes borrados en una carpeta, "
+"pulse Carpeta &gt; Purgar o pulse Ctrl+E."
 
 #: C/mail-filters.page:33(title)
 #, fuzzy
 msgid "Creating a Filter"
 msgstr "Crear reglas de filtros nuevas"
 
-#: C/mail-filters.page:36(gui) C/mail-filters.page:51(gui)
-#: C/mail-filters.page:61(gui) C/mail-filters-not-working.page:29(gui)
-#: C/mail-error-no-provider-available.page:37(gui)
-msgid "Message Filters"
-msgstr "Filtros de mensajes"
-
 #: C/mail-filters.page:36(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, or click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq> and select the criterion "
-"the filter will be based on."
+"Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click "
+"<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
+"criterion the filter will be based on."
 msgstr ""
 
-#: C/mail-filters.page:39(link) C/mail-filters-conditions.page:23(title)
-#: C/mail-filters-actions.page:23(title)
+#: C/mail-filters.page:39(p)
 #, fuzzy
-msgid "Available Filter conditions"
-msgstr "Campos disponibles"
-
-#: C/mail-filters.page:41(gui)
-msgid "Then"
-msgstr "Luego"
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"filters-conditions\">Available Filter conditions</link>."
+msgstr ""
+"Para obtener más información acerca de los recordatorios, vea <link linkend="
+"\"bshly4v\">Recordatorios</link>."
 
 #: C/mail-filters.page:41(p)
 #, fuzzy
-msgid "Select the Actions for the Filter in the <placeholder-1/> section."
+msgid "Select the Actions for the Filter in the <gui>Then</gui> section."
 msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
-#: C/mail-filters.page:41(link)
-#, fuzzy
-msgid "Available Filter actions"
-msgstr "Campos disponibles"
-
 #: C/mail-filters.page:41(p)
-msgid "For more information on the available actions see <placeholder-1/>."
-msgstr ""
-
-#: C/mail-filters.page:42(gui)
 #, fuzzy
-msgid "Add Action"
-msgstr "Añadir a_cción"
-
-#: C/mail-filters.page:42(gui) C/mail-filters-not-working.page:24(gui)
-#: C/mail-filters-not-working.page:26(gui)
-#: C/mail-filters-not-working.page:31(gui)
-#: C/mail-filters-not-working.page:38(gui)
-msgid "Stop Processing"
-msgstr "Parar de procesar"
+msgid ""
+"For more information on the available actions see <link xref=\"mail-filters-"
+"actions\">Available Filter actions</link>."
+msgstr ""
+"Para obtener más información acerca de los recordatorios, vea <link linkend="
+"\"bshly4v\">Recordatorios</link>."
 
 #: C/mail-filters.page:42(p)
 msgid ""
-"If you want to define multiple actions, click <placeholder-1/> and repeat "
-"the previous step. For example, if you want no other existing filters to be "
-"applied choose <placeholder-2/> as the second action in the list."
+"If you want to define multiple actions, click <gui style=\"button\">Add "
+"Action</gui> and repeat the previous step. For example, if you want no other "
+"existing filters to be applied choose <gui>Stop Processing</gui> as the "
+"second action in the list."
 msgstr ""
 
 #: C/mail-filters.page:49(title)
 msgid "Editing Filters"
 msgstr "Editar de filtros"
 
+#: C/mail-filters.page:51(p) C/mail-filters.page:61(p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+msgstr ""
+
 #: C/mail-filters.page:52(p) C/mail-filters.page:62(p)
 #, fuzzy
 msgid "Select the filter."
 msgstr "Elija un archivo"
 
+#: C/mail-filters.page:53(p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:30(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:32(p)
+msgid "Click <gui style=\"button\">Edit</gui>."
+msgstr "Pulse <gui style=\"button\">Editar</gui>."
+
 #: C/mail-filters.page:54(p)
 #, fuzzy
-msgid "Make the desired corrections, then click <placeholder-1/> twice."
+msgid ""
+"Make the desired corrections, then click <gui style=\"button\">OK</gui> "
+"twice."
 msgstr "Haga las correcciones que desee, después pulse Aceptar dos veces."
 
 #: C/mail-filters.page:59(title)
 msgid "Deleting Filters"
 msgstr "Borrar filtros"
 
+#: C/mail-filters.page:63(p)
+msgid "Click <gui style=\"button\">Remove</gui>."
+msgstr "Pulse <gui style=\"button\">Quitar</gui>."
+
 #: C/mail-filters-not-working.page:5(desc)
 msgid ""
 "Fix problems with mail filters that do not sort and organize mail as "
@@ -6374,17 +4966,17 @@ msgstr ""
 #: C/mail-filters-not-working.page:24(p)
 msgid ""
 "The order of email filters is very important. If your first filter has a "
-"<placeholder-1/> rule, then all the email messages that match this filter "
-"will ignore all the succeeding filters."
+"<gui>Stop Processing</gui> rule, then all the email messages that match this "
+"filter will ignore all the succeeding filters."
 msgstr ""
 
 #: C/mail-filters-not-working.page:26(p)
-msgid "To check if a filter has a <placeholder-1/> rule:"
+msgid "To check if a filter has a <gui>Stop Processing</gui> rule:"
 msgstr ""
 
 #: C/mail-filters-not-working.page:29(p)
 #: C/mail-error-no-provider-available.page:37(p)
-msgid "Go to <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+msgid "Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
 msgstr ""
 
 #: C/mail-filters-not-working.page:30(p)
@@ -6393,16 +4985,10 @@ msgid ""
 "filter."
 msgstr ""
 
-#: C/mail-filters-not-working.page:31(gui)
-#: C/deleting-appointments.page:22(gui) C/calendar-publishing.page:30(gui)
-#, fuzzy
-msgid "Actions"
-msgstr "A_cciones"
-
 #: C/mail-filters-not-working.page:31(p)
 msgid ""
-"The <placeholder-1/> rule should be listed under the list of <placeholder-2/"
-"> if it is enabled."
+"The <gui>Stop Processing</gui> rule should be listed under the list of "
+"<gui>Actions</gui> if it is enabled."
 msgstr ""
 
 #: C/mail-filters-not-working.page:35(p)
@@ -6415,14 +5001,20 @@ msgstr ""
 
 #: C/mail-filters-not-working.page:38(p)
 msgid ""
-"Applying the <placeholder-1/> rule to an email message will cause all "
-"succeeding filters to ignore that message."
+"Applying the <gui>Stop Processing</gui> rule to an email message will cause "
+"all succeeding filters to ignore that message."
 msgstr ""
 
 #: C/mail-filters-conditions.page:5(desc)
 msgid "Available conditions for setting up filtering."
 msgstr ""
 
+#: C/mail-filters-conditions.page:23(title)
+#: C/mail-filters-actions.page:23(title)
+#, fuzzy
+msgid "Available Filter conditions"
+msgstr "Campos disponibles"
+
 #: C/mail-filters-conditions.page:86(p)
 msgid "Source Account:"
 msgstr "Cuenta de origen:"
@@ -6454,14 +5046,12 @@ msgstr ""
 msgid "Junk Test:"
 msgstr "Detección de spam:"
 
-#: C/mail-filters-conditions.page:93(link)
-msgid "junk mail"
-msgstr ""
-
 # index.docbook:458, index.docbook:949
 #: C/mail-filters-conditions.page:93(p)
 #, fuzzy
-msgid "Filters based on the results of the <placeholder-1/> test."
+msgid ""
+"Filters based on the results of the <link xref=\"mail-spam\">junk mail</"
+"link> test."
 msgstr "Filtros basados en los resultados de las pruebas de spam."
 
 #: C/mail-filters-actions.page:5(desc)
@@ -6634,22 +5224,17 @@ msgstr ""
 msgid "The filters used do not match the account they are associated with."
 msgstr ""
 
-#: C/mail-error-no-provider-available.page:27(file)
-#: C/mail-error-no-provider-available.page:28(file)
-msgid "filters.xml"
-msgstr "filters.xml"
-
 #: C/mail-error-no-provider-available.page:27(p)
 msgid ""
-"This happens when the <placeholder-1/> file is copied and used on a fresh "
-"install of Evolution on a new machine."
+"This happens when the <file>filters.xml</file> file is copied and used on a "
+"fresh install of Evolution on a new machine."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:28(p)
 msgid ""
 "Accounts have unique ID numbers, and filters refer to these accounts "
-"directly. Simply copying the <placeholder-1/> file will cause a version "
-"mismatch with Evolution, affecting the filter rules."
+"directly. Simply copying the <file>filters.xml</file> file will cause a "
+"version mismatch with Evolution, affecting the filter rules."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:31(p)
@@ -6669,7 +5254,7 @@ msgstr ""
 
 #: C/mail-error-no-provider-available.page:38(p)
 #, fuzzy
-msgid "Select the Copy/Move filter and click <placeholder-1/>."
+msgid "Select the Copy/Move filter and click <gui>Edit</gui>."
 msgstr "Seleccione el archivo y pulse Abrir."
 
 #: C/mail-error-no-provider-available.page:39(p)
@@ -6679,15 +5264,11 @@ msgid ""
 "filter. Set the folders again."
 msgstr ""
 
-#: C/mail-error-no-provider-available.page:43(link)
-msgid ""
-"How to keep the Evolution filters in sync on multiple machines by Thomas "
-"Vander Stichele"
-msgstr ""
-
 #: C/mail-error-no-provider-available.page:43(p)
 msgid ""
-"Advanced users may also be interested in this write up: <placeholder-1/>"
+"Advanced users may also be interested in this write up: <link href=\"https://"
+"thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep the Evolution "
+"filters in sync on multiple machines by Thomas Vander Stichele </link>"
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:24(title)
@@ -6695,47 +5276,25 @@ msgid ""
 "Error message \"Summary and folder mismatch\" after synchronizing folders"
 msgstr ""
 
-#: C/mail-error-folder-mismatch.page:26(gui)
-msgid ""
-"Error while Expunging folder. Error storing `~/.local/share/evolution/mail/"
-"local/Inbox (mbox)': Summary and folder mismatch, even after a sync."
-msgstr ""
-
 #: C/mail-error-folder-mismatch.page:26(p)
-#, fuzzy
 msgid ""
-"If the error message: <placeholder-1/> pops up, perform the following steps:"
-msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
-
-#: C/mail-error-folder-mismatch.page:28(file)
-msgid "~/.evolution/mail/local/"
-msgstr "~/.evolution/mail/local/"
-
-#: C/mail-error-folder-mismatch.page:28(file)
-#: C/mail-error-folder-mismatch.page:37(file)
-msgid "~/.local/share/evolution/mail/local/"
-msgstr "~/.local/share/evolution/mail/local/"
+"If the error message: <gui>Error while Expunging folder. Error storing `~/."
+"local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, "
+"even after a sync.</gui> pops up, perform the following steps:"
+msgstr ""
 
 #: C/mail-error-folder-mismatch.page:28(p)
 msgid ""
 "These steps apply to the versions 3.0 and 3.2. Note that Evolution's file "
-"locations in 2.30 and 2.32 are different (<placeholder-1/> instead of "
-"<placeholder-2/>)."
+"locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</"
+"file> instead of <file>~/.local/share/evolution/mail/local/</file>)."
 msgstr ""
 
-#: C/mail-error-folder-mismatch.page:31(gui)
-msgid "System Tools"
-msgstr ""
-
-#: C/mail-error-folder-mismatch.page:31(code)
-msgid "evolution --force-shutdown"
-msgstr "evolution --force-shutdown"
-
 #: C/mail-error-folder-mismatch.page:31(p)
 msgid ""
-"Open the Terminal application (category <placeholder-1/>) and type in the "
-"command <placeholder-2/>. This command stops Evolution and all the processes "
-"related to it."
+"Open the Terminal application (category <gui>System Tools</gui>) and type in "
+"the command <code>evolution --force-shutdown</code>. This command stops "
+"Evolution and all the processes related to it."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:32(p)
@@ -6750,22 +5309,13 @@ msgstr ".ev-summary"
 msgid ".ibex.index"
 msgstr ".ibex.index"
 
-#: C/mail-error-folder-mismatch.page:37(gui)
-#, fuzzy
-msgid "Go"
-msgstr "G"
-
-#: C/mail-error-folder-mismatch.page:37(gui)
-#, fuzzy
-msgid "Location..."
-msgstr "Lugar"
-
 #: C/mail-error-folder-mismatch.page:37(p)
 msgid ""
-"To do this, navigate to the hidden directory <placeholder-1/> and locate the "
-"specified files. You can do this in the GNOME File Manager (Nautilus) by "
-"either showing hidden files, or by entering the directory via "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq> from the menu bar."
+"To do this, navigate to the hidden directory <file>~/.local/share/evolution/"
+"mail/local/</file> and locate the specified files. You can do this in the "
+"GNOME File Manager (Nautilus) by either showing hidden files, or by entering "
+"the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from "
+"the menu bar."
 msgstr ""
 
 #: C/mail-error-folder-mismatch.page:40(p)
@@ -6781,18 +5331,14 @@ msgstr ""
 #: C/mail-error-folder-mismatch.page:48(p)
 msgid ""
 "This problem is expected to be fixed in version 3.0 according to the "
-"corresponding <placeholder-1/>. Please add a comment if this is not the case."
+"corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?id=550414"
+"\">bug report</link>. Please add a comment if this is not the case."
 msgstr ""
 
 #: C/mail-error-failed-to-append-to-sent-folder.page:24(title)
 msgid "Error message \"Failed to append to...\" after sending message"
 msgstr ""
 
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(gui)
-#, fuzzy
-msgid "Folder for sent messages"
-msgstr "Seleccione uno o más mensajes."
-
 #: C/mail-error-failed-to-append-to-sent-folder.page:26(p)
 msgid ""
 "If the error message \"Your message was sent, but an error occurred during "
@@ -6800,8 +5346,17 @@ msgid ""
 "user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': "
 "folder does not exist. Appending to local 'Sent' folder instead.\".\" is "
 "shown, you can fix the problem by editing your default folder settings under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Defaults</gui><gui>Folder for sent messages</"
+"gui></guiseq>."
+msgstr ""
+
+#: C/mail-error-failed-to-append-to-sent-folder.page:27(p)
+msgid ""
+"This bug is fixed in Evolution versions higher than 3.0.2 (stable series) "
+"and 3.1.3 (unstable development series). If this is not the case, please add "
+"a comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
+"show_bug.cgi?id=638307\">bug report</link>."
 msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:5(desc)
@@ -6814,28 +5369,13 @@ msgstr ""
 msgid "Signing or encrypting messages"
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(link)
-#, fuzzy
-msgid "added your certificate"
-msgstr "Falló al importar el certificado"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Sign"
-msgstr "Fi_rmar con S/MIME"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Encrypt"
-msgstr "C_ifrar con S/MIME"
-
 #: C/mail-encryption-s-mime-signing-encrypting.page:25(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
 #, fuzzy
 msgid ""
-"After you have <placeholder-1/>, you can sign or encrypt a message by "
-"clicking <guiseq><placeholder-2/><placeholder-3/></guiseq> or <placeholder-4/"
-"> from the message composer menu."
+"After you have <link xref=\"mail-encryption-s-mime-manage\">added your "
+"certificate</link>, you can sign or encrypt a message by clicking "
+"<guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME "
+"Encrypt</gui> from the message composer menu."
 msgstr ""
 "Después de que haya añadido su certificado, puede firmar o cifrar cada "
 "mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
@@ -6852,48 +5392,18 @@ msgstr "Para enviar cada mensaje cifrado o firmado:"
 msgid "Select the mail account to encrypt the messages in."
 msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
-#: C/mail-encryption-s-mime-signing-encrypting.page:31(gui)
-#: C/mail-encryption-gpg-signing-encrypting.page:33(gui)
-#: C/mail-encryption-gpg-set-up.page:31(gui)
-#: C/mail-account-manage-usenet-news.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
-#: C/mail-account-manage-pop.page:47(title)
-#: C/mail-account-manage-novell-groupwise.page:45(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
-#: C/mail-account-manage-mh-format-directories.page:47(title)
-#: C/mail-account-manage-maildir-format-directories.page:47(title)
-#: C/mail-account-manage-local-delivery.page:47(title)
-#: C/mail-account-manage-imap-plus.page:47(title)
-#: C/mail-account-manage-imap.page:47(title)
-msgid "Security"
-msgstr "Seguridad"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME seguro (S/MIME)"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-#, fuzzy
-msgid "Select"
-msgstr "Seleccionar…"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-#, fuzzy
-msgid "Signing Certificate"
-msgstr "Certificado de _firma:"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:32(gui)
-#, fuzzy
-msgid "Encryption Certificate"
-msgstr "Certificado de ci_frado:"
+#: C/mail-encryption-s-mime-signing-encrypting.page:31(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:33(p)
+#| msgid "Click the Security tab."
+msgid "Click <gui>Security</gui>."
+msgstr "Pulse en <gui>Seguridad</gui>."
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:32(p)
 msgid ""
-"In the <placeholder-1/> section, click <placeholder-2/> next to "
-"<placeholder-3/> and specify the path to your signing certificate, or click "
-"<placeholder-4/> next to <placeholder-5/> and specify the path to your "
+"In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style=\"button"
+"\">Select</gui> next to <gui>Signing Certificate</gui> and specify the path "
+"to your signing certificate, or click <gui style=\"button\">Select</gui> "
+"next to <gui>Encryption Certificate</gui> and specify the path to your "
 "encryption certificate."
 msgstr ""
 
@@ -6931,49 +5441,27 @@ msgstr ""
 "una conexión cifrada o firmar un mensaje confirmando su identidad al "
 "contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
 
-#: C/mail-encryption-s-mime-manage.page:26(gui)
-msgid "Certificates"
-msgstr "Certificados"
-
 #: C/mail-encryption-s-mime-manage.page:26(p)
 msgid ""
 "You can import, view, edit (except for your own certificates), and delete "
-"your certificates under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>."
+"your certificates under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Certificates</gui></guiseq>."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-msgid "Your Certificates"
-msgstr "Sus certificados"
-
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-#: C/import-single-files.page:24(gui) C/import-apps-outlook.page:59(gui)
-#: C/import-apps-outlook.page:62(gui) C/import-apps-mozilla.page:24(gui)
-msgid "Import"
-msgstr "Importar"
-
-#: C/mail-encryption-s-mime-manage.page:27(gui)
-#: C/mail-composer-html-image.page:27(gui) C/backup-restore.page:38(gui)
-msgid "Open"
-msgstr "Abrir"
-
 #: C/mail-encryption-s-mime-manage.page:27(p)
 msgid ""
-"<placeholder-1/> displays a list of certificates that you own. To add a "
-"signing certificate, click <placeholder-2/>, select the file to import, then "
-"click <placeholder-3/> and enter a password."
+"<gui>Your Certificates</gui> displays a list of certificates that you own. "
+"To add a signing certificate, click <gui style=\"button\">Import</gui>, "
+"select the file to import, then click <gui style=\"button\">Open</gui> and "
+"enter a password."
 msgstr ""
 
-#: C/mail-encryption-s-mime-manage.page:28(gui)
-msgid "Contact Certificates"
-msgstr "Certificados de contactos"
-
 #: C/mail-encryption-s-mime-manage.page:28(p)
 #, fuzzy
 msgid ""
-"<placeholder-1/> displays a list of certificates that you have for contacts. "
-"These certificates allow you to decrypt messages as well verify signed "
-"messages."
+"<gui>Contact Certificates</gui> displays a list of certificates that you "
+"have for contacts. These certificates allow you to decrypt messages as well "
+"verify signed messages."
 msgstr ""
 "Pulse sobre la pestaña Certificados de contactos para mostrar una lista de "
 "los certificados que posee de sus contactos. Estos certificados le permiten "
@@ -6981,15 +5469,11 @@ msgstr ""
 "página puede importar, ver, respaldar y borrar los certificados de sus "
 "contactos."
 
-#: C/mail-encryption-s-mime-manage.page:29(gui)
-msgid "Authorities"
-msgstr "Autoridades"
-
 #: C/mail-encryption-s-mime-manage.page:29(p)
 #, fuzzy
 msgid ""
-"<placeholder-1/> displays a list of trusted certificate authorities who "
-"verify that your own certificate is valid."
+"<gui>Authorities</gui> displays a list of trusted certificate authorities "
+"who verify that your own certificate is valid."
 msgstr ""
 "Pulse sobre la pestaña Autoridades para mostrar una lista de las autoridades "
 "de certificados de confianza quienes verifican que el certificado que tiene "
@@ -7028,25 +5512,29 @@ msgstr "Fi_rmar con S/MIME"
 msgid "Signing or encrypting messages via GPG that you send."
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/mail-encryption-gpg-signing-encrypting.page:25(link)
-msgid "set up your GPG key"
-msgstr ""
-
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "PGP Sign"
-msgstr "_Firmar con PGP"
-
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
+#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
 #, fuzzy
-msgid "PGP Encrypt"
-msgstr "Cif_rar con PGP"
+msgid ""
+"After you have <link xref=\"mail-encryption-gpg-set-up\">set up your GPG "
+"key</link>, you can sign or encrypt a message by clicking "
+"<guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</"
+"gui> from the message composer menu."
+msgstr ""
+"Después de que haya añadido su certificado, puede firmar o cifrar cada "
+"mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
+"de mensajes."
 
-#: C/mail-encryption-gpg-signing-encrypting.page:34(gui)
+#: C/mail-encryption-gpg-signing-encrypting.page:34(p)
 #, fuzzy
-msgid "Always sign outgoing messages when using this account"
+msgid ""
+"Select <gui>Always sign outgoing messages when using this account</gui>."
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
+#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
+#: C/mail-encryption-gpg-set-up.page:35(p)
+msgid "Click <gui style=\"button\">Close</gui>."
+msgstr "Pulse <gui style=\"button\">Cerrar</gui>."
+
 #: C/mail-encryption-gpg-set-up.page:5(desc)
 msgid ""
 "Setting up GPG for your mail account to sign and/or encrypt and decrypt "
@@ -7058,34 +5546,29 @@ msgstr ""
 msgid "Setting up GPG for your mail account"
 msgstr "Configurar el cifrado GPG"
 
-# index.docbook:41, index.docbook:293
-#: C/mail-encryption-gpg-set-up.page:26(link)
-#: C/mail-encryption-gpg-create-key.page:23(title)
-#, fuzzy
-msgid "Creating a GPG key"
-msgstr "Crear una tarea nueva"
-
 #: C/mail-encryption-gpg-set-up.page:26(p)
 msgid ""
 "You need a GPG key to do this. If you do not have one yet, please refer to "
-"<placeholder-1/>."
+"<link xref=\"mail-encryption-gpg-create-key\">Creating a GPG key</link>."
 msgstr ""
 
 #: C/mail-encryption-gpg-set-up.page:30(p)
 #, fuzzy
 msgid ""
-"Select the account you want to use securely, then click <placeholder-1/>."
+"Select the account you want to use securely, then click <gui style=\"button"
+"\">Edit</gui>."
 msgstr ""
 "Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
 
-#: C/mail-encryption-gpg-set-up.page:32(gui)
+#: C/mail-encryption-gpg-set-up.page:31(p)
 #, fuzzy
-msgid "PGP/GPG Key ID"
-msgstr "ID de c_lave GPG/PGP:"
+#| msgid "Click the Security tab."
+msgid "Click the <gui>Security</gui> tab."
+msgstr "Pulse en la pestaña de Seguridad."
 
 #: C/mail-encryption-gpg-set-up.page:32(p)
 #, fuzzy
-msgid "Specify your key ID in the <placeholder-1/> field."
+msgid "Specify your key ID in the <gui>PGP/GPG Key ID</gui> field."
 msgstr "Especifique el ID de su clave en el campo ID de la clave GPG/PGP."
 
 #: C/mail-encryption-gpg-set-up.page:33(p)
@@ -7095,18 +5578,12 @@ msgid ""
 "using this account, and other options."
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
-#: C/mail-encryption-gpg-set-up.page:37(code)
-#: C/mail-encryption-gpg-create-key.page:42(code)
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "gpg --list-keys"
-msgstr "gpg --list-keys"
-
 #: C/mail-encryption-gpg-set-up.page:37(p)
 #, fuzzy
 msgid ""
 "Evolution requires that you know your key ID. If you do not remember it, you "
-"can find it by typing <placeholder-1/> in a terminal window. Your key ID is "
-"an eight-character string with random numbers and letters."
+"can find it by typing <code>gpg --list-keys</code> in a terminal window. "
+"Your key ID is an eight-character string with random numbers and letters."
 msgstr ""
 "Evolution necesita que usted sepa su identificador (ID) de clave. Si no lo "
 "recuerda puede encontrarlo con el comando <command>gpg --list-keys</command> "
@@ -7134,21 +5611,13 @@ msgstr ""
 "combinación con su clave privada. Evolution lo hace por usted, pero con todo "
 "necesitará obtener su clave y añadirla a su depósito de claves."
 
-#: C/mail-encryption-gpg-getting-keys.page:28(code)
-msgid "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
-msgstr "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
-
-#: C/mail-encryption-gpg-getting-keys.page:28(code)
-msgid "keyid"
-msgstr "keyid"
-
 #: C/mail-encryption-gpg-getting-keys.page:28(p)
 #, fuzzy
 msgid ""
-"To get public keys from a public key server, enter the command "
-"<placeholder-1/>, substituting <placeholder-2/> by your recipient's ID. You "
-"need to enter your password, and the ID is automatically added to your "
-"keyring."
+"To get public keys from a public key server, enter the command <code>gpg --"
+"recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting "
+"<code>keyid</code> by your recipient's ID. You need to enter your password, "
+"and the ID is automatically added to your keyring."
 msgstr ""
 "Para obtener claves públicas desde un servidor de claves públicas escriba el "
 "comando <command> gpg --recv-keys --keyserver wwwkeys.pgp.net "
@@ -7156,15 +5625,11 @@ msgstr ""
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
 "su identificador se añadirá automáticamente a su depósito de claves."
 
-#: C/mail-encryption-gpg-getting-keys.page:30(code)
-msgid "gpg --import"
-msgstr ""
-
 #: C/mail-encryption-gpg-getting-keys.page:30(p)
 #, fuzzy
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
-"enter the command <placeholder-1/> to add it to your keyring."
+"enter the command <code>gpg --import</code> to add it to your keyring."
 msgstr ""
 "Si alguien le envía directamente su clave pública, guárdela como un archivo "
 "de texto plano e introduzca el comando <command>gpg <varname>--import</"
@@ -7217,17 +5682,19 @@ msgstr ""
 msgid "Checking the signature of a received message"
 msgstr "Seguir el estado de un mensaje."
 
-#: C/mail-encryption-gpg-decrypting.page:34(gui)
-msgid "Security Information"
-msgstr "Información de seguridad"
-
 #: C/mail-encryption-gpg-decrypting.page:34(p)
 msgid ""
 "To check the sender's signature of a received message, scroll down to the "
 "bottom of the message and click the logo. Evolution will display "
-"<placeholder-1/> for the message."
+"<gui>Security Information</gui> for the message."
 msgstr ""
 
+# index.docbook:41, index.docbook:293
+#: C/mail-encryption-gpg-create-key.page:23(title)
+#, fuzzy
+msgid "Creating a GPG key"
+msgstr "Crear una tarea nueva"
+
 #: C/mail-encryption-gpg-create-key.page:25(note)
 msgid ""
 "These steps are very technical. For average users we nowadays recommend "
@@ -7241,13 +5708,9 @@ msgid ""
 "public and private keys with GPG."
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:30(code)
-msgid "gpg --gen-key"
-msgstr "gpg --gen-key"
-
 #: C/mail-encryption-gpg-create-key.page:30(p)
 #, fuzzy
-msgid "Open a terminal window and enter <placeholder-1/>."
+msgid "Open a terminal window and enter <code>gpg --gen-key</code>."
 msgstr ""
 "Abra una terminal e introduzca el comando <command>gpg --gen-key</command>."
 
@@ -7289,33 +5752,36 @@ msgstr "Escriba una frase de paso, después pulse Intro."
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Mueva su ratón aleatoriamente para generar las claves."
 
-#: C/mail-encryption-gpg-create-key.page:42(code)
-msgid ""
-"/home/you/.gnupg/pubring.gpg ---------------------------- pub 1024D/32j38dk2 "
-"2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 2011-06-20 "
-"[expires: 2012-11-14]"
-msgstr ""
-"/home/you/.gnupg/pubring.gpg ---------------------------- pub 1024D/32j38dk2 "
-"2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 2011-06-20 "
-"[expires: 2012-11-14]"
-
 #: C/mail-encryption-gpg-create-key.page:42(p)
+#, fuzzy
+#| msgid ""
+#| "After the keys are generated, you can view your key information by "
+#| "entering <command>gpg --list-keys</command>. You should see something "
+#| "similar to this: <computeroutput> /home/you/.gnupg/pubring.gpg "
+#| "----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
+#| "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  "
+#| "</computeroutput>"
 msgid ""
 "After the keys are generated, you can view your key information by entering "
-"<placeholder-1/>. You should see something similar to this: <placeholder-2/>"
-msgstr ""
-
-#: C/mail-encryption-gpg-create-key.page:43(file)
-msgid "~/.gnupg/pubring.gpg"
-msgstr "~/.gnupg/pubring.gpg"
+"<code>gpg --list-keys</code>. You should see something similar to this: "
+"<code> /home/you/.gnupg/pubring.gpg ----------------------------  pub "
+"1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 "
+"2011-06-20 [expires: 2012-11-14]</code>"
+msgstr ""
+"Después de que se hayan generado estas claves, puede ver su información "
+"introduciendo <command>gpg --list-keys</command>. Debería ver algo similar a "
+"esto: <computeroutput> /home/you/.gnupg/pubring.gpg "
+"----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
+"you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
+"computeroutput>"
 
 #: C/mail-encryption-gpg-create-key.page:43(p)
 #, fuzzy
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
-"private keys. All the public keys you know are stored in the file "
-"<placeholder-1/>. If you want to give other people your key, send them that "
-"file."
+"private keys. All the public keys you know are stored in the file <file>~/."
+"gnupg/pubring.gpg</file>. If you want to give other people your key, send "
+"them that file."
 msgstr ""
 "GPG creará una lista, o depósito de claves, con todas las claves públicas "
 "que tenga y otra para las privadas. Todas las claves públicas que conoce "
@@ -7327,41 +5793,24 @@ msgstr ""
 msgid "If you want, you can upload your keys to a key server:"
 msgstr "Si lo desea puede subir sus claves a un servidor de claves."
 
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "1024D"
-msgstr "1024D"
-
-#: C/mail-encryption-gpg-create-key.page:46(code)
-msgid "pub"
-msgstr "pub"
-
-#: C/mail-encryption-gpg-create-key.page:46(code)
-#: C/mail-encryption-gpg-create-key.page:47(varname)
-#: C/mail-encryption-gpg-create-key.page:47(quote)
-msgid "32j38dk2"
-msgstr "32j38dk2"
-
 #: C/mail-encryption-gpg-create-key.page:46(p)
 #, fuzzy
 msgid ""
-"Check your public key ID with <placeholder-1/>. It is the string after "
-"<placeholder-2/> on the line beginning with <placeholder-3/>. In the example "
-"above, it is <placeholder-4/>."
+"Check your public key ID with <code>gpg --list-keys</code>. It is the string "
+"after <code>1024D</code> on the line beginning with <code>pub</code>. In the "
+"example above, it is <code>32j38dk2</code>."
 msgstr ""
 "Compruebe su identificador de clave pública con gpg --list-keys. Su "
 "identificador será la cadena que está detrás de <quote>1024D</quote> en la "
 "línea que empieza con <quote>pub</quote>. En este ejemplo es "
 "<quote>32j38dk2</quote>."
 
-#: C/mail-encryption-gpg-create-key.page:47(code)
-msgid "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
-msgstr "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
-
 #: C/mail-encryption-gpg-create-key.page:47(p)
 #, fuzzy
 msgid ""
-"Enter the command <placeholder-1/>. Substitute your key ID for "
-"<placeholder-2/>. You need your password to do this."
+"Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"<varname>32j38dk2</varname></code>. Substitute your key ID for "
+"<quote>32j38dk2</quote>. You need your password to do this."
 msgstr ""
 "Escriba el comando <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Sustituya el identificador de su "
@@ -7408,15 +5857,10 @@ msgstr ""
 msgid "Removing duplicate emails"
 msgstr "¿Quitar mensajes duplicados?"
 
-#: C/mail-duplicates.page:28(gui)
-#, fuzzy
-msgid "Remove Duplicate Messages"
-msgstr "Quitar correos _duplicados"
-
 #: C/mail-duplicates.page:28(p)
 msgid ""
-"To remove duplicate emails in a folder, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+"To remove duplicate emails in a folder, click <guiseq><gui>Message</"
+"gui><gui>Remove Duplicate Messages</gui></guiseq>."
 msgstr ""
 
 #: C/mail-duplicates.page:33(title)
@@ -7436,13 +5880,11 @@ msgstr ""
 msgid "Evolution is having a problem with the UIDL extension."
 msgstr ""
 
-#: C/mail-duplicates.page:38(file)
-msgid "$HOME/.local/share/evolution/mail/pop/"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
-
 #: C/mail-duplicates.page:38(p)
 #, fuzzy
-msgid "The cache files located at <placeholder-1/> are not writable."
+msgid ""
+"The cache files located at <file>$HOME/.local/share/evolution/mail/pop/</"
+"file> are not writable."
 msgstr "No se puede escribir en la carpeta seleccionada."
 
 #: C/mail-displaying-sender-photograph.page:5(desc)
@@ -7463,32 +5905,28 @@ msgid ""
 "photograph."
 msgstr ""
 
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-change-time-format.page:20(gui)
-msgid "Headers"
-msgstr "Cabeceras"
-
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#, fuzzy
-msgid "Show the photograph of sender in the message preview"
-msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
-
 #: C/mail-displaying-sender-photograph.page:29(p)
+#, fuzzy
+#| msgid ""
+#| "To enable this feature, select Edit &gt; Preferences &gt; Mail "
+#| "Preferences &gt; Headers &gt; Show the photograph of sender in the email "
+#| "preview. Deselect this option to disable this feature."
 msgid ""
-"To enable this functionality, select <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+"To enable this functionality, select <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</"
+"gui><gui>Show the photograph of sender in the message preview</gui></guiseq>."
 msgstr ""
-
-#: C/mail-displaying-sender-photograph.page:31(gui)
-#, fuzzy
-msgid "Search for sender photograph only in local address books"
-msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
+"Para activar esta característica, seleccione Editar &gt; Preferencias &gt; "
+"Opciones de correo &gt; Cabeceras &gt; Mostrar la foto del remitente en la "
+"vista preliminar del correo-e. Deseleccione esta opción para desactivar esta "
+"característica."
 
 #: C/mail-displaying-sender-photograph.page:31(p)
 msgid ""
 "By default only local address books are used for searching the photograph as "
 "accessing remote address books can cause delays. You can disable this by "
-"deselecting the option <placeholder-1/>."
+"deselecting the option <gui>Search for sender photograph only in local "
+"address books</gui>."
 msgstr ""
 
 #: C/mail-displaying-sender-photograph.page:33(p)
@@ -7504,40 +5942,30 @@ msgstr ""
 msgid "HTML emails are not correctly displayed"
 msgstr ""
 
-#: C/mail-displaying-no-css.page:23(link)
-msgid "CSS"
-msgstr ""
-
 #: C/mail-displaying-no-css.page:23(p)
 msgid ""
 "If an HTML message is not correctly displayed in Evolution it might be that "
-"the formatting of the message is specified as <placeholder-1/>. CSS is "
-"currently not supported by gtkhtml (the part that is used to display HTML)."
+"the formatting of the message is specified as <link href=\"http://en."
+"wikipedia.org/wiki/Cascading_Style_Sheets\">CSS</link>. CSS is currently not "
+"supported by gtkhtml (the part that is used to display HTML)."
 msgstr ""
 
 #: C/mail-displaying-no-css.page:24(p)
 msgid "This will likely be fixed in version 3.2 or 3.4."
 msgstr ""
 
-#: C/mail-displaying-no-css.page:25(link)
-msgid "webkit"
-msgstr ""
-
 #: C/mail-displaying-no-css.page:25(p)
 msgid ""
 "For developers only: In future versions, Evolution will use WebKit instead "
-"of gtkhtml for displaying HTML. There is a branch named \"<placeholder-1/>\" "
-"in Evolution's code repository to test."
+"of gtkhtml for displaying HTML. There is a branch named \"<link href="
+"\"http://git.gnome.org/browse/evolution?h=webkit\">webkit</link>\" in "
+"Evolution's code repository to test."
 msgstr ""
 
-#: C/mail-displaying-no-css.page:27(link)
-#: C/mail-displaying-character-encodings.page:20(title)
-#, fuzzy
-msgid "Character Encodings and Sets"
-msgstr "Codificación de caracteres"
-
 #: C/mail-displaying-no-css.page:27(p)
-msgid "For missing characters in emails, see <placeholder-1/>."
+msgid ""
+"For missing characters in emails, see <link xref=\"mail-displaying-character-"
+"encodings\">Character Encodings and Sets</link>."
 msgstr ""
 
 #: C/mail-displaying-message.page:5(desc)
@@ -7593,79 +6021,36 @@ msgstr ""
 "lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
 "privacidad."
 
-#: C/mail-displaying-images-in-html.page:36(gui)
-#, fuzzy
-msgid "Load Images"
-msgstr "Cargar _imágenes"
-
-#: C/mail-displaying-images-in-html.page:36(key)
-msgid "I"
-msgstr "I"
-
 #: C/mail-displaying-images-in-html.page:36(p)
 msgid ""
-"To load the images for one message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or press <keyseq><placeholder-3/><placeholder-4/"
-"></keyseq>."
+"To load the images for one message, click <guiseq><gui>View</gui><gui>Load "
+"Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-msgid "HTML Messages"
-msgstr "Mensajes HTML"
-
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-msgid "Loading Images"
-msgstr "Cargando imágenes"
-
 #: C/mail-displaying-images-in-html.page:38(p)
 msgid ""
-"To set the default action for loading images, go to <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+"To set the default action for loading images, go to <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</"
+"gui><gui>Loading Images</gui></guiseq>."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:42(title)
 msgid "Automatically download images in emails from people you know"
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:44(gui)
-#, fuzzy
-msgid "Load images only in messages from contacts"
-msgstr "Cargar i_mágenes en los mensajes de mis contactos"
-
 #: C/mail-displaying-images-in-html.page:44(p)
 msgid ""
 "You can download images from emails sent by your contacts. To do this, go to "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq>. Enable the <placeholder-6/> option."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
+"gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>. Enable the "
+"<gui>Load images only in messages from contacts</gui> option."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/intro-main-window.page:132(title)
-#: C/import-supported-file-formats.page:60(title)
-#: C/contacts-autocompletion.page:30(gui)
-msgid "Contacts"
-msgstr "Contactos"
-
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/mail-composer-several-recipients.page:38(title)
-#: C/mail-composer-several-recipients.page:39(link)
-#: C/contacts-autocompletion.page:30(gui)
-msgid "Autocompletion"
-msgstr "Autocompletado"
-
-#: C/mail-displaying-images-in-html.page:46(gui)
-#: C/contacts-autocompletion.page:32(gui)
-#, fuzzy
-msgid "Always show address of the autocompleted contact"
-msgstr "_Siempre mostrar la dirección del contacto autocompletado"
-
 #: C/mail-displaying-images-in-html.page:46(p)
 msgid ""
-"Next, go to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/></guiseq>. Enable autocompletion by ticking the "
-"<placeholder-5/> checkbox."
+"Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</"
+"gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the "
+"<gui>Always show address of the autocompleted contact</gui> checkbox."
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:50(title)
@@ -7678,6 +6063,31 @@ msgid ""
 "You currently cannot save images to disk that are embedded in HTML emails."
 msgstr ""
 
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:27(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/filter-new-fig.png'; "
+#| "md5=75a2b8ccfe0f7a4982859827c867d578"
+msgid ""
+"@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+msgstr ""
+"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:29(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/exchng-rec-options.png'; "
+#| "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
+msgid ""
+"@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
+msgstr ""
+"@@image: 'figures/exchng-rec-options.png'; "
+"md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
+
 # index.docbook:458, index.docbook:949
 #: C/mail-displaying-collapsible-headers.page:5(desc)
 #, fuzzy
@@ -7698,40 +6108,18 @@ msgstr ""
 "muestra sólo direcciones limitadas. Puede establecer un límite en el número "
 "de direcciones para mostrar en el panel de vista previa."
 
-#: C/mail-displaying-collapsible-headers.page:27(gui)
-#: C/mail-composer-write-new-message.page:27(gui)
-#: C/mail-composer-several-recipients.page:32(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/mail-composer-reply.page:27(gui) C/mail-composer-reply.page:28(gui)
-#: C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "To:"
-msgstr "_Para:"
-
-#: C/mail-displaying-collapsible-headers.page:27(gui)
-#: C/mail-composer-several-recipients.page:32(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/mail-composer-reply.page:28(gui) C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "Cc:"
-msgstr "_Cc:"
-
 #: C/mail-displaying-collapsible-headers.page:27(p)
 msgid ""
 "To see all recipients, click the <media type=\"image\" src=\"./figures/plus-"
-"icon.png\"/> icon next to the <placeholder-1/> or <placeholder-2/> line, or "
+"icon.png\"/> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or "
 "click the ellipsis (...) at the end of the five displayed addresses."
 msgstr ""
 
-#: C/mail-displaying-collapsible-headers.page:29(gui)
-msgid "From:"
-msgstr "De:"
-
 #: C/mail-displaying-collapsible-headers.page:29(p)
 msgid ""
 "To collapse all of the message headers and just display the subject and "
 "sender in one line, click the icon <media type=\"image\" src=\"./figures/"
-"minus-icon.png\"/> next to the <placeholder-1/> line. This is helpful on "
+"minus-icon.png\"/> next to the <gui>From:</gui> line. This is helpful on "
 "small screens."
 msgstr ""
 
@@ -7739,8 +6127,9 @@ msgstr ""
 msgid "When characters in an email are not shown correctly or missing."
 msgstr ""
 
-#: C/mail-displaying-character-encodings.page:24(gui)
-msgid "Character Encoding"
+#: C/mail-displaying-character-encodings.page:20(title)
+#, fuzzy
+msgid "Character Encodings and Sets"
 msgstr "Codificación de caracteres"
 
 #. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed
@@ -7748,35 +6137,17 @@ msgstr "Codificación de caracteres"
 msgid ""
 "If the email program of the sender is broken or misconfigured, plain text "
 "emails might not include information about the character encoding used. If "
-"you receive such messages, choose <guiseq><placeholder-1/><placeholder-2/></"
-"guiseq> from the main menu and change the currently chosen character "
-"encoding to an appropriate one that might be the encoding used by the "
-"sender. You have to make this change every time you view the message."
+"you receive such messages, choose <guiseq><gui>View</gui><gui>Character "
+"Encoding</gui></guiseq> from the main menu and change the currently chosen "
+"character encoding to an appropriate one that might be the encoding used by "
+"the sender. You have to make this change every time you view the message."
 msgstr ""
 
-#: C/mail-displaying-character-encodings.page:25(gui)
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-#: C/contacts-ldap.page:32(gui) C/calendar-timezones.page:30(gui)
-#: C/calendar-timezones.page:32(gui)
-#: C/calendar-layout-general-formatting.page:27(gui)
-#: C/calendar-layout-appointment-display.page:32(title)
-msgid "General"
-msgstr "General"
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-msgid "Message Display"
-msgstr "Mostrado de mensajes"
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-#, fuzzy
-msgid "Default character encoding"
-msgstr "_Codificación de caracteres predeterminada:"
-
 #: C/mail-displaying-character-encodings.page:25(p)
 msgid ""
-"To constantly change this setting, go to <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>."
+"To constantly change this setting, go to <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+"gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>."
 msgstr ""
 
 #: C/mail-delete-and-undelete.page:5(desc)
@@ -7796,30 +6167,24 @@ msgstr "Recuperar mensajes"
 #: C/mail-delete-and-undelete.page:30(p)
 #, fuzzy
 msgid ""
-"To delete a message, select it and press the <placeholder-1/> key, or click "
-"the <placeholder-2/> button in the toolbar, or press <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>, or right-click the message and click "
-"<placeholder-5/>."
+"To delete a message, select it and press the <key>Delete</key> key, or click "
+"the <gui style=\"button\">Delete</gui> button in the toolbar, or press "
+"<keyseq><key>Ctrl</key><key>D</key></keyseq>, or right-click the message and "
+"click <gui>Delete</gui>."
 msgstr ""
 "Evolution le permite borrar correos no deseados. Para borrar un correo, "
 "selecciónelo y pulse la tecla Suprimir, o pulse el botón Borrar en la barra "
 "de herramientas, pulse Ctrl+D o pulse con el botón derecho del ratón sobre "
 "el mensaje y después pulse Borrar."
 
-#: C/mail-delete-and-undelete.page:32(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Show Deleted Messages"
-msgstr "Mostrar los mensajes _eliminados"
-
 #: C/mail-delete-and-undelete.page:32(p)
 #, fuzzy
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. You can see all message marked for "
 "deletion in the Trash folder. To show deleted messages, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>. You can view the messages "
-"striken off for later deletion."
+"<guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can "
+"view the messages striken off for later deletion."
 msgstr ""
 "Cuando pulsa Borrar o pulsa en el la carpeta de la Papelera, su correo no se "
 "borra realmente sino que se marca para ser eliminado. Su correo es "
@@ -7829,21 +6194,12 @@ msgstr ""
 "Ver. Puede ver los mensajes marcados para ser borrados posteriormente. Puede "
 "además encontrar los mensajes borrados en la carpeta Papelera."
 
-#: C/mail-delete-and-undelete.page:34(gui) C/deleting-emails.page:31(gui)
-#, fuzzy
-msgid "Expunge"
-msgstr "_Purgar"
-
-#: C/mail-delete-and-undelete.page:34(key) C/deleting-emails.page:31(key)
-msgid "E"
-msgstr "E"
-
 #: C/mail-delete-and-undelete.page:34(p)
 #, fuzzy
 msgid ""
 "To permanently erase all the deleted messages in a folder, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>."
+"<guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press "
+"<keyseq><key>Ctrl</key><key>E</key></keyseq>."
 msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
 "pulse Carpeta &gt; Purgar o pulse Ctrl+E."
@@ -7852,18 +6208,13 @@ msgstr ""
 msgid "Undeleting Messages"
 msgstr "Recuperar mensajes"
 
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Undelete message"
-msgstr "_Recuperar mensaje"
-
 #: C/mail-delete-and-undelete.page:40(p)
 #, fuzzy
 msgid ""
 "You can undelete a message that has been deleted but not expunged yet. To "
-"undelete a message, select the message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. Note that <guiseq><placeholder-3/><placeholder-4/"
-"></guiseq> must be enabled for this."
+"undelete a message, select the message, click <guiseq><gui>Edit</"
+"gui><gui>Undelete message</gui></guiseq>. Note that <guiseq><gui>View</"
+"gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this."
 msgstr ""
 "Puede recuperar un mensaje que ha sido borrado pero no ha sido purgado. Para "
 "recuperar un mensaje, seleccione el mensaje, pulse Editar &gt: Recuperar. "
@@ -7892,9 +6243,9 @@ msgstr "Dirección del buzón"
 #: C/mail-default-folder-locations.page:33(p)
 msgid ""
 "You can set a different place where to store messages in your Draft folder "
-"and Sent folder in the <placeholder-1/> section of the mail account editor "
-"(<guiseq><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>)."
+"and Sent folder in the <gui>Defaults</gui> section of the mail account "
+"editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
 msgstr ""
 
 #: C/mail-default-folder-locations.page:34(p)
@@ -7917,9 +6268,9 @@ msgstr "Cliente de calendario predeterminado"
 msgid ""
 "You can set email addresses that should always receive copies of your sent "
 "mail (either as CC visible for all recipients, or BCC not visible for other "
-"recipients) in the <placeholder-1/> section of the mail account editor "
-"(<guiseq><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/"
-"><placeholder-6/></guiseq>)."
+"recipients) in the <gui>Defaults</gui> section of the mail account editor "
+"(<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
 msgstr ""
 
 #: C/mail-composer-write-new-message.page:5(desc)
@@ -7931,52 +6282,34 @@ msgstr ""
 msgid "Composing a new message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-custom-header-lines.page:41(gui)
-#, fuzzy
-msgid "Mail Message"
-msgstr "_Mensaje de correo"
-
-#: C/mail-composer-write-new-message.page:25(key)
-#: C/mail-composer-custom-header-lines.page:41(key)
-#: C/mail-attachments-sending.page:30(key)
-#: C/calendar-layout-views.page:30(key)
-msgid "M"
-msgstr "M"
-
 #: C/mail-composer-write-new-message.page:25(p)
+#, fuzzy
+#| msgid ""
+#| "You can start writing a new email message by clicking File &gt; New &gt; "
+#| "Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking "
+#| "New in the toolbar."
 msgid ""
-"You can start writing a new email message by clicking <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>, by pressing "
-"<keyseq><placeholder-4/><placeholder-5/><placeholder-6/></keyseq>, or by "
-"clicking <placeholder-7/> in the toolbar."
+"You can start writing a new email message by clicking <guiseq><gui>File</"
+"gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq>, or by clicking "
+"<gui>New</gui> in the toolbar."
 msgstr ""
+"Puede comenzar a escribir un nuevo mensaje de correo-e pulsando Archivo &gt; "
+"Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la herramienta "
+"de correo o pulsando Nuevo en la barra de herramientas."
 
 #: C/mail-composer-write-new-message.page:27(p)
 msgid ""
-"Enter an email address in the <placeholder-1/> field. If you want to enter "
+"Enter an email address in the <gui>To:</gui> field. If you want to enter "
 "multiple addresses, separate them by commas. See <link xref=\"mail-composer-"
 "several-recipients\"/> for more information on sending messages to more than "
 "one person."
 msgstr ""
 
-#: C/mail-composer-write-new-message.page:29(gui)
-#: C/mail-composer-message-templates.page:68(gui)
-#: C/mail-composer-forward.page:34(gui)
-#, fuzzy
-msgid "Send"
-msgstr "_Enviar"
-
-#: C/mail-composer-write-new-message.page:29(key)
-#: C/mail-composer-forward.page:34(key)
-#, fuzzy
-msgid "Return"
-msgstr "devuelve"
-
 #: C/mail-composer-write-new-message.page:29(p)
 msgid ""
-"After you have written your message, click <placeholder-1/> or press "
-"<keyseq><placeholder-2/><placeholder-3/></keyseq>."
+"After you have written your message, click <gui>Send</gui> or press "
+"<keyseq><key>Ctrl</key><key>Return</key></keyseq>."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:5(desc)
@@ -7993,19 +6326,11 @@ msgstr "Ortografía"
 msgid "Prerequirements"
 msgstr ""
 
-#: C/mail-composer-spellcheck.page:26(em)
-msgid "hunspell"
-msgstr ""
-
-#: C/mail-composer-spellcheck.page:26(em)
-msgid "enchant"
-msgstr ""
-
 #: C/mail-composer-spellcheck.page:26(p)
 msgid ""
 "To use spell checking for the emails that you write you first need to make "
-"sure that the <placeholder-1/> package for your specific language and the "
-"<placeholder-2/> package are installed via the software management tool of "
+"sure that the <em>hunspell</em> package for your specific language and the "
+"<em>enchant</em> package are installed via the software management tool of "
 "your distribution."
 msgstr ""
 
@@ -8022,38 +6347,20 @@ msgstr ""
 msgid "Global Preferences"
 msgstr "Opciones de correo"
 
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(link) C/mail-composer-reply.page:54(gui)
-#: C/mail-composer-html.page:28(gui) C/mail-composer-forward.page:41(gui)
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-msgid "Composer Preferences"
-msgstr "Editor de correo"
-
-#: C/mail-composer-spellcheck.page:34(gui)
-#: C/mail-composer-spellcheck.page:36(gui)
-#: C/mail-composer-spellcheck.page:41(gui)
-msgid "Spell Checking"
-msgstr "Ortografía"
-
 #: C/mail-composer-spellcheck.page:34(p)
 msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq> you can define whether your spelling is checked "
-"while you type and which color is used for underlining words that are "
-"misspelled."
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer "
+"Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you "
+"can define whether your spelling is checked while you type and which color "
+"is used for underlining words that are misspelled."
 msgstr ""
 
-#: C/mail-composer-spellcheck.page:36(gui)
-#, fuzzy
-msgid "Languages"
-msgstr "_Idiomas"
-
 #: C/mail-composer-spellcheck.page:36(p)
 msgid ""
 "You can also define which installed languages are used for spell checking in "
-"the list available under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+"the list available under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</"
+"gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:40(title)
@@ -8061,20 +6368,12 @@ msgstr ""
 msgid "Manual spell checking in the composer"
 msgstr "Color de la corrección ortográfica"
 
-#: C/mail-composer-spellcheck.page:41(gui)
-#, fuzzy
-msgid "Checking spelling while I type"
-msgstr "Comprobar orto_grafía mientras se escribe"
-
-#: C/mail-composer-spellcheck.page:41(key)
-msgid "F7"
-msgstr "F7"
-
 #: C/mail-composer-spellcheck.page:41(p)
 msgid ""
-"If you do not have <placeholder-1/> enabled in the <placeholder-2/> you can "
-"run a spell check in the email composer by clicking <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq> or by pressing <placeholder-5/>."
+"If you do not have <gui>Checking spelling while I type</gui> enabled in the "
+"<link xref=\"#global-preferences\">Composer Preferences</link> you can run a "
+"spell check in the email composer by clicking <guiseq><gui>Edit</"
+"gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:5(desc)
@@ -8082,7 +6381,6 @@ msgid "Sending to more than one person and using CC or BCC."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:26(title)
-#: C/contacts-using-contact-lists.page:36(link)
 #, fuzzy
 msgid "Sending a message to several recipients"
 msgstr "Enviando la respuesta sólo a los destinatarios definidos en _Cco"
@@ -8101,42 +6399,34 @@ msgstr "Destinatarios"
 #: C/mail-composer-several-recipients.page:32(p)
 msgid ""
 "Email messages can have three different types of recipients. The simplest "
-"way is to put the email address or addresses in the <placeholder-1/> text "
-"field. The <placeholder-2/> text field is used for recipients that are meant "
+"way is to put the email address or addresses in the <gui>To:</gui> text "
+"field. The <gui>Cc:</gui> text field is used for recipients that are meant "
 "to receive a copy of your message but are not the primary recipients."
 msgstr ""
 
-#: C/mail-composer-several-recipients.page:34(gui)
-#: C/mail-composer-several-recipients.page:45(gui)
-#: C/contacts-autocompletion.page:34(gui)
-#, fuzzy
-msgid "Bcc:"
-msgstr "Cc_o:"
-
-#: C/mail-composer-several-recipients.page:34(gui)
-#, fuzzy
-msgid "Bcc Field"
-msgstr "Campo «Cc_o»"
-
 #: C/mail-composer-several-recipients.page:34(p)
 #, fuzzy
 msgid ""
-"Addresses in the <placeholder-1/> text field are hidden from the other "
+"Addresses in the <gui>Bcc:</gui> text field are hidden from the other "
 "recipients of the message. It can be used to send mail to large groups of "
 "people, especially if they do not know each other or if privacy is a "
-"concern. If the <placeholder-2/> text field is not shown, click "
-"<guiseq><placeholder-3/><placeholder-4/></guiseq>."
+"concern. If the <gui>Bcc:</gui> text field is not shown, click "
+"<guiseq><gui>View</gui><gui>Bcc Field</gui></guiseq>."
 msgstr ""
 "Las direcciones en la lista Cco: están ocultas a los otros destinatarios del "
 "mensaje. Puede usarlo para enviar correos a grandes grupos de personas "
 "especialmente si no se conocen entre sí o si es importante mantener la "
 "privacidad. Si el campo Cco: no está a la vista pulse Ver &gt; Campo Cco."
 
+#: C/mail-composer-several-recipients.page:38(title)
+msgid "Autocompletion"
+msgstr "Autocompletado"
+
 #: C/mail-composer-several-recipients.page:39(p)
 msgid ""
-"It is recommended to use the <placeholder-1/> feature of the Evolution "
-"address book for entering addresses. By using this you avoid typos and save "
-"time."
+"It is recommended to use the <link xref=\"contacts-autocompletion"
+"\">Autocompletion</link> feature of the Evolution address book for entering "
+"addresses. By using this you avoid typos and save time."
 msgstr ""
 
 #: C/mail-composer-several-recipients.page:43(title)
@@ -8147,11 +6437,11 @@ msgstr "Mostrar los botones del selector"
 #: C/mail-composer-several-recipients.page:45(p)
 #, fuzzy
 msgid ""
-"Instead of typing the recipients' names you can also click the "
-"<placeholder-1/>, <placeholder-2/>, or <placeholder-3/> buttons to get a "
-"list of the email addresses in your address books. Select the addresses and "
-"click the arrow buttons to move them into the appropriate address columns "
-"(To:, Cc:, Bcc:)."
+"Instead of typing the recipients' names you can also click the <gui style="
+"\"button\">To:</gui>, <gui style=\"button\">Cc:</gui>, or <gui style=\"button"
+"\">Bcc:</gui> buttons to get a list of the email addresses in your address "
+"books. Select the addresses and click the arrow buttons to move them into "
+"the appropriate address columns (To:, Cc:, Bcc:)."
 msgstr ""
 "Alternativamente, puede pulsar los botones Para:, Cc:, Cco:, para obtener "
 "una lista de las direcciones de correo-e en su lista de contactos. "
@@ -8162,7 +6452,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
-"<placeholder-1/> to send them mail as though they have a single address."
+"<link xref=\"contacts-using-contact-lists\">contact lists</link> to send "
+"them mail as though they have a single address."
 msgstr ""
 "Si escribe con frecuencia a los mismos grupos de personas, puede crear "
 "listas de direcciones en la herramienta de contactos, y después enviarles "
@@ -8183,30 +6474,23 @@ msgstr "Buscar y sustituir en el editor de mensajes"
 #: C/mail-composer-search.page:23(p)
 #, fuzzy
 msgid ""
-"Under the <placeholder-1/> menu in the message composer there are several "
+"Under the <gui>Edit</gui> menu in the message composer there are several "
 "text searching features available."
 msgstr ""
 "El editor de mensajes le proporciona varias características de búsqueda de "
 "texto."
 
-#: C/mail-composer-search.page:26(gui)
-#, fuzzy
-msgid "Find"
-msgstr "Buscar:"
-
-#: C/mail-composer-search.page:26(p) C/mail-composer-search.page:30(p)
-#: C/mail-composer-search.page:34(p)
-#, fuzzy
-msgid "<placeholder-1/>:"
-msgstr "gpg <placeholder-1/>"
+#: C/mail-composer-search.page:26(p)
+msgid "<gui>Find</gui>:"
+msgstr ""
 
 #: C/mail-composer-search.page:27(p)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
 
-#: C/mail-composer-search.page:30(gui)
+#: C/mail-composer-search.page:30(p)
 #, fuzzy
-msgid "Find Again"
+msgid "<gui>Find Again</gui>:"
 msgstr "Buscar de nuevo:"
 
 #: C/mail-composer-search.page:31(p)
@@ -8214,10 +6498,9 @@ msgid "Select this item to repeat the last search you performed."
 msgstr ""
 "Seleccione este elemento para repetir la última búsqueda que haya realizado."
 
-#: C/mail-composer-search.page:34(gui)
-#, fuzzy
-msgid "Replace"
-msgstr "Reemplazar:"
+#: C/mail-composer-search.page:34(p)
+msgid "<gui>Replace</gui>:"
+msgstr ""
 
 #: C/mail-composer-search.page:35(p)
 msgid "Find a word or phrase, and replace it with something else."
@@ -8234,15 +6517,11 @@ msgstr ""
 "punto el que se encuentra el cursor. También puede determinar si quiere que "
 "la búsqueda sea sensible a mayúsculas o no."
 
-#: C/mail-composer-search.page:40(link)
-#, fuzzy
-msgid "Regular expressions"
-msgstr "expresión regular"
-
 #: C/mail-composer-search.page:40(p)
 msgid ""
 "If you have a technical background you can also select the option to use "
-"<placeholder-1/> for searching."
+"<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/"
+"Regular_expression\">Regular expressions</link> for searching."
 msgstr ""
 
 #: C/mail-composer-reply.page:5(desc)
@@ -8264,12 +6543,12 @@ msgstr "Responder a mensajes de correo-e"
 msgid ""
 "To reply to a message, select the message to reply to in the message list "
 "and click the Reply button in the toolbar, or right-click within the message "
-"and select Reply to Sender. This opens the message composer. The "
-"<placeholder-1/> and <placeholder-2/> fields are already filled, although "
-"you can alter them if you prefer. In addition, the full text of the old "
-"message is inserted into the new message, either in grey with a blue line on "
-"one side (for HTML display) or with the &gt; character before each line (in "
-"plain text mode), to indicate that it is part of the previous message."
+"and select Reply to Sender. This opens the message composer. The <gui>To:</"
+"gui> and <gui>Subject:</gui> fields are already filled, although you can "
+"alter them if you prefer. In addition, the full text of the old message is "
+"inserted into the new message, either in grey with a blue line on one side "
+"(for HTML display) or with the &gt; character before each line (in plain "
+"text mode), to indicate that it is part of the previous message."
 msgstr ""
 "Para responder a un mensaje, seleccione el mensaje al que responder en la "
 "lista de mensajes y pulse el botón Responder en la barra de tareas, o pulse "
@@ -8281,23 +6560,12 @@ msgstr ""
 "antes de cada línea (para el modo texto plano), para indicar que es parte "
 "del mensaje anterior."
 
-#: C/mail-composer-reply.page:28(gui) C/mail-composer-reply.page:33(gui)
-#: C/mail-composer-reply.page:34(gui) C/mail-composer-reply.page:47(p)
-msgid "Reply to All"
-msgstr "Responder a todos"
-
-#: C/mail-composer-reply.page:28(gui) C/mail-composer-reply.page:33(gui)
-#: C/mail-composer-reply.page:34(gui)
-#: C/mail-composer-message-templates.page:39(gui)
-msgid "Reply"
-msgstr "Responder"
-
 #: C/mail-composer-reply.page:28(p)
 #, fuzzy
 msgid ""
-"If you are reading a message with several recipients, you can use "
-"<placeholder-1/> instead of <placeholder-2/>. If there are large numbers of "
-"people in the <placeholder-3/> or <placeholder-4/> fields, this can save "
+"If you are reading a message with several recipients, you can use <gui>Reply "
+"to All</gui> instead of <gui>Reply</gui>. If there are large numbers of "
+"people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save "
 "substantial amounts of time."
 msgstr ""
 "Si está leyendo un mensaje que tiene varios destinatarios puede que desee "
@@ -8313,10 +6581,10 @@ msgstr "Uso de la característica de Responder a todos"
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
-"of them to read, he uses <placeholder-1/>, but if he just wants to tell "
-"Susan that he agrees with her, he uses <placeholder-2/>. His reply does not "
-"reach anyone that Susan put on her Bcc list, because that list is not shared "
-"with anyone."
+"of them to read, he uses <gui>Reply to All</gui>, but if he just wants to "
+"tell Susan that he agrees with her, he uses <gui>Reply</gui>. His reply does "
+"not reach anyone that Susan put on her Bcc list, because that list is not "
+"shared with anyone."
 msgstr ""
 "Susana envía un mensaje a un cliente y añade una copia para Tomás y a una "
 "lista de correo interna de la compañía para sus compañeros de trabajo. Si "
@@ -8326,16 +6594,12 @@ msgstr ""
 "respuesta no la recibirá nadie a quien Susana haya incluido en la lista de "
 "Cco: de su mensaje original porque tal lista no ha sido compartida con nadie."
 
-#: C/mail-composer-reply.page:34(gui)
-msgid "Reply to List"
-msgstr "Responder a la lista"
-
 #: C/mail-composer-reply.page:34(p)
 #, fuzzy
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
-"list rather than to the sender, select <placeholder-1/> instead of "
-"<placeholder-2/> or <placeholder-3/>."
+"list rather than to the sender, select <gui>Reply to List</gui> instead of "
+"<gui>Reply</gui> or <gui>Reply to All</gui>."
 msgstr ""
 "Si está suscrito a una lista de correo y quiere que su respuesta sólo vaya a "
 "la misma en lugar de al remitente pulse en Responder la lista en lugar de "
@@ -8358,6 +6622,11 @@ msgstr "Atajos de teclado"
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
+#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:45(key)
+#: C/mail-composer-reply.page:47(key)
+msgid "Ctrl"
+msgstr "Ctrl"
+
 #: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:47(key)
 msgid "R"
 msgstr "R"
@@ -8367,31 +6636,30 @@ msgstr "R"
 msgid "Reply to Mailing List"
 msgstr "Responder a la lista"
 
-#: C/mail-composer-reply.page:45(key) C/calendar-layout-views.page:31(key)
+#: C/mail-composer-reply.page:45(key)
 msgid "L"
 msgstr "L"
 
+#: C/mail-composer-reply.page:47(p)
+msgid "Reply to All"
+msgstr "Responder a todos"
+
+#: C/mail-composer-reply.page:47(key)
+msgid "Shift"
+msgstr ""
+
 # index.docbook:29, index.docbook:30
-#: C/mail-composer-reply.page:53(title) C/mail-composer-forward.page:26(link)
-#: C/mail-composer-forward.page:40(title)
+#: C/mail-composer-reply.page:53(title) C/mail-composer-forward.page:40(title)
 #, fuzzy
 msgid "Default settings"
 msgstr "Ajustes predeterminados"
 
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-msgid "Replies and Forwards"
-msgstr "Respuestas y reenvíos"
-
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-#, fuzzy
-msgid "Forward style"
-msgstr "_Estilo de reenvío:"
-
 #: C/mail-composer-reply.page:54(p) C/mail-composer-forward.page:41(p)
 msgid ""
 "The default settings for replying and forwarding can be changed under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
+"gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</"
+"gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-priority.page:5(desc)
@@ -8403,29 +6671,12 @@ msgstr ""
 msgid "Prioritizing outgoing messages"
 msgstr "Priorizar mensaje:"
 
-#: C/mail-composer-priority.page:25(gui)
-#: C/mail-composer-html-text.page:25(gui)
-#: C/mail-composer-html-table.page:25(gui)
-#: C/mail-composer-html-rule.page:25(gui)
-#: C/mail-composer-html-link.page:27(gui)
-#: C/mail-composer-html-image.page:25(gui)
-#: C/mail-composer-custom-header-lines.page:42(gui)
-#: C/mail-attachments-sending.page:30(gui)
-#, fuzzy
-msgid "Insert"
-msgstr "_Insertar"
-
-#: C/mail-composer-priority.page:25(gui)
-#, fuzzy
-msgid "Prioritize Message"
-msgstr "Priorizar mensaje:"
-
 #: C/mail-composer-priority.page:25(p)
 #, fuzzy
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
-"relative importance. To prioritize a message, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the composer window."
+"relative importance. To prioritize a message, click <guiseq><gui>Insert</"
+"gui><gui>Prioritize Message</gui></guiseq> in the composer window."
 msgstr ""
 "Puede priorizar un mensaje para ser enviado, para que el destinatario vea su "
 "importancia relativa. Para priorizar un mensaje, pulse Insertar &gt; "
@@ -8460,18 +6711,10 @@ msgstr ""
 "momento para enviar correos con el mismo patrón. Evolution le permite crear "
 "y editar plantillas de mensajes."
 
-#: C/mail-composer-message-templates.page:25(gui)
-#: C/mail-composer-message-templates.page:35(gui)
-#: C/mail-composer-message-templates.page:61(gui)
-#: C/mail-composer-message-templates.page:62(gui)
-#: C/mail-composer-message-templates.page:78(gui)
-msgid "Templates"
-msgstr "Plantillas"
-
 #: C/mail-composer-message-templates.page:25(p)
 msgid ""
-"To enable the Message Template Plugin, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> and enable <placeholder-3/>."
+"To enable the Message Template Plugin, click <guiseq><gui>Edit</"
+"gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:31(title)
@@ -8483,23 +6726,19 @@ msgstr "Crear un mensaje plantilla desde un mensaje existente"
 msgid "Select the message."
 msgstr "Seleccione el mensaje."
 
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Move to folder"
-msgstr "Mover a la carpeta"
-
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Copy to folder"
-msgstr "Copiar a la carpeta"
-
 #: C/mail-composer-message-templates.page:34(p)
+#, fuzzy
+#| msgid "Right-click &gt; Move to folder / Copy to folder."
 msgid ""
-"Right-click the message and choose <placeholder-1/> or <placeholder-2/>."
+"Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to "
+"folder</gui>."
 msgstr ""
+"Pulse con el botón derecho del ratón &gt; Mover a la carpeta / Copiar a la "
+"carpeta."
 
 #: C/mail-composer-message-templates.page:35(p)
-msgid "Select the <placeholder-1/> folder under <placeholder-2/>."
+msgid ""
+"Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:37(p)
@@ -8510,7 +6749,7 @@ msgstr ""
 
 #: C/mail-composer-message-templates.page:39(p)
 #, fuzzy
-msgid "Open the message and click <placeholder-1/>."
+msgid "Open the message and click <gui>Reply</gui>."
 msgstr "Abra el mensaje y pulse Responder."
 
 #: C/mail-composer-message-templates.page:40(p)
@@ -8518,10 +6757,10 @@ msgid "Edit the message body or the addresses according to your requirements."
 msgstr ""
 "Edite el cuerpo del mensaje o las direcciones de acuerdo con sus necesidades."
 
-#: C/mail-composer-message-templates.page:41(gui)
-#: C/mail-composer-message-templates.page:52(gui)
-msgid "Save as Template"
-msgstr "Guardar como plantilla"
+#: C/mail-composer-message-templates.page:41(p)
+#: C/mail-composer-message-templates.page:52(p)
+msgid "Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>."
+msgstr ""
 
 #: C/mail-composer-message-templates.page:46(title)
 msgid "Saving a New Message as a Template"
@@ -8529,8 +6768,8 @@ msgstr "Guardar un mensaje nuevo como plantilla"
 
 #: C/mail-composer-message-templates.page:49(p)
 msgid ""
-"Click <placeholder-1/> and enter in the composer window what you need for "
-"the template."
+"Click <gui>New</gui> and enter in the composer window what you need for the "
+"template."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:58(title)
@@ -8540,7 +6779,7 @@ msgstr "Usar una plantilla de mensaje como respuesta"
 #: C/mail-composer-message-templates.page:61(p)
 #, fuzzy
 msgid ""
-"Right-click the message you are replying to, then click <placeholder-1/>."
+"Right-click the message you are replying to, then click <gui>Templates</gui>."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje al que está "
 "respondiendo, después pulse Plantillas."
@@ -8548,7 +6787,8 @@ msgstr ""
 #: C/mail-composer-message-templates.page:62(p)
 #, fuzzy
 msgid ""
-"This option lists all the message templates in the <placeholder-1/> folder."
+"This option lists all the message templates in the <gui>Templates</gui> "
+"folder."
 msgstr ""
 "Esta opción lista todas las plantillas de mensajes en la carpeta Plantilla."
 
@@ -8560,6 +6800,11 @@ msgstr ""
 "Seleccione un mensaje de plantilla a su elección. Realice los cambios que "
 "quiera en la ventana del editor de mensajes que se abrirá."
 
+#: C/mail-composer-message-templates.page:68(p)
+#| msgid "Click Send."
+msgid "Click <gui>Send</gui>."
+msgstr "Pulse <gui>Enviar</gui>."
+
 #: C/mail-composer-message-templates.page:69(p)
 msgid ""
 "When you select a message template for replying, the subject of the reply is "
@@ -8572,6 +6817,24 @@ msgstr ""
 msgid "Configuring Message Templates"
 msgstr "Configurar plantillas de mensajes"
 
+#: C/mail-composer-message-templates.page:77(p)
+#: C/mail-composer-custom-header-lines.page:31(p)
+#: C/mail-attachments-sending.page:46(p)
+msgid "Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+msgstr ""
+
+#: C/mail-composer-message-templates.page:78(p)
+msgid "Click <gui>Templates</gui>."
+msgstr ""
+
+#: C/mail-composer-message-templates.page:79(p)
+#: C/mail-composer-custom-header-lines.page:33(p)
+#: C/mail-attachments-sending.page:48(p)
+#, fuzzy
+#| msgid "Click the Receiving Options tab."
+msgid "Click the <gui>Configuration</gui> tab."
+msgstr "Pulse en la pestaña Opciones de recepción."
+
 #: C/mail-composer-message-templates.page:80(p)
 #, fuzzy
 msgid ""
@@ -8659,35 +6922,13 @@ msgstr ""
 msgid "Default account signature"
 msgstr "Recordatorio predeterminado de citas"
 
-#: C/mail-composer-mail-signatures-per-account.page:34(link)
-msgid "signature"
-msgstr "firma"
-
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-#: C/mail-account-manage-usenet-news.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
-#: C/mail-account-manage-pop.page:28(title)
-#: C/mail-account-manage-novell-groupwise.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
-#: C/mail-account-manage-mh-format-directories.page:28(title)
-#: C/mail-account-manage-maildir-format-directories.page:28(title)
-#: C/mail-account-manage-local-delivery.page:28(title)
-#: C/mail-account-manage-imap-plus.page:28(title)
-#: C/mail-account-manage-imap.page:28(title) C/intro-first-run.page:25(title)
-msgid "Identity"
-msgstr "Identidad"
-
-#: C/mail-composer-mail-signatures-per-account.page:34(gui)
-msgid "Optional Information"
-msgstr "Información opcional"
-
 #: C/mail-composer-mail-signatures-per-account.page:34(p)
 msgid ""
-"You can define a default <placeholder-1/> for each of your mail accounts. "
-"This can be edited under <guiseq><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/><placeholder-7/></guiseq>."
+"You can define a default <link xref=\"mail-composer-mail-signatures"
+"\">signature</link> for each of your mail accounts. This can be edited under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-per-account.page:36(p)
@@ -8707,26 +6948,18 @@ msgstr ""
 msgid "Working with email signatures"
 msgstr "Utilización de cuentas de correo"
 
-#: C/mail-composer-mail-signatures.page:23(code)
-msgid "--"
-msgstr "--"
-
 #: C/mail-composer-mail-signatures.page:23(p)
 msgid ""
 "A signature consists of one or more lines of text (or even a picture) that "
 "will be added at the end of an email that you send. It can contain contact "
 "information or other things. A signature always begins with two dashes and a "
-"space (<placeholder-1/>)."
+"space (<code>-- </code>)."
 msgstr ""
 
-#: C/mail-composer-mail-signatures.page:24(link)
-#, fuzzy
-msgid "encryption"
-msgstr "Cifrado"
-
 #: C/mail-composer-mail-signatures.page:24(p)
 msgid ""
-"The term \"signature\" is also differently used in terms of <placeholder-1/>."
+"The term \"signature\" is also differently used in terms of <link xref="
+"\"mail-encryption\">encryption</link>."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-manage.page:5(desc)
@@ -8738,31 +6971,18 @@ msgstr ""
 msgid "Managing signatures"
 msgstr "Firma no válida"
 
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#, fuzzy
-msgid "Composer preferences"
-msgstr "Editor de correo"
-
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-msgid "Signatures"
-msgstr "Firmas"
-
 #: C/mail-composer-mail-signatures-manage.page:22(p)
 msgid ""
-"You can add, edit and delete all your signatures under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq>."
+"You can add, edit and delete all your signatures under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</"
+"gui></guiseq>."
 msgstr ""
 
-#: C/mail-composer-mail-signatures-manage.page:23(link)
-#, fuzzy
-msgid "account settings"
-msgstr "Configuración de la cuenta de Yahoo:"
-
 #: C/mail-composer-mail-signatures-manage.page:23(p)
 msgid ""
 "Assigning a default signature to an email account has to be done in the "
-"<placeholder-1/>."
+"<link xref=\"mail-composer-mail-signatures-per-account\">account settings</"
+"link>."
 msgstr ""
 
 #: C/mail-composer-html-text.page:5(desc)
@@ -8780,8 +7000,8 @@ msgstr "Dar formato _HTML a los mensajes"
 #, fuzzy
 msgid ""
 "HTML formatting tools are located in the two tool bars just above the area "
-"where you actually write the message. They also appear in the <placeholder-1/"
-"> and <placeholder-2/> menus."
+"where you actually write the message. They also appear in the <gui>Insert</"
+"gui> and <gui>Format</gui> menus."
 msgstr ""
 "Las herramientas de formateo HTML se encuentran en la barra de herramientas "
 "justo encima del espacio en el que realmente compone su mensaje y también "
@@ -8802,33 +7022,14 @@ msgstr ""
 msgid "Headers and Lists:"
 msgstr "Cabeceras y listas:"
 
-#: C/mail-composer-html-text.page:30(gui)
-msgid "Normal"
-msgstr "Normal"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Header 1"
-msgstr "Cabecera"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Header 6"
-msgstr "Cabecera"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Preformat"
-msgstr "Formato de la hora:"
-
 #: C/mail-composer-html-text.page:30(p)
 #, fuzzy
 msgid ""
-"At the left of the upper tool bar, you can choose <placeholder-1/> for a "
-"default text style or <placeholder-2/> through <placeholder-3/> for varying "
-"sizes of header from large (1) to tiny (6). Other styles include "
-"<placeholder-4/>, to use the HTML tag for preformatted blocks of text, and "
-"three types of bullet points for lists."
+"At the left of the upper tool bar, you can choose <gui>Normal</gui> for a "
+"default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for "
+"varying sizes of header from large (1) to tiny (6). Other styles include "
+"<gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, "
+"and three types of bullet points for lists."
 msgstr ""
 "En el borde izquierda de la barra de herramientas puede elegir el estilo de "
 "texto predeterminado, Normal o los diferentes tamaños de cabecera "
@@ -8836,18 +7037,13 @@ msgstr ""
 "pequeño). Otros estilos disponibles para los más organizados son Preformato, "
 "la lista de puntos o los tres tipos de listas numeradas."
 
-#: C/mail-composer-html-text.page:31(gui)
-#, fuzzy
-msgid "Bulleted List"
-msgstr "Eli_minar la lista de notas"
-
 #: C/mail-composer-html-text.page:31(p)
 #, fuzzy
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
-"use the <placeholder-1/> style from the style dropdown list. Evolution uses "
-"different bullet styles, and handles word wrap and multiple levels of "
-"indentation."
+"use the <gui>Bulleted List</gui> style from the style dropdown list. "
+"Evolution uses different bullet styles, and handles word wrap and multiple "
+"levels of indentation."
 msgstr ""
 "En lugar de usar asteriscos para marcar una lista de puntos, pruebe el "
 "estilo Lista de puntos desde el menú desplegable de estilos. Evolution "
@@ -8903,8 +7099,6 @@ msgid "Button"
 msgstr "Botón"
 
 #: C/mail-composer-html-text.page:51(p)
-#: C/calendar-usage-add-appointment.page:31(gui)
-#: C/calendar-meetings-sending-invitation.page:41(gui)
 msgid "Description"
 msgstr "Descripción"
 
@@ -8955,16 +7149,6 @@ msgstr "Tacha el texto."
 msgid "Color Selection:"
 msgstr "Selección de color:"
 
-#: C/mail-composer-html-text.page:78(gui)
-#, fuzzy
-msgid "Style"
-msgstr "Nombre del estilo:"
-
-#: C/mail-composer-html-text.page:78(gui)
-#, fuzzy
-msgid "Page Style"
-msgstr "Configuración de la página:"
-
 #: C/mail-composer-html-text.page:78(p)
 #, fuzzy
 msgid ""
@@ -8973,8 +7157,8 @@ msgid ""
 "button to the right. If you have text selected, the color applies to the "
 "selected text. If you do not have text selected, the color applies to "
 "whatever you type next. You can select a background color or image by right-"
-"clicking the message background, then selecting <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+"clicking the message background, then selecting <guiseq><gui>Style</"
+"gui><gui>Page Style</gui></guiseq>."
 msgstr ""
 "En el extremo de la derecha está la herramienta de selección del color, "
 "donde una caja muestra el color actual del texto. Para elegir uno nuevo "
@@ -9002,14 +7186,9 @@ msgid ""
 msgstr ""
 "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/mail-composer-html-table.page:25(gui)
-#, fuzzy
-msgid "Table..."
-msgstr "Tabla"
-
-#: C/mail-composer-html-table.page:25(p) C/mail-composer-html-rule.page:25(p)
-#: C/mail-composer-html-image.page:25(p)
-msgid "Click <guiseq><placeholder-1/><placeholder-2/></guiseq> in the menubar."
+#: C/mail-composer-html-table.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar."
 msgstr ""
 
 #: C/mail-composer-html-table.page:26(p)
@@ -9045,23 +7224,19 @@ msgid ""
 msgstr ""
 "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/mail-composer-html-rule.page:25(gui)
-#, fuzzy
-msgid "Rule..."
-msgstr "_Nombre completo…"
+#: C/mail-composer-html-rule.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar."
+msgstr ""
 
 #: C/mail-composer-html-rule.page:26(p)
 #, fuzzy
 msgid "Select width, size, and alignment."
 msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/mail-composer-html-rule.page:27(gui)
-msgid "Shaded"
-msgstr ""
-
 #: C/mail-composer-html-rule.page:27(p)
 #, fuzzy
-msgid "Select <placeholder-1/> if wanted."
+msgid "Select <gui>Shaded</gui> if wanted."
 msgstr "gpg <placeholder-1/>"
 
 #: C/mail-composer-html.page:5(desc)
@@ -9097,32 +7272,20 @@ msgstr ""
 "descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
 "texto plano a menos que le pida explícitamenteque los componga con HTML."
 
-#: C/mail-composer-html.page:27(gui)
-msgid "HTML"
-msgstr "HTML"
-
 #: C/mail-composer-html.page:27(p)
 #, fuzzy
 msgid ""
 "You can change the format of an email message from plain text to HTML by "
-"choosing <guiseq><placeholder-1/><placeholder-2/></guiseq> from the menu bar."
+"choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar."
 msgstr ""
 "Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
 "a HTML eligiendo Formato &gt; HTML desde la barra de menú."
 
-#: C/mail-composer-html.page:28(gui)
-msgid "Default Behavior"
-msgstr "Comportamiento predeterminado"
-
-#: C/mail-composer-html.page:28(gui)
-#, fuzzy
-msgid "Format messages in HTML"
-msgstr "Dar formato _HTML a los mensajes"
-
 #: C/mail-composer-html.page:28(p)
 msgid ""
-"To send all your mail as HTML by default, enable <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+"To send all your mail as HTML by default, enable <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default "
+"Behavior</gui><gui>Format messages in HTML</gui></guiseq>."
 msgstr ""
 
 #: C/mail-composer-html.page:31(title)
@@ -9150,24 +7313,16 @@ msgstr "Para insertar una tabla en el texto:"
 msgid "Select the text that you want to turn into a link."
 msgstr "Seleccione el texto en el que quiere poner el enlace."
 
-#: C/mail-composer-html-link.page:27(gui)
-msgid "Link..."
-msgstr ""
-
-#: C/mail-composer-html-link.page:27(gui)
-#, fuzzy
-msgid "Insert Link"
-msgstr "Insertar un enlace"
-
 #: C/mail-composer-html-link.page:27(p)
 msgid ""
-"Either click <guiseq><placeholder-1/><placeholder-2/></guiseq> in the "
-"menubar, or right-click on the selected text and click <placeholder-3/>."
+"Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the "
+"menubar, or right-click on the selected text and click <gui>Insert Link</"
+"gui>."
 msgstr ""
 
 #: C/mail-composer-html-link.page:28(p)
 #, fuzzy
-msgid "Enter the address in the <placeholder-1/> field."
+msgid "Enter the address in the <gui>URL</gui> field."
 msgstr "Escriba su dirección de correo-e en el campo Dirección de correo-e."
 
 #: C/mail-composer-html-link.page:32(p)
@@ -9197,16 +7352,20 @@ msgid ""
 msgstr ""
 "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/mail-composer-html-image.page:25(gui)
-#, fuzzy
-msgid "Image..."
-msgstr "Imagen"
+#: C/mail-composer-html-image.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar."
+msgstr ""
 
 #: C/mail-composer-html-image.page:26(p)
 #, fuzzy
 msgid "Browse to and select the file."
 msgstr "Navegue y seleccione el archivo de la imagen."
 
+#: C/mail-composer-html-image.page:27(p)
+msgid "Click <gui>Open</gui>."
+msgstr "Pulse <gui>Abrir</gui>."
+
 #: C/mail-composer-html-image.page:30(note)
 msgid ""
 "Alternately, you can also drag an image into the text area of the message "
@@ -9232,9 +7391,9 @@ msgstr ""
 #: C/mail-composer-forward.page:26(p)
 msgid ""
 "You can forward a message as an attachment to a new message (this is the "
-"default setting, see <placeholder-1/>), inline (in your message without the "
-"&gt; character before each line), or quoted (with &gt; character before each "
-"line)."
+"default setting, see <link xref=\"#default-settings\">Default settings</"
+"link>), inline (in your message without the &gt; character before each "
+"line), or quoted (with &gt; character before each line)."
 msgstr ""
 
 #: C/mail-composer-forward.page:27(p)
@@ -9250,29 +7409,14 @@ msgstr ""
 msgid "To forward a message that you are reading:"
 msgstr "Reenviar un mensaje que está leyendo:"
 
-# #-#-#-#-#  usage-exchange.po  #-#-#-#-#
-# index.docbook:342, index.docbook:514
-#: C/mail-composer-forward.page:31(gui)
-msgid "Forward"
-msgstr "Reenviar"
-
-#: C/mail-composer-forward.page:31(key)
-msgid "F"
-msgstr "F"
-
-#: C/mail-composer-forward.page:31(gui)
-#, fuzzy
-msgid "Forward as"
-msgstr "Reenviar _como"
-
 #: C/mail-composer-forward.page:31(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq>, the <placeholder-3/"
-"> button in the toolbar, or press <keyseq><placeholder-4/><placeholder-5/></"
-"keyseq> to use the default forwarding method. In case you want to use a "
-"different forward method, click <guiseq><placeholder-6/><placeholder-7/></"
-"guiseq> or the small dropdown arrow next to the <placeholder-8/> button in "
-"the toolbar to choose the method."
+"Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the "
+"<gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> to use the default forwarding method. In case you "
+"want to use a different forward method, click <guiseq><gui>Message</"
+"gui><gui>Forward as</gui></guiseq> or the small dropdown arrow next to the "
+"<gui>Forward</gui> button in the toolbar to choose the method."
 msgstr ""
 
 #: C/mail-composer-forward.page:32(p)
@@ -9291,8 +7435,8 @@ msgstr "Añada sus comentarios en el mensaje dentro del marco de edición"
 
 #: C/mail-composer-forward.page:34(p)
 msgid ""
-"Click <placeholder-1/> or press <keyseq><placeholder-2/><placeholder-3/></"
-"keyseq>."
+"Click <gui style=\"button\">Send</gui> or press <keyseq><key>Ctrl</"
+"key><key>Return</key></keyseq>."
 msgstr ""
 
 #: C/mail-composer-forward.page:37(p)
@@ -9315,28 +7459,18 @@ msgstr "Mensajes con adjuntos"
 msgid "Forwarding a message with its attachments"
 msgstr "Mensajes con adjuntos"
 
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#, fuzzy
-msgid "Forward as..."
-msgstr "_Reenviar contacto…"
-
 #: C/mail-composer-forward-as-attachment.page:23(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> and choose "
-"<placeholder-3/>, so the forwarded email and also its attachments get "
+"Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose "
+"<gui>Attachment</gui>, so the forwarded email and also its attachments get "
 "attached to the email you want to send."
 msgstr ""
 
-#: C/mail-composer-forward-as-attachment.page:26(gui)
-#, fuzzy
-msgid "Forward Style"
-msgstr "_Estilo de reenvío:"
-
 #: C/mail-composer-forward-as-attachment.page:26(p)
 msgid ""
-"If you want to have this setting by default, set <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq> to <placeholder-5/"
-">."
+"If you want to have this setting by default, set <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</"
+"gui></guiseq> to <gui>Attachment</gui>."
 msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:5(desc)
@@ -9364,16 +7498,11 @@ msgstr "Pulse Añadir para añadir cualquier cabecera predefinida."
 msgid "To set up the Custom Header plugin:"
 msgstr "Para activar el complemento Cabecera personalizada:"
 
-#: C/mail-composer-custom-header-lines.page:32(gui)
-#: C/mail-composer-custom-header-lines.page:42(gui)
-msgid "Custom Header"
-msgstr "Cabecera personalizada"
-
 #: C/mail-composer-custom-header-lines.page:32(p)
-#: C/mail-attachments-sending.page:47(p)
 #, fuzzy
-msgid "Enable <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#| msgid "Email Custom Header"
+msgid "Enable <gui>Custom Header</gui>."
+msgstr "Cabeceras personalizadas del correo-e"
 
 #: C/mail-composer-custom-header-lines.page:34(p)
 #, fuzzy
@@ -9397,20 +7526,20 @@ msgstr "Añadir una cabecera personalizada a los mensajes salientes."
 
 #: C/mail-composer-custom-header-lines.page:41(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press "
-"<keyseq><placeholder-3/><placeholder-4/><placeholder-5/></keyseq> to open "
-"the message composer window."
+"Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the "
+"message composer window."
 msgstr ""
 
-#: C/mail-composer-custom-header-lines.page:43(gui)
-msgid "Email Custom Header"
-msgstr "Cabeceras personalizadas del correo-e"
+#: C/mail-composer-custom-header-lines.page:42(p)
+msgid "Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>."
+msgstr ""
 
 #: C/mail-composer-custom-header-lines.page:43(p)
 #, fuzzy
 msgid ""
-"In the <placeholder-1/> window, you can view all the defined header fields "
-"and values."
+"In the <gui>Email Custom Header</gui> window, you can view all the defined "
+"header fields and values."
 msgstr ""
 "En la ventana Cabeceras personalizadas del correo-e puede ver todos campos "
 "de cabeceras y valores que puede añadir."
@@ -9432,14 +7561,10 @@ msgstr ""
 msgid "Changing the \"On <em>date, person</em> wrote:\" string when replying"
 msgstr ""
 
-#: C/mail-composer-change-quotation-string.page:24(file)
-msgid "/apps/evolution/mail/composer/message_attribution"
-msgstr "/apps/evolution/mail/composer/message_attribution"
-
 #: C/mail-composer-change-quotation-string.page:24(p)
 msgid ""
-"Advanced users can change this string by editing the gconf key "
-"<placeholder-1/> via gconf-editor."
+"Advanced users can change this string by editing the gconf key <file>/apps/"
+"evolution/mail/composer/message_attribution</file> via gconf-editor."
 msgstr ""
 
 #: C/mail-change-time-format.page:5(desc)
@@ -9452,16 +7577,11 @@ msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 msgid "Format of dates and time"
 msgstr "Seleccione la fecha y la hora."
 
-#: C/mail-change-time-format.page:20(gui)
-#, fuzzy
-msgid "Date/Time format"
-msgstr "Formato de la fecha y hora"
-
 #: C/mail-change-time-format.page:20(p)
 msgid ""
-"You can change the format of the <placeholder-1/> column by setting your "
-"prefered format under <guiseq><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+"You can change the format of the <gui>Date</gui> column by setting your "
+"prefered format under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail "
+"Preferences</gui><gui>Headers</gui><gui>Date/Time format</gui></guiseq>."
 msgstr ""
 
 #: C/mail-change-time-format.page:20(p)
@@ -9481,24 +7601,20 @@ msgstr ""
 msgid "Changing the message list columns"
 msgstr "Agrupar la lista de mensajes."
 
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Add a Column..."
-msgstr "Añadir una c_olumna…"
-
 #: C/mail-change-columns-in-message-list.page:22(p)
 msgid ""
 "If you want to change the columns in the mail message list, right-click on "
-"the column headers and choose either <placeholder-1/> or <placeholder-2/>."
+"the column headers and choose either <gui>Add a Column...</gui> or "
+"<gui>Remove This Column</gui>."
 msgstr ""
 
 #: C/mail-change-columns-in-message-list.page:23(p)
 msgid ""
-"If you have a small display, you can replace the <placeholder-1/> column by "
-"the <placeholder-2/> which will remove prefixes such as \"Re:\", or you can "
-"replace the <placeholder-3/> column which displays the sender's name and "
-"email address by the <placeholder-4/> column which will only display the "
-"sender's name."
+"If you have a small display, you can replace the <gui>Subject</gui> column "
+"by the <gui>Subject - Trimmed</gui> which will remove prefixes such as \"Re:"
+"\", or you can replace the <gui>From</gui> column which displays the "
+"sender's name and email address by the <gui>Sender</gui> column which will "
+"only display the sender's name."
 msgstr ""
 
 #: C/mail-cannot-see.page:5(desc)
@@ -9523,57 +7639,39 @@ msgid ""
 "These could be automatically moving your messages to another destination."
 msgstr ""
 
-#: C/mail-cannot-see.page:27(gui)
-msgid "Read Messages"
-msgstr "Mensajes leídos"
-
 #: C/mail-cannot-see.page:27(p)
 msgid ""
 "Check your search view in the search bar right above the message list. "
-"Perhaps the <placeholder-1/> dropdown list is set to a filter like "
-"<placeholder-2/>, or the text input filed contains some value. Click the "
-"broom icon to clear the search field."
+"Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read "
+"Messages</gui>, or the text input filed contains some value. Click the broom "
+"icon to clear the search field."
 msgstr ""
 
-#: C/mail-cannot-see.page:30(gui) C/intro-main-window.page:80(gui)
-#, fuzzy
-msgid "Show Message Preview"
-msgstr "Mostrar vista _previa del correo"
-
 #: C/mail-cannot-see.page:30(p)
 msgid ""
 "If you cannot see any emails at all in a folder, check that you have not "
 "maximized the message preview (so the message list pane is hidden). To do "
-"this, click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq>."
+"this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message "
+"Preview</gui></guiseq>."
 msgstr ""
 
 #: C/mail-cannot-see.page:33(p)
 msgid ""
-"Look in the <placeholder-1/> folder. Messages that are marked as Junk "
+"Look in the <gui>Junk</gui> folder. Messages that are marked as Junk "
 "disappear from the original folder and are moved to the Junk folder."
 msgstr ""
 
-#: C/mail-cannot-see.page:38(gui)
-#, fuzzy
-msgid "Show Hidden Messages"
-msgstr "_Mostrar mensajes ocultos"
-
 #: C/mail-cannot-see.page:38(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> to make sure all "
-"messages are visible."
+"Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to "
+"make sure all messages are visible."
 msgstr ""
 
-#: C/mail-cannot-see.page:41(gui)
-msgid "Email Accounts"
-msgstr "Cuentas de correo-e"
-
 #: C/mail-cannot-see.page:41(p)
 msgid ""
-"Check your default folder under <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>. Perhaps it is "
-"set to some other folder then the folder you thought of."
+"Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. "
+"Perhaps it is set to some other folder then the folder you thought of."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:5(desc)
@@ -9598,17 +7696,11 @@ msgstr ""
 "Evolution. La tarjeta de invitación se envía como archivo adjunto en formato "
 "iCal."
 
-#: C/mail-calendar-sending-invitations.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:26(gui)
-#, fuzzy
-msgid "Forward as iCalendar"
-msgstr "Reenviar como i_Calendar…"
-
 #: C/mail-calendar-sending-invitations.page:25(p)
 #, fuzzy
 msgid ""
 "To send an invitation, right-click on the entry in the calendar and choose "
-"<placeholder-1/>."
+"<gui>Forward as iCalendar</gui>."
 msgstr ""
 "Para enviar una invitación pulse con el botón derecho sobre el elemento del "
 "calendario y pulse Reenviar como iCalendar."
@@ -9686,15 +7778,11 @@ msgstr "Adjuntar archivo(s)"
 msgid "To attach a file to your email in the composer:"
 msgstr "Para adjuntar un archivo a su correo-e:"
 
-#: C/mail-attachments-sending.page:30(gui)
-#, fuzzy
-msgid "Add Attachment..."
-msgstr "_Añadir adjunto…"
-
 #: C/mail-attachments-sending.page:30(p)
 msgid ""
-"Click <placeholder-1/>, or click <guiseq><placeholder-2/><placeholder-3/></"
-"guiseq>, or press <keyseq><placeholder-4/><placeholder-5/></keyseq>."
+"Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</"
+"gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</"
+"key></keyseq>."
 msgstr ""
 
 #: C/mail-attachments-sending.page:31(p)
@@ -9715,7 +7803,6 @@ msgstr ""
 "enviados y recibidos."
 
 #: C/mail-attachments-sending.page:40(title)
-#: C/mail-attachments-sending.page:47(gui)
 msgid "Attachment Reminder"
 msgstr "Recuerdo de adjuntos"
 
@@ -9734,10 +7821,16 @@ msgstr ""
 msgid "To enable the Attachment Reminder:"
 msgstr "Para activar el Recuerdo de adjuntos:"
 
+#: C/mail-attachments-sending.page:47(p)
+#, fuzzy
+#| msgid "To enable the Attachment Reminder:"
+msgid "Enable <gui>Attachment Reminder</gui>."
+msgstr "Para activar el Recuerdo de adjuntos:"
+
 #: C/mail-attachments-sending.page:49(p)
 msgid ""
-"Click <placeholder-1/>, then enter keywords in your language such as \"Attach"
-"\" or \"enclosed\"."
+"Click <gui style=\"button\">Add</gui>, then enter keywords in your language "
+"such as \"Attach\" or \"enclosed\"."
 msgstr ""
 
 #: C/mail-attachments-sending.page:51(p)
@@ -9762,31 +7855,22 @@ msgid "Handling attachments in received mail"
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
-#: C/mail-attachments-received.page:26(gui)
-#, fuzzy
-msgid "Save All"
-msgstr "Guardar _todo"
-
 #: C/mail-attachments-received.page:26(p)
 msgid ""
 "If you receive an email message with one or more file attachments, Evolution "
-"displays the number of attachments and a <placeholder-1/> or <placeholder-2/"
-"> button between the email header and the content of the email."
+"displays the number of attachments and a <gui style=\"button\">Save</gui> or "
+"<gui style=\"button\">Save All</gui> button between the email header and the "
+"content of the email."
 msgstr ""
 
 #: C/mail-attachments-received.page:28(p)
 msgid "A list of attachments is also available at the bottom of the email."
 msgstr ""
 
-#: C/mail-attachments-received.page:29(gui)
-#, fuzzy
-msgid "Save As"
-msgstr "Guardar como…"
-
 #: C/mail-attachments-received.page:29(p)
 msgid ""
 "To save an attachment to disk, click the down-arrow next to the attachment "
-"icon and click <placeholder-1/>."
+"icon and click <gui>Save As</gui>."
 msgstr ""
 
 #: C/mail-attachments-received.page:30(p)
@@ -9795,22 +7879,13 @@ msgid ""
 "the attachment icon and choose one of the available applications."
 msgstr ""
 
-#: C/mail-attachments-received.page:32(gui)
-#, fuzzy
-msgid "Image Viewer"
-msgstr "Archivos de imágenes"
-
-#: C/mail-attachments-received.page:32(gui)
-msgid "GIMP"
-msgstr ""
-
 #: C/mail-attachments-received.page:32(p)
 #, fuzzy
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications that are installed on your system. For "
-"example, image files can be opened in the <placeholder-1/> application or in "
-"the <placeholder-2/> graphics editor."
+"example, image files can be opened in the <gui>Image Viewer</gui> "
+"application or in the <gui>GIMP</gui> graphics editor."
 msgstr ""
 "Las opciones disponibles para los adjuntos varían dependiendo del tipo de "
 "adjunto y de las aplicaciones instaladas en su sistema. Por ejemplo, los "
@@ -9837,21 +7912,20 @@ msgstr "Añadir su cuenta Exchange a Evolution"
 msgid "Usenet news account settings"
 msgstr "Configuración de la cuenta de Google:"
 
-#: C/mail-account-manage-usenet-news.page:24(link)
-#: C/mail-account-manage-unix-mbox-spool-file.page:24(link)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24(link)
-#: C/mail-account-manage-pop.page:24(link)
-#: C/mail-account-manage-novell-groupwise.page:25(link)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(link)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(link)
-#: C/mail-account-manage-mh-format-directories.page:24(link)
-#: C/mail-account-manage-maildir-format-directories.page:24(link)
-#: C/mail-account-manage-local-delivery.page:24(link)
-#: C/mail-account-manage-imap-plus.page:24(link)
-#: C/mail-account-manage-imap.page:24(link)
-#, fuzzy
-msgid "First-Run Assistant"
-msgstr "Uso del asistente para la primera ejecución"
+#: C/mail-account-manage-usenet-news.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:23(title)
+#: C/mail-account-manage-pop.page:23(title)
+#: C/mail-account-manage-novell-groupwise.page:24(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:23(title)
+#: C/mail-account-manage-mh-format-directories.page:23(title)
+#: C/mail-account-manage-maildir-format-directories.page:23(title)
+#: C/mail-account-manage-local-delivery.page:23(title)
+#: C/mail-account-manage-imap-plus.page:23(title)
+#: C/mail-account-manage-imap.page:23(title)
+msgid "Account Editor"
+msgstr "Editor de cuentas"
 
 #: C/mail-account-manage-usenet-news.page:24(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:24(p)
@@ -9866,10 +7940,11 @@ msgstr "Uso del asistente para la primera ejecución"
 #: C/mail-account-manage-imap-plus.page:24(p)
 #: C/mail-account-manage-imap.page:24(p)
 msgid ""
-"Mail accounts can be added via <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq>. The steps are mostly the same as "
-"for the <placeholder-5/>, except for not getting asked whether to import "
-"data from other applications or to restore from a backup file."
+"Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Add</gui></guiseq>. The "
+"steps are mostly the same as for the <link xref=\"intro-first-run\">First-"
+"Run Assistant</link>, except for not getting asked whether to import data "
+"from other applications or to restore from a backup file."
 msgstr ""
 
 #: C/mail-account-manage-usenet-news.page:25(p)
@@ -9880,16 +7955,30 @@ msgstr ""
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(p)
 #: C/mail-account-manage-mh-format-directories.page:25(p)
-#: C/mail-account-manage-maildir-format-directories.page:25(p)
 #: C/mail-account-manage-local-delivery.page:25(p)
 #: C/mail-account-manage-imap-plus.page:25(p)
 #: C/mail-account-manage-imap.page:25(p)
 msgid ""
-"Mail accounts can be edited via <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq>. The following settings are "
-"available when editing an existing account:"
+"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>. The "
+"following settings are available when editing an existing account:"
 msgstr ""
 
+#: C/mail-account-manage-usenet-news.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
+#: C/mail-account-manage-pop.page:28(title)
+#: C/mail-account-manage-novell-groupwise.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
+#: C/mail-account-manage-mh-format-directories.page:28(title)
+#: C/mail-account-manage-maildir-format-directories.page:28(title)
+#: C/mail-account-manage-local-delivery.page:28(title)
+#: C/mail-account-manage-imap-plus.page:28(title)
+#: C/mail-account-manage-imap.page:28(title) C/intro-first-run.page:25(title)
+msgid "Identity"
+msgstr "Identidad"
+
 #. TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866
 #: C/mail-account-manage-usenet-news.page:30(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:30(p)
@@ -9955,6 +8044,36 @@ msgstr "Opciones de recepción de correo"
 msgid "Sending Email"
 msgstr "Envío de correo"
 
+#: C/mail-account-manage-usenet-news.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
+#: C/mail-account-manage-pop.page:43(title)
+#: C/mail-account-manage-novell-groupwise.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
+#: C/mail-account-manage-mh-format-directories.page:43(title)
+#: C/mail-account-manage-maildir-format-directories.page:43(title)
+#: C/mail-account-manage-local-delivery.page:43(title)
+#: C/mail-account-manage-imap-plus.page:43(title)
+#: C/mail-account-manage-imap.page:43(title)
+msgid "Defaults"
+msgstr "Predeterminados"
+
+#: C/mail-account-manage-usenet-news.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
+#: C/mail-account-manage-pop.page:47(title)
+#: C/mail-account-manage-novell-groupwise.page:45(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
+#: C/mail-account-manage-mh-format-directories.page:47(title)
+#: C/mail-account-manage-maildir-format-directories.page:47(title)
+#: C/mail-account-manage-local-delivery.page:47(title)
+#: C/mail-account-manage-imap-plus.page:47(title)
+#: C/mail-account-manage-imap.page:47(title)
+msgid "Security"
+msgstr "Seguridad"
+
 #: C/mail-account-manage-usenet-news.page:53(title)
 #: C/mail-account-manage-unix-mbox-spool-file.page:53(title)
 #: C/mail-account-manage-unix-mbox-spool-directory.page:53(title)
@@ -9978,7 +8097,8 @@ msgstr "Configuración de «shell»"
 #: C/mail-account-manage-imap-plus.page:56(p)
 #: C/mail-account-manage-imap.page:58(p)
 msgid ""
-"Other account related settings that are not located in the <placeholder-1/>:"
+"Other account related settings that are not located in the <gui>Account "
+"Editor</gui>:"
 msgstr ""
 
 #: C/mail-account-manage-unix-mbox-spool-file.page:5(desc)
@@ -10044,15 +8164,11 @@ msgstr ""
 msgid "Microsoft Exchange account settings"
 msgstr "Opciones de recepción de Microsoft Exchange"
 
-#: C/mail-account-manage-microsoft-exchange.page:23(link)
-#: C/exchange-connectors-overview.page:20(title)
-msgid "Choosing the right connector"
-msgstr ""
-
 #: C/mail-account-manage-microsoft-exchange.page:23(p)
 msgid ""
-"Please first read <placeholder-1/> to find out about the right Exchange "
-"account type for you."
+"Please first read <link xref=\"exchange-connectors-overview\">Choosing the "
+"right connector</link> to find out about the right Exchange account type for "
+"you."
 msgstr ""
 
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5(desc)
@@ -10154,6 +8270,13 @@ msgstr "Opciones de recepción para directorios de correo en formato Maildir"
 msgid "Maildir Format Mail Directories account settings"
 msgstr "Opciones de recepción para directorios de correo en formato Maildir"
 
+#: C/mail-account-manage-maildir-format-directories.page:25(p)
+msgid ""
+"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings "
+"are available when editing an existing account:"
+msgstr ""
+
 #: C/mail-account-manage-local-delivery.page:5(desc)
 msgid "Add and edit a Local Delivery account in Evolution."
 msgstr ""
@@ -10179,7 +8302,6 @@ msgid "Add and edit an IMAP mail account in Evolution."
 msgstr "Añadir su cuenta Exchange a Evolution"
 
 #: C/mail-account-manage-imap.page:20(title)
-#: C/mail-access-gmail-imap-account.page:26(link)
 #, fuzzy
 msgid "IMAP mail account settings"
 msgstr "Configuración de la cuenta de Yahoo:"
@@ -10201,15 +8323,10 @@ msgstr ""
 msgid "Log in to your gmail account."
 msgstr "Configurar cuentas de correo-e"
 
-#: C/mail-access-gmail-pop-account.page:30(gui)
-#, fuzzy
-msgid "Forwarding and POP/IMAP"
-msgstr "Reenviar un mensaje:"
-
 #: C/mail-access-gmail-pop-account.page:30(p)
 msgid ""
-"Go to <guiseq><placeholder-1/><placeholder-2/></guiseq>. Refer to the POP "
-"Download section."
+"Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></"
+"guiseq>. Refer to the POP Download section."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:31(p)
@@ -10230,30 +8347,16 @@ msgstr ""
 msgid "Specify the other required settings for this Gmail feature."
 msgstr ""
 
-#: C/mail-access-gmail-pop-account.page:38(gui)
-#, fuzzy
-msgid "Configuration instructions"
-msgstr "Versión de la configuración"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-msgid "Other"
-msgstr "Otro"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-#, fuzzy
-msgid "Standard Instructions"
-msgstr "Tipografía _estándar:"
-
 #: C/mail-access-gmail-pop-account.page:38(p)
 msgid ""
-"To know the Gmail Account settings, click on <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+"To know the Gmail Account settings, click on <guiseq><gui>Configuration "
+"instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:39(p)
 msgid ""
-"On your Evolution client, go to <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/></guiseq>. Click <placeholder-4/>."
+"On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui></guiseq>. Click <gui style=\"button\">Add</gui>."
 msgstr ""
 
 #: C/mail-access-gmail-pop-account.page:40(p)
@@ -10271,19 +8374,129 @@ msgid "Access a GMail IMAP Account via Evolution"
 msgstr ""
 
 #: C/mail-access-gmail-imap-account.page:26(p)
-msgid "Please refer to the <placeholder-1/>."
+msgid ""
+"Please refer to the <link xref=\"mail-account-manage-imap\">IMAP mail "
+"account settings</link>."
 msgstr ""
 
-#: C/mail-access-gmail-imap-account.page:28(link)
-#, fuzzy
-msgid "GMail Help"
-msgstr "Destinatario del correo"
-
 #: C/mail-access-gmail-imap-account.page:28(p)
 msgid ""
 "To access GMail via IMAP you must turn on IMAP in your Google account. See "
-"the <placeholder-1/> for more information."
+"the <link href=\"https://mail.google.com/support/bin/answer.py?answer=77695"
+"\">GMail Help</link> for more information."
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:34(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
+msgid ""
+"@@image: './figures/window-overview-layers.png'; "
+"md5=3156497ff1c51756838f9ddfbce9baee"
+msgstr ""
+"@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:41(None) C/intro-main-window.page:90(None)
+#: C/intro-main-window.page:136(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/folder_size_mapi.png'; "
+#| "md5=4b20ea9d82999051360f14da27e7c15d"
+msgid ""
+"@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+msgstr ""
+"@@image: 'figures/folder_size_mapi.png'; md5=4b20ea9d82999051360f14da27e7c15d"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:44(None) C/intro-main-window.page:93(None)
+#: C/intro-main-window.page:139(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_popreceive_a.png'; "
+#| "md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgid ""
+"@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+msgstr ""
+"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:47(None) C/intro-main-window.page:96(None)
+#: C/intro-main-window.page:142(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
+msgid ""
+"@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+msgstr ""
+"@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:48(None) C/intro-main-window.page:97(None)
+#: C/intro-main-window.page:143(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/exchng-rec-mails.png'; "
+#| "md5=b56dfa570c8d1c9b942c6493fd973d68"
+msgid ""
+"@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+msgstr ""
+"@@image: 'figures/exchng-rec-mails.png'; md5=b56dfa570c8d1c9b942c6493fd973d68"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:51(None) C/intro-main-window.page:100(None)
+#: C/intro-main-window.page:146(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_Wcal_prop_a.png'; "
+#| "md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
+msgid ""
+"@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+msgstr ""
+"@@image: 'figures/evo_Wcal_prop_a.png'; md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:54(None) C/intro-main-window.page:108(None)
+#: C/intro-main-window.page:149(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgid ""
+"@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
 msgstr ""
+"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:55(None) C/intro-main-window.page:150(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/groupwise_resend.png'; "
+#| "md5=697ce252ac6f3f2f4f361039818d1262"
+msgid ""
+"@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+msgstr ""
+"@@image: 'figures/groupwise_resend.png'; md5=697ce252ac6f3f2f4f361039818d1262"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:58(None) C/intro-main-window.page:111(None)
+#: C/intro-main-window.page:153(None)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgid ""
+"@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
+msgstr ""
+"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 
 #: C/intro-main-window.page:5(desc)
 msgid "An explanation of the areas shown in the Evolution window."
@@ -10317,6 +8530,8 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
 "bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
+"Barra de menú"
 
 #: C/intro-main-window.page:44(p) C/intro-main-window.page:93(p)
 #: C/intro-main-window.page:139(p)
@@ -10324,6 +8539,8 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
 "bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
+"Barra de herramientas"
 
 #: C/intro-main-window.page:47(p) C/intro-main-window.page:96(p)
 #: C/intro-main-window.page:142(p)
@@ -10331,6 +8548,8 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
 "Folder list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Lista de carpetas"
 
 #: C/intro-main-window.page:48(p) C/intro-main-window.page:97(p)
 #: C/intro-main-window.page:143(p)
@@ -10338,12 +8557,16 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
 "Search bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Barra de búsqueda"
 
 #: C/intro-main-window.page:51(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Message list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Lista de mensajes"
 
 #: C/intro-main-window.page:54(p) C/intro-main-window.page:108(p)
 #: C/intro-main-window.page:149(p)
@@ -10357,6 +8580,8 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
 "Preview pane"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Panel de vista previa"
 
 #: C/intro-main-window.page:58(p) C/intro-main-window.page:111(p)
 #: C/intro-main-window.page:153(p)
@@ -10364,6 +8589,8 @@ msgid ""
 "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
 "Status bar"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Barra de estado"
 
 #: C/intro-main-window.page:64(title)
 #, fuzzy
@@ -10381,9 +8608,16 @@ msgstr ""
 "para cada cuenta. Para ver el contenido de una carpeta, pulse el nombre de "
 "la carpeta y el contenido se mostrará en la lista de correo-e."
 
-#: C/intro-main-window.page:66(p) C/intro-main-window.page:74(p)
-msgid "For more information see <placeholder-1/>."
+#: C/intro-main-window.page:66(p)
+#, fuzzy
+#| msgid ""
+#| "For additional information, see <link linkend=\"third-step\">Sending "
+#| "Mail</link>."
+msgid ""
+"For more information see <link xref=\"mail-folders\">Using Folders</link>."
 msgstr ""
+"Para obtener información adicional vea <link linkend=\"third-step\">Envío de "
+"correo</link>."
 
 #: C/intro-main-window.page:69(title)
 #, fuzzy
@@ -10416,26 +8650,22 @@ msgstr ""
 "entre las herramientas de Evolution: correo, contactos, calendarios, notas y "
 "tareas."
 
-#: C/intro-main-window.page:74(link)
-#: C/change-switcher-appearance.page:19(title)
-#, fuzzy
-msgid "Changing the Switcher appearance"
-msgstr "Cambiar la apariencia del selector:"
-
-#: C/intro-main-window.page:75(gui)
-#, fuzzy
-msgid "Layout"
-msgstr "Estilo de la distribución"
-
-#: C/intro-main-window.page:75(gui)
+#: C/intro-main-window.page:74(p)
 #, fuzzy
-msgid "Show Side Bar"
-msgstr "Mostrar barra _lateral"
+#| msgid ""
+#| "For more information, see <link linkend=\"Aal54a9\">Checking the Status "
+#| "of an Item You Have Sent</link>."
+msgid ""
+"For more information see <link xref=\"change-switcher-appearance\">Changing "
+"the Switcher appearance</link>."
+msgstr ""
+"Para obtener más información, consulte <link linkend=\"Aal54a9\">Comprobar "
+"el estado de un elemento que ha enviado</link>."
 
 #: C/intro-main-window.page:75(p)
 msgid ""
 "You can disable the folder list and the switcher side bar by toggling "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"<guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>."
 msgstr ""
 
 #: C/intro-main-window.page:78(title)
@@ -10453,17 +8683,12 @@ msgstr ""
 
 #: C/intro-main-window.page:80(p)
 msgid ""
-"You can disable the preview pane by toggling <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+"You can disable the preview pane by toggling <guiseq><gui>View</"
+"gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>."
 msgstr ""
 
 #: C/intro-main-window.page:86(title)
 #: C/import-supported-file-formats.page:46(title)
-#: C/calendar-webdav.page:26(gui) C/calendar-weather.page:26(gui)
-#: C/calendar-usage-add-appointment.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:33(gui)
-#: C/calendar-local.page:24(gui) C/calendar-google.page:28(gui)
-#: C/calendar-caldav.page:27(gui)
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -10530,30 +8755,34 @@ msgstr "Crea una lista de notas nueva"
 #: C/intro-main-window.page:125(p)
 msgid ""
 "Tasks and memos are just displayed for your convience and are not associated "
-"to any appointments. Use the <placeholder-1/> to go to their main windows."
+"to any appointments. Use the <gui>switcher</gui> to go to their main windows."
 msgstr ""
 
+#: C/intro-main-window.page:132(title)
+#: C/import-supported-file-formats.page:60(title)
+msgid "Contacts"
+msgstr "Contactos"
+
 #: C/intro-main-window.page:146(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Contacts list"
 msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Lista de contactos"
 
 #: C/intro-main-window.page:150(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
 "Contact preview"
 msgstr ""
-
-#: C/intro-main-window.page:156(gui)
-#, fuzzy
-msgid "Contact Preview"
-msgstr "Vista _previa de contactos"
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Vista previa del contacto"
 
 #: C/intro-main-window.page:156(p)
 msgid ""
-"You can disable the contact preview by toggling <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/></guiseq>."
+"You can disable the contact preview by toggling <guiseq><gui>View</"
+"gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>."
 msgstr ""
 
 #: C/intro-first-run.page:5(desc)
@@ -10566,16 +8795,23 @@ msgstr "Inicio de Evolution por primera vez"
 msgid "Starting <em>Evolution</em> for the first time"
 msgstr "Inicio de Evolution por primera vez"
 
-#: C/intro-first-run.page:22(link)
-#, fuzzy
-msgid "import data from other applications."
-msgstr "Importa datos de otros programas"
-
 #: C/intro-first-run.page:22(p)
+#, fuzzy
+#| msgid ""
+#| "The first time you run Evolution, it creates a directory named <emphasis>."
+#| "evolution</emphasis> in your home directory, where it stores all of its "
+#| "local data. Then, it opens a First-Run Assistant to help you set up email "
+#| "accounts and import data from other applications."
 msgid ""
 "The first time you run Evolution, it opens the First-Run Assistant to help "
-"you set up email accounts and <placeholder-1/>"
+"you set up email accounts and <link xref=\"import-data\">import data from "
+"other applications.</link>"
 msgstr ""
+"La primera vez que ejecute Evolution, éste crea un directorio llamado "
+"<emphasis>.evolution</emphasis> en su directorio de inicio de sesión, donde "
+"almacena toda su información local. Después se abrirá un asistente, sólo la "
+"primera vez, con el fin de ayudarle a configurar sus cuentas de correo, así "
+"como para importar datos de otras aplicaciones."
 
 #: C/intro-first-run.page:31(title)
 msgid "Restore from backup"
@@ -10584,18 +8820,18 @@ msgstr "Restaurar desde un respaldo"
 #: C/intro-first-run.page:32(p)
 msgid ""
 "You will get asked whether to restore from a backup of a previous version. "
-"If you have such a backup, continue <placeholder-1/>. Otherwise, go to the "
-"next page."
+"If you have such a backup, continue <link xref=\"backup-restore#restore"
+"\">here</link>. Otherwise, go to the next page."
 msgstr ""
 
-#: C/intro-first-run.page:37(gui)
-#, fuzzy
-msgid "Server Type"
-msgstr "_Tipo de servidor:"
+#: C/intro-first-run.page:36(title)
+msgid "Receiving Email"
+msgstr "Recepción de correo"
 
 #: C/intro-first-run.page:37(p)
 #, fuzzy
-msgid "First, choose the server type from the <placeholder-1/> dropdown-list."
+msgid ""
+"First, choose the server type from the <gui>Server Type</gui> dropdown-list."
 msgstr ""
 "En el campo Actualizar, seleccione de la lista desplegable el tipo de "
 "actualización."
@@ -10618,14 +8854,8 @@ msgstr ""
 msgid "None: If you do not plan to use Evolution for receiving email."
 msgstr ""
 
-#: C/intro-first-run.page:45(p) C/intro-first-run.page:46(p)
-#: C/intro-first-run.page:48(p) C/intro-first-run.page:49(p)
-#: C/intro-first-run.page:50(p) C/intro-first-run.page:59(p)
-#: C/intro-first-run.page:62(p) C/intro-first-run.page:65(p)
-#: C/intro-first-run.page:73(p) C/intro-first-run.page:75(p)
-#: C/intro-first-run.page:77(p) C/intro-first-run.page:79(p)
-#: C/intro-first-run.page:81(p) C/intro-first-run.page:93(p)
-msgid "Continue <placeholder-1/> for configuration."
+#: C/intro-first-run.page:45(p)
+msgid "Continue <link xref=\"#sending\">here</link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:46(p)
@@ -10637,6 +8867,12 @@ msgstr ""
 "Conserva su correo-e en el servidor para que pueda acceder a él con sistemas "
 "diferentes."
 
+#: C/intro-first-run.page:46(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-imap\">here</link> for "
+"configuration."
+msgstr ""
+
 #: C/intro-first-run.page:48(p)
 #, fuzzy
 msgid ""
@@ -10646,10 +8882,22 @@ msgstr ""
 "Conserva su correo-e en el servidor para que pueda acceder a él con sistemas "
 "diferentes."
 
+#: C/intro-first-run.page:48(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-imap-plus\">here</link> for "
+"configuration."
+msgstr ""
+
 #: C/intro-first-run.page:49(p)
 msgid "POP: Downloads your email to your hard disk."
 msgstr ""
 
+#: C/intro-first-run.page:49(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-pop\">here</link> for "
+"configuration."
+msgstr ""
+
 #: C/intro-first-run.page:50(p)
 #, fuzzy
 msgid ""
@@ -10659,6 +8907,12 @@ msgstr ""
 "Conecta con servidores de noticias y descarga una lista de los compendios de "
 "noticias disponibles."
 
+#: C/intro-first-run.page:50(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-usenet-news\">here</link> for "
+"configuration."
+msgstr ""
+
 #: C/intro-first-run.page:56(p)
 msgid "Available server types for corporate users are:"
 msgstr ""
@@ -10669,14 +8923,17 @@ msgid ""
 "OpenChange server."
 msgstr ""
 
-#: C/intro-first-run.page:60(link)
-#: C/exchange-connectors-overview.page:26(link)
-msgid "Install evolution-mapi now."
+#: C/intro-first-run.page:59(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-exchange-mapi\">here</link> for "
+"configuration."
 msgstr ""
 
 #: C/intro-first-run.page:60(p)
 msgid ""
-"This requires having the evolution-mapi package installed. <placeholder-1/>"
+"This requires having the evolution-mapi package installed. <link action="
+"\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+"evolution-mapi/\">Install evolution-mapi now.</link>"
 msgstr ""
 
 #: C/intro-first-run.page:62(p)
@@ -10687,15 +8944,17 @@ msgid ""
 msgstr ""
 "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
-#: C/intro-first-run.page:63(link)
-#: C/exchange-connectors-overview.page:24(link)
-msgid "Install evolution-exchange now."
+#: C/intro-first-run.page:62(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-evolution-exchange\">here</"
+"link> for configuration."
 msgstr ""
 
 #: C/intro-first-run.page:63(p)
 msgid ""
-"This requires having the evolution-exchange package installed. "
-"<placeholder-1/>"
+"This requires having the evolution-exchange package installed. <link action="
+"\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+"evolution-exchange/\">Install evolution-exchange now.</link>"
 msgstr ""
 
 #: C/intro-first-run.page:65(p)
@@ -10703,29 +8962,36 @@ msgstr ""
 msgid "Novell Groupwise: For connecting to a Novell GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
+#: C/intro-first-run.page:65(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-novell-groupwise\">here</link> "
+"for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:71(p)
 msgid "Available local account server types for advanced users are:"
 msgstr ""
 
-#: C/intro-first-run.page:73(gui)
-#, fuzzy
-msgid "Standard Unix Mbox Spool"
-msgstr "Archivo spool mbox estándar de Unix:"
-
 #: C/intro-first-run.page:73(p)
 #, fuzzy
 msgid ""
 "Local delivery: If you want to move email from the spool (the location where "
 "mail waits for delivery) and store it in your home directory. You need to "
 "provide the path to the mail spool you want to use. If you want to leave "
-"email in your system's spool files, choose the <placeholder-1/> option "
-"instead."
+"email in your system's spool files, choose the <gui>Standard Unix Mbox "
+"Spool</gui> option instead."
 msgstr ""
 "Elija esta opciones si quiere mover el correo desde el buzón local a su "
 "directorio de inicio. Necesita proporcionar la ruta al buzón de correo que "
 "quiere usar, Si quiere dejar el correo en los archivos de spools del "
 "sistema, elija la opción «Mbox estándar de Unix»."
 
+#: C/intro-first-run.page:73(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-local-delivery\">here</link> "
+"for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:75(p)
 #, fuzzy
 msgid ""
@@ -10741,6 +9007,12 @@ msgstr ""
 msgid "You need to provide the path to the directory you want to use."
 msgstr "Debe proporcionar la ruta al directorio de correo que quiere usar."
 
+#: C/intro-first-run.page:75(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-mh-format-directories\">here</"
+"link> for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:77(p)
 #, fuzzy
 msgid ""
@@ -10750,6 +9022,12 @@ msgstr ""
 "Si descarga su correo-e usando Qmail u otro programa estilo Maildir debe "
 "usar esta opción."
 
+#: C/intro-first-run.page:77(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-maildir-format-directories"
+"\">here</link> for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:79(p)
 msgid ""
 "Standard Unix mbox spool file: For reading and storing email in the mail "
@@ -10757,6 +9035,12 @@ msgid ""
 msgstr ""
 
 #: C/intro-first-run.page:79(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-file\">here</"
+"link> for configuration."
+msgstr ""
+
+#: C/intro-first-run.page:79(p)
 #, fuzzy
 msgid "You need to provide the path to the mail spool file you want to use."
 msgstr "Debe proporcionar la ruta al directorio de correo que quiere usar."
@@ -10767,13 +9051,20 @@ msgid ""
 "mail spool directory on your local system."
 msgstr ""
 
+#: C/intro-first-run.page:81(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-directory"
+"\">here</link> for configuration."
+msgstr ""
+
 #: C/intro-first-run.page:84(p)
 #, fuzzy
 msgid ""
 "Later on, if you want to change an account, or if you want to create another "
-"one, go to <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq>. Select the account you want to change, then click <placeholder-4/>. "
-"Alternately, add a new account by clicking <placeholder-5/>."
+"one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui></guiseq>. Select the account you want to change, then click <gui style="
+"\"button\">Edit</gui>. Alternately, add a new account by clicking <gui style="
+"\"button\">Add</gui>."
 msgstr ""
 "Más tarde, si quiere cambiar esta cuenta, o si quiere crear una nueva, pulse "
 "Editar &gt; Preferencias, después pulse Cuantas de correo. seleccione la "
@@ -10796,6 +9087,12 @@ msgid ""
 "choice for sending mail."
 msgstr ""
 
+#: C/intro-first-run.page:93(p)
+msgid ""
+"Continue <link xref=\"mail-sending-options-smtp\">here</link> for "
+"configuration."
+msgstr ""
+
 #: C/intro-first-run.page:94(p)
 #, fuzzy
 msgid ""
@@ -10819,15 +9116,27 @@ msgstr ""
 msgid "Importing Mail (Optional)"
 msgstr "Importar correo (opcional)"
 
-#: C/intro-first-run.page:105(link) C/import-data.page:20(title)
+#: C/intro-first-run.page:105(p)
 #, fuzzy
-msgid "Importing data from another application"
+msgid ""
+"Continue with <link xref=\"import-data\">Importing data from another "
+"application</link>."
 msgstr "Importa datos de otros programas"
 
-#: C/intro-first-run.page:105(p)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:22(None)
 #, fuzzy
-msgid "Continue with <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#| msgid ""
+#| "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
+msgid ""
+"@@image: './figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+msgstr ""
+"@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
+
+#: C/index.page:5(desc)
+msgid "Evolution"
+msgstr "Evolution"
 
 #: C/index.page:22(title)
 msgid ""
@@ -10874,7 +9183,6 @@ msgid "Advanced Calendar Management"
 msgstr "Nombre del calendario de Yahoo:"
 
 #: C/index.page:54(title)
-#, fuzzy
 msgid "Contacts Management"
 msgstr "Gestión de contactos"
 
@@ -10954,16 +9262,12 @@ msgstr ""
 msgid "Maildir (no extension):"
 msgstr ""
 
-#: C/import-supported-file-formats.page:36(link)
-#, fuzzy
-msgid "configure a Maildir account"
-msgstr "Configurar cuentas de correo-e"
-
 #: C/import-supported-file-formats.page:36(p)
 msgid ""
 "The format used by Evolution (for local folders since version 3.0). There is "
-"no need to import Maildir files as you can <placeholder-1/> in Evolution and "
-"point to the folder where the Maildir files are stored."
+"no need to import Maildir files as you can <link xref=\"mail-account-manage-"
+"maildir-format-directories\">configure a Maildir account</link> in Evolution "
+"and point to the folder where the Maildir files are stored."
 msgstr ""
 
 #: C/import-supported-file-formats.page:38(p)
@@ -11076,20 +9380,15 @@ msgstr "Importar un sólo archivo"
 msgid "To import single files (mail, calendar data or contacts):"
 msgstr ""
 
-#: C/import-single-files.page:25(gui) C/import-apps-outlook.page:60(gui)
-#: C/import-apps-mozilla.page:25(gui)
-msgid "Importer Type"
-msgstr "Tipo de importador"
-
-#: C/import-single-files.page:25(gui) C/import-apps-outlook.page:60(gui)
-#: C/import-apps-mozilla.page:25(gui)
-#, fuzzy
-msgid "Import a single file"
-msgstr "Importar un _único archivo"
+#: C/import-single-files.page:24(p) C/import-apps-outlook.page:59(p)
+#: C/import-apps-mozilla.page:24(p)
+msgid "Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>."
+msgstr "Pulse <guiseq><gui>Archivo</gui><gui>Importar</gui></guiseq>."
 
 #: C/import-single-files.page:25(p) C/import-apps-outlook.page:60(p)
 #: C/import-apps-mozilla.page:25(p)
-msgid "In the <placeholder-1/> tab, click <placeholder-2/>."
+msgid ""
+"In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>."
 msgstr ""
 
 #: C/import-single-files.page:26(p)
@@ -11121,7 +9420,12 @@ msgstr ""
 msgid "Importing data from another application."
 msgstr "Importa datos de otros programas"
 
-#: C/import-data.page:23(title) C/default-browser.page:24(gui)
+#: C/import-data.page:20(title)
+#, fuzzy
+msgid "Importing data from another application"
+msgstr "Importa datos de otros programas"
+
+#: C/import-data.page:23(title)
 #, fuzzy
 msgid "Applications"
 msgstr "Clasificaciones"
@@ -11154,18 +9458,10 @@ msgstr ""
 msgid "First, while using Microsoft Windows, prepare your messages for import:"
 msgstr "Primero, mientras usa Windows, prepare sus mensajes para importarlos:"
 
-#: C/import-apps-outlook.page:32(file)
-msgid ".pst"
-msgstr ""
-
-#: C/import-apps-outlook.page:32(file)
-msgid ".ost"
-msgstr ""
-
 #: C/import-apps-outlook.page:32(p)
 msgid ""
-"Find your Outlook files (they normally have the file ending <placeholder-1/> "
-"or <placeholder-2/>):"
+"Find your Outlook files (they normally have the file ending <file>.pst</"
+"file> or <file>.ost</file>):"
 msgstr ""
 
 #: C/import-apps-outlook.page:35(p)
@@ -11245,20 +9541,11 @@ msgstr ""
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
-#: C/import-apps-outlook.page:52(gui)
-#, fuzzy
-msgid "Mail Folder"
-msgstr "_Carpeta de correo"
-
-#: C/import-apps-outlook.page:52(link)
-#, fuzzy
-msgid "folders"
-msgstr "Carpeta:"
-
 #: C/import-apps-outlook.page:52(p)
 msgid ""
-"Optionally select <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></"
-"guiseq> to create the <placeholder-4/> you want."
+"Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</"
+"gui></guiseq> to create the <link xref=\"mail-folders\">folders</link> you "
+"want."
 msgstr ""
 
 #: C/import-apps-outlook.page:57(title)
@@ -11273,22 +9560,12 @@ msgid ""
 "import."
 msgstr "Seleccione la información que quiera importar:"
 
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "Import single file"
-msgstr "Importar un _único archivo"
-
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "File type"
-msgstr "_Tipo de archivo:"
-
 #: C/import-apps-outlook.page:62(p)
 msgid ""
 "If the option to import Outlook personal folders (.pst files) is not "
-"available under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/></guiseq>, your distribution might have not enabled this "
-"functionality."
+"available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single "
+"file</gui><gui>File type</gui></guiseq>, your distribution might have not "
+"enabled this functionality."
 msgstr ""
 
 #: C/import-apps-outlook.page:64(p) C/import-apps-mozilla.page:28(p)
@@ -11315,14 +9592,11 @@ msgstr "Seleccione la información que quiera importar:"
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-# index.docbook:88, index.docbook:89
-#: C/groupwise-placeholder.page:22(link) C/exchange-placeholder.page:22(link)
-#, fuzzy
-msgid "old Evolution manual"
-msgstr "Calendario de Evolution"
-
-#: C/groupwise-placeholder.page:22(p) C/exchange-placeholder.page:22(p)
-msgid "For topics not covered here please refer to the <placeholder-1/>."
+#: C/groupwise-placeholder.page:22(p)
+msgid ""
+"For topics not covered here please refer to the <link href=\"http://library."
+"gnome.org/users/evolution/2.32/usage-groupwise.html.en\">old Evolution "
+"manual</link>."
 msgstr ""
 
 #: C/google-services.page:5(desc)
@@ -11349,19 +9623,15 @@ msgid ""
 "many settings such as Evolution."
 msgstr ""
 
-#: C/express-mode.page:23(code)
-msgid "evolution --express"
-msgstr "evolution --express"
-
 #: C/express-mode.page:23(p)
 msgid ""
 "You can use the Express version which is targeted for mobile and small-"
 "screen devices. This is available from version 2.30 on and can be enabled by "
-"starting <placeholder-1/> from the terminal window."
+"starting <code>evolution --express</code> from the terminal window."
 msgstr ""
 
 #: C/exporting-data.page:5(desc)
-msgid "How to export data from <placeholder-1/>."
+msgid "How to export data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data.page:20(title)
@@ -11369,7 +9639,7 @@ msgid "Exporting data from <em>Evolution</em>"
 msgstr ""
 
 #: C/exporting-data-mail.page:5(desc)
-msgid "How to export mail data from <placeholder-1/>."
+msgid "How to export mail data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-mail.page:20(title)
@@ -11377,20 +9647,12 @@ msgstr ""
 msgid "Exporting mail data"
 msgstr "Importando datos de Elm"
 
-#: C/exporting-data-mail.page:22(link)
-msgid "mbox"
-msgstr ""
-
-#: C/exporting-data-mail.page:22(gui)
-#, fuzzy
-msgid "Save as mbox..."
-msgstr "_Guardar como mbox…"
-
 #: C/exporting-data-mail.page:22(p)
 msgid ""
-"To save an email to a file in <placeholder-1/> format, select an email and "
-"click <guiseq><placeholder-2/><placeholder-3/></guiseq> or right-click on "
-"the message and click <placeholder-4/>."
+"To save an email to a file in <link href=\"https://secure.wikimedia.org/"
+"wikipedia/en/wiki/Mbox\">mbox</link> format, select an email and click "
+"<guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click on "
+"the message and click <gui>Save as mbox...</gui>."
 msgstr ""
 
 #: C/exporting-data-mail.page:24(p)
@@ -11400,7 +9662,7 @@ msgid ""
 msgstr ""
 
 #: C/exporting-data-contacts.page:5(desc)
-msgid "How to export contacts data from <placeholder-1/>."
+msgid "How to export contacts data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-contacts.page:23(title)
@@ -11413,35 +9675,21 @@ msgid ""
 "Contacts files are stored in a database, but can be saved as a vCard file."
 msgstr ""
 
-#: C/exporting-data-contacts.page:26(gui)
-#, fuzzy
-msgid "Save Address Book As vCard"
-msgstr "G_uardar la libreta de direcciones como VCard"
-
 #: C/exporting-data-contacts.page:26(p)
 msgid ""
-"To export a complete address book, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>."
+"To export a complete address book, click <guiseq><gui>File</gui><gui>Save "
+"Address Book As vCard</gui></guiseq>."
 msgstr ""
 
-#: C/exporting-data-contacts.page:27(gui)
-#, fuzzy
-msgid "Save Contact as VCard"
-msgstr "G_uardar contacto como vCard…"
-
-#: C/exporting-data-contacts.page:27(gui)
-msgid "Save as vCard"
-msgstr "Guardar como vCard"
-
 #: C/exporting-data-contacts.page:27(p)
 msgid ""
-"If you want to export only one contact, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> or right-click on the contact and click "
-"<placeholder-3/>."
+"If you want to export only one contact, click <guiseq><gui>File</"
+"gui><gui>Save Contact as VCard</gui></guiseq> or right-click on the contact "
+"and click <gui>Save as vCard</gui>."
 msgstr ""
 
 #: C/exporting-data-calendar.page:5(desc)
-msgid "How to export calendar data from <placeholder-1/>."
+msgid "How to export calendar data from <em>Evolution</em>."
 msgstr ""
 
 #: C/exporting-data-calendar.page:20(title)
@@ -11449,38 +9697,40 @@ msgstr ""
 msgid "Exporting calendar data"
 msgstr "Abriendo el calendario en «%s»"
 
-#: C/exporting-data-calendar.page:22(gui)
-#, fuzzy
-msgid "Save as"
-msgstr "Guardar tarea"
-
 #: C/exporting-data-calendar.page:22(p)
 msgid ""
 "To export a complete calendar, right-click on the calendar in the list of "
-"calendars and click <placeholder-1/>. Available formats are iCalendar format "
-"(ICS, recommended), comma seperated values (CSV), and RDF format."
+"calendars and click <gui>Save as</gui>. Available formats are iCalendar "
+"format (ICS, recommended), comma seperated values (CSV), and RDF format."
 msgstr ""
 
-#: C/exporting-data-calendar.page:23(gui)
-msgid "Save as iCalendar..."
-msgstr "Guardar como iCalendar…"
-
 #: C/exporting-data-calendar.page:23(p)
 msgid ""
 "If you want to export only one appointment, right-click on the appointment "
-"and click <placeholder-1/>."
+"and click <gui>Save as iCalendar...</gui>."
 msgstr ""
 
 #: C/exchange-placeholder.page:5(desc) C/exchange-placeholder.page:20(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Conexión a servidores Exchange"
 
+#: C/exchange-placeholder.page:22(p)
+msgid ""
+"For topics not covered here please refer to the <link href=\"http://library."
+"gnome.org/users/evolution/2.32/usage-exchange.html.en\">old Evolution "
+"manual</link>."
+msgstr ""
+
 #: C/exchange-connectors-overview.page:5(desc)
 msgid ""
 "Which additional package to install in order to connect to an Exchange "
 "server."
 msgstr ""
 
+#: C/exchange-connectors-overview.page:20(title)
+msgid "Choosing the right connector"
+msgstr ""
+
 #: C/exchange-connectors-overview.page:22(p)
 msgid ""
 "Depending on the version of the Microsoft Exchange server that you would "
@@ -11492,17 +9742,17 @@ msgstr ""
 msgid ""
 "For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of "
 "Exchange that use Outlook Web Access) it is recommended to use the package "
-"evolution-exchange. <placeholder-1/>"
+"evolution-exchange. <link action=\"install:evolution-exchange\" href="
+"\"http://projects.gnome.org/evolution/download\">Install evolution-exchange "
+"now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:26(p)
 msgid ""
 "For Microsoft Exchange 2007 (and possibly earlier versions that support "
-"MAPI) it is recommended to use the package evolution-mapi. <placeholder-1/>"
-msgstr ""
-
-#: C/exchange-connectors-overview.page:27(link)
-msgid "Install evolution-ews now."
+"MAPI) it is recommended to use the package evolution-mapi. <link action="
+"\"install:evolution-mapi\" href=\"http://projects.gnome.org/evolution/"
+"download\">Install evolution-mapi now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:27(p)
@@ -11510,7 +9760,8 @@ msgid ""
 "For Microsoft Exchange 2010 it is recommended to use the package evolution-"
 "ews which is currently still under development and might not be available "
 "yet for your distribution. evolution-ews also supports Microsoft Exchange "
-"2007. <placeholder-1/>"
+"2007. <link action=\"install:evolution-ews\" href=\"http://projects.gnome."
+"org/evolution/download\">Install evolution-ews now.</link>"
 msgstr ""
 
 #: C/exchange-connectors-overview.page:29(p)
@@ -11545,31 +9796,18 @@ msgstr ""
 msgid "Emails"
 msgstr "Correo-e"
 
-#: C/deleting-emails.page:29(em)
-msgid "marking"
-msgstr ""
-
-#: C/deleting-emails.page:29(em)
-msgid "expunge"
-msgstr "purgar"
-
 #: C/deleting-emails.page:29(p)
 msgid ""
-"Evolution deletes emails on IMAP servers by <placeholder-1/> the messages "
-"for deletion; space is not freed until you <placeholder-2/> the marked "
+"Evolution deletes emails on IMAP servers by <em>marking</em> the messages "
+"for deletion; space is not freed until you <em>expunge</em> the marked "
 "emails."
 msgstr ""
 
-#: C/deleting-emails.page:31(gui)
-#, fuzzy
-msgid "Empty Trash"
-msgstr "_Vaciar papelera"
-
 #: C/deleting-emails.page:31(p)
 msgid ""
-"To Expunge a specific folder, go to <guiseq><placeholder-1/><placeholder-2/"
-"></guiseq> or press <keyseq><placeholder-3/><placeholder-4/></keyseq>. To "
-"Expunge all folders, go to <guiseq><placeholder-5/><placeholder-6/></"
+"To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</"
+"gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To "
+"Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></"
 "guiseq>. This applies to other types of accounts as well."
 msgstr ""
 
@@ -11577,15 +9815,10 @@ msgstr ""
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: C/deleting-emails.page:36(gui)
-#, fuzzy
-msgid "Remove Attachments"
-msgstr "Q_uitar adjuntos"
-
 #: C/deleting-emails.page:36(p)
 msgid ""
 "To delete the attachments of an email, select the message and click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>."
+"<guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>."
 msgstr ""
 
 #: C/deleting-appointments.page:5(desc)
@@ -11597,17 +9830,12 @@ msgstr ""
 msgid "Deleting old appointments permanently"
 msgstr "Borrar citas y reuniones antiguas"
 
-#: C/deleting-appointments.page:22(gui)
-#, fuzzy
-msgid "Purge"
-msgstr "Purg_ar"
-
 #: C/deleting-appointments.page:22(p)
 msgid ""
-"To Purge old entries in a calendar, go to <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the Calendar view. You will be asked how many "
-"days old the events to remove from the calendar should be. The action will "
-"be applied to the currently opened calendar (selected in the list of "
+"To Purge old entries in a calendar, go to <guiseq><gui>Actions</"
+"gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how "
+"many days old the events to remove from the calendar should be. The action "
+"will be applied to the currently opened calendar (selected in the list of "
 "calendars on the left); other calendars remain unchanged."
 msgstr ""
 
@@ -11619,37 +9847,13 @@ msgstr ""
 msgid "Setting the default browser"
 msgstr ""
 
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "Activities"
-msgstr "Autoridades"
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "System Settings"
-msgstr "Configuración de «shell»"
-
-#: C/default-browser.page:24(gui)
-msgid "System"
-msgstr ""
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "System Info"
-msgstr "Ordenar información"
-
-# index.docbook:29, index.docbook:30
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "Default Applications"
-msgstr "Ajustes predeterminados"
-
 #. For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https
 #: C/default-browser.page:24(p)
 msgid ""
 "You can set the system-wide default browser in GNOME 3 under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+"<guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</"
+"gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/default-browser.page:25(p)
@@ -11659,14 +9863,11 @@ msgid ""
 "tracker."
 msgstr ""
 
-#: C/default-browser.page:26(file)
-msgid "$HOME/.local/share/applications/mimeapps.list"
-msgstr "$HOME/.local/share/applications/mimeapps.list"
-
 #: C/default-browser.page:26(p)
 msgid ""
 "GNOME 3 users with a technical background can tweak these settings by "
-"defining scheme-handlers in <placeholder-1/>."
+"defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps."
+"list</file>."
 msgstr ""
 
 #: C/data-storage.page:5(desc)
@@ -11683,14 +9884,11 @@ msgid ""
 "This is only interesting for advanced users that want to debug problems."
 msgstr ""
 
-#: C/data-storage.page:26(link)
-msgid "XDG Base Directory Specification"
-msgstr ""
-
 #: C/data-storage.page:26(p)
 msgid ""
 "If you run Evolution 2.32.0 or later, data will be stored according to the "
-"<placeholder-1/>. By default this means:"
+"<link href=\"http://www.freedesktop.org/wiki/Specifications/basedir-spec"
+"\">XDG Base Directory Specification</link>. By default this means:"
 msgstr ""
 
 #: C/data-storage.page:30(title)
@@ -11746,14 +9944,12 @@ msgid "Authors of the Evolution User Documentation"
 msgstr "Abrir la Guía de usuario de Evolution"
 
 #: C/credits.page:25(p) C/credits.page:49(p)
-#, fuzzy
 msgid "André Klapper"
-msgstr "Andre Klapper"
+msgstr "André Klapper"
 
 #: C/credits.page:28(p)
-#, fuzzy
 msgid "April Gonzalez"
-msgstr "April Gonzales"
+msgstr "April Gonzalez"
 
 #: C/credits.page:41(title)
 #, fuzzy
@@ -11891,41 +10087,23 @@ msgstr ""
 msgid "Creating a contact list"
 msgstr "Crear una lista de contactos"
 
-#: C/contacts-using-contact-lists.page:32(gui)
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: C/contacts-using-contact-lists.page:32(p) C/contacts-local.page:24(p)
-#: C/contacts-ldap.page:31(p) C/contacts-google.page:25(p)
-#: C/calendar-webdav.page:26(p) C/calendar-weather.page:26(p)
-#: C/calendar-meetings-sending-invitation.page:31(p)
-#: C/calendar-local.page:24(p) C/calendar-google.page:28(p)
-#: C/calendar-free-busy.page:33(p) C/calendar-caldav.page:27(p)
+#: C/contacts-using-contact-lists.page:32(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
 msgstr ""
 
-#: C/contacts-using-contact-lists.page:34(gui)
-#: C/contacts-usage-add-contact.page:24(gui)
-msgid "Where:"
-msgstr "Dónde:"
-
 #: C/contacts-using-contact-lists.page:34(p)
 #: C/contacts-usage-add-contact.page:24(p)
 msgid ""
-"Select the address book under <placeholder-1/> to which it will be added."
+"Select the address book under <gui>Where:</gui> to which it will be added."
 msgstr ""
 
-#: C/contacts-using-contact-lists.page:35(gui)
-msgid "Select..."
-msgstr "Seleccionar…"
-
 #: C/contacts-using-contact-lists.page:35(p)
 msgid ""
 "Specify the list members by either entering the names or email addresses of "
 "contacts (the text field supports autocompletion), or by dragging contacts "
-"from the Contacts window into the list, or by using the <placeholder-1/> "
-"button."
+"from the Contacts window into the list, or by using the <gui style=\"button"
+"\">Select...</gui> button."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:36(p)
@@ -11941,7 +10119,8 @@ msgstr ""
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the “Bcc:” feature "
-"discussed in <placeholder-1/>."
+"discussed in <link xref=\"mail-composer-several-recipients\">Sending a "
+"message to several recipients</link>."
 msgstr ""
 "A no ser que sea una lista muy pequeña, es recomendable que oculte las "
 "direcciones. Este funcionamiento es similar al de la característica "
@@ -11958,17 +10137,24 @@ msgstr ""
 msgid "Sending messages to a contact list"
 msgstr "Enviar un mensaje al contacto"
 
-#: C/contacts-using-contact-lists.page:45(gui)
-#, fuzzy
-msgid "Send Message to List"
-msgstr "_Enviar un correo a la lista"
-
 #: C/contacts-using-contact-lists.page:45(p)
+#, fuzzy
+#| msgid ""
+#| "To mail the list, open a new email and type the name you chose for the "
+#| "list. Evolution addresses the message to the entire list when you send "
+#| "the message. You can also right-click the list's address card in the "
+#| "contacts tool and select Send Message to List."
 msgid ""
 "To send a message to the contact list, enter the name that you chose for the "
 "contact list as the recipient in the mail composer. You can also right-click "
-"the contact list in your address book and select <placeholder-1/>."
+"the contact list in your address book and select <gui>Send Message to List</"
+"gui>."
 msgstr ""
+"Para enviar un mensaje a la lista, abra un mensaje nuevo y escriba el nombre "
+"correspondiente. Al enviarlo, Evolution transmitirá el mensaje a todos los "
+"miembros de la lista. También puede pulsar con el botón derecho en la "
+"tarjeta correspondiente en la libreta de direcciones, y seleccionar Enviar "
+"un mensaje a la lista."
 
 #: C/contacts-usage.page:5(desc)
 #, fuzzy
@@ -11998,10 +10184,11 @@ msgid ""
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
 #: C/contacts-usage-edit-contact.page:25(p)
+#, fuzzy
 msgid ""
 "Double-click on the contact that you want to edit in the list of contacts, "
-"or select the contact and press <placeholder-1/>."
-msgstr ""
+"or select the contact and press <key>Enter</key>."
+msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
 #: C/contacts-usage-edit-contact.page:26(p)
 #, fuzzy
@@ -12018,18 +10205,13 @@ msgstr "Copiar los contactos seleccionados a otra libreta de direcciones"
 msgid "Deleting a Contact"
 msgstr "Borrar un contacto:"
 
-#: C/contacts-usage-delete-contact.page:22(gui)
-#, fuzzy
-msgid "Delete Contact"
-msgstr "_Eliminar contacto"
-
 #: C/contacts-usage-delete-contact.page:22(p)
 msgid ""
 "If you want to delete a contact in your address books, right-click on the "
-"contact and select <placeholder-1/>, or click on the appointment and click "
-"<placeholder-2/> in the tool bar or press <keyseq><placeholder-3/"
-"><placeholder-4/></keyseq>, or click <guiseq><placeholder-5/><placeholder-6/"
-"></guiseq>."
+"contact and select <gui>Delete</gui>, or click on the appointment and click "
+"<gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</"
+"key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:5(desc)
@@ -12042,20 +10224,12 @@ msgstr "Añadir un remitente a la libreta de direcciones:"
 msgid "Adding a Contact"
 msgstr "Editar un contacto:"
 
-#: C/contacts-usage-add-contact.page:23(gui)
-msgid "Contact"
-msgstr "Contacto"
-
-#: C/contacts-usage-add-contact.page:23(key)
-msgid "C"
-msgstr "C"
-
 #: C/contacts-usage-add-contact.page:23(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or "
 "right-click in a blank space in the list of contacts and click \"New "
-"Contact...\", or press <keyseq><placeholder-4/><placeholder-5/"
-"><placeholder-6/></keyseq>."
+"Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></"
+"keyseq>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:25(p)
@@ -12064,14 +10238,10 @@ msgid "Enter the contact information. Note that there are several tabs."
 msgstr ""
 "Introduzca la información del contacto en las cajas de texto proporcionadas."
 
-#: C/contacts-usage-add-contact.page:26(gui)
-msgid "Full Name"
-msgstr "Nombre completo"
-
 #: C/contacts-usage-add-contact.page:26(p)
 msgid ""
 "You can add a photograph to the contact by clicking the large field (showing "
-"a stylized person) next to <placeholder-1/> and <placeholder-2/>."
+"a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>."
 msgstr ""
 
 #: C/contacts-usage-add-contact.page:31(title)
@@ -12092,26 +10262,16 @@ msgid "Right-click on the email address in the message header."
 msgstr ""
 "Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
 
-#: C/contacts-usage-add-contact.page:36(gui)
+#: C/contacts-usage-add-contact.page:36(p)
 #, fuzzy
-msgid "Add to Address Book..."
+msgid "Select <gui>Add to Address Book...</gui>."
 msgstr "_Añadir a la libreta de direcciones…"
 
-#: C/contacts-usage-add-contact.page:37(gui)
-#, fuzzy
-msgid "Edit Full"
-msgstr "_Editar todo"
-
-#: C/contacts-usage-add-contact.page:37(gui)
-#: C/calendar-free-busy.page:49(link)
-msgid "Contact Editor"
-msgstr "Editor de contactos"
-
 #: C/contacts-usage-add-contact.page:37(p)
 msgid ""
-"Either press <placeholder-1/> to bring up the full <placeholder-2/>, or "
-"click <placeholder-3/> to directly add the contact to the chosen address "
-"book."
+"Either press <gui style=\"button\">Edit Full</gui> to bring up the full "
+"<gui>Contact Editor</gui>, or click <gui style=\"button\">OK</gui> to "
+"directly add the contact to the chosen address book."
 msgstr ""
 
 #: C/contacts-searching.page:5(desc)
@@ -12166,10 +10326,11 @@ msgid ""
 "To add another local calendar to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/contacts-local.page:24(gui) C/contacts-ldap.page:31(gui)
-#: C/contacts-google.page:25(gui)
-msgid "Address Book"
-msgstr "Libreta de direcciones"
+#: C/contacts-local.page:24(p) C/contacts-ldap.page:31(p)
+#: C/contacts-google.page:25(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>."
+msgstr ""
 
 #: C/contacts-local.page:30(p) C/contacts-google.page:34(p)
 msgid ""
@@ -12205,12 +10366,9 @@ msgstr ""
 msgid "Adding an LDAP address book"
 msgstr "Añadir el remitente a la libreta de direcciones"
 
-#: C/contacts-ldap.page:32(gui)
-msgid "On LDAP Servers"
-msgstr "En servidores LDAP"
-
 #: C/contacts-ldap.page:32(p)
-msgid "In the <placeholder-1/> tab, select the type <placeholder-2/>."
+msgid ""
+"In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>."
 msgstr ""
 
 #: C/contacts-ldap.page:34(p)
@@ -12223,12 +10381,8 @@ msgstr ""
 msgid "Define the login method and your user name."
 msgstr ""
 
-#: C/contacts-ldap.page:37(gui)
-msgid "Details"
-msgstr "Detalles"
-
 #: C/contacts-ldap.page:37(p)
-msgid "In the <placeholder-1/> tab you can define the following settings:"
+msgid "In the <gui>Details</gui> tab you can define the following settings:"
 msgstr ""
 
 #: C/contacts-ldap.page:39(p)
@@ -12269,37 +10423,26 @@ msgstr ""
 "Se puede establecer aquí el filtro de búsqueda para todas las consultas "
 "LDAP. Por ejemplo:"
 
-#: C/contacts-ldap.page:48(code)
-msgid "ObjectClass=*"
-msgstr "ObjectClass=*"
-
 #: C/contacts-ldap.page:48(p)
-msgid "<placeholder-1/>: Lists all the objects from the server."
+msgid "<code>ObjectClass=*</code>: Lists all the objects from the server."
 msgstr ""
 
-#: C/contacts-ldap.page:49(code)
-msgid "ObjectClass=User"
-msgstr "ObjectClass=User"
-
 #: C/contacts-ldap.page:49(p)
-msgid "<placeholder-1/>: Lists only the users."
+msgid "<code>ObjectClass=User</code>: Lists only the users."
 msgstr ""
 
-#: C/contacts-ldap.page:50(code)
-msgid "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
-msgstr "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
-
 #: C/contacts-ldap.page:50(p)
-msgid "<placeholder-1/>: Retrieves the User and Contact List objects."
-msgstr ""
-
-#: C/contacts-ldap.page:51(code)
-msgid "(&amp;(mail=*)(ObjectClass=*))"
-msgstr "(&amp;(mail=*)(ObjectClass=*))"
+#, fuzzy
+#| msgid "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
+msgid ""
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: "
+"Retrieves the User and Contact List objects."
+msgstr "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
 
 #: C/contacts-ldap.page:51(p)
 msgid ""
-"<placeholder-1/>: Lists the objects associated with the email addresses."
+"<code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated "
+"with the email addresses."
 msgstr ""
 
 #: C/contacts-ldap.page:54(p)
@@ -12398,9 +10541,10 @@ msgstr "No se pudo abrir la libreta de direcciones"
 msgid "To add such an adress book to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/contacts-google.page:26(gui) C/calendar-google.page:29(gui)
-msgid "Google"
-msgstr "Google"
+#: C/contacts-google.page:26(p) C/calendar-google.page:29(p)
+#, fuzzy
+msgid "Select the type <gui>Google</gui>."
+msgstr "gpg <placeholder-1/>"
 
 #: C/contacts-google.page:29(p) C/calendar-google.page:33(p)
 #, fuzzy
@@ -12428,24 +10572,32 @@ msgstr ""
 
 #: C/contacts-autocompletion.page:30(p)
 msgid ""
-"To enable autocompletion, go to <guiseq><placeholder-1/><placeholder-2/"
-"><placeholder-3/><placeholder-4/></guiseq> and choose the address books from "
-"the list that Evolution should look in for matches."
+"To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the "
+"address books from the list that Evolution should look in for matches."
 msgstr ""
 
 #: C/contacts-autocompletion.page:32(p)
+#, fuzzy
+#| msgid ""
+#| "Select the Always show address of the autocompleted contact check box to "
+#| "show the email address along with the username."
 msgid ""
-"Select <placeholder-1/> to also show the email address along with the name. "
-"This can be helpful to distinguish if a contact has several email addresses."
+"Select <gui>Always show address of the autocompleted contact</gui> to also "
+"show the email address along with the name. This can be helpful to "
+"distinguish if a contact has several email addresses."
 msgstr ""
+"Seleccione la casilla de verificación Siempre mostrar la dirección del "
+"contacto autocompletado para mostrar la dirección del correo-e junto con el "
+"nombre de usuario."
 
 #: C/contacts-autocompletion.page:34(p)
 #, fuzzy
 msgid ""
-"Alternately, you can click the <placeholder-1/>, <placeholder-2/>, or "
-"<placeholder-3/> buttons to get a list of the email addresses in your "
-"contacts. Select addresses and click the arrow buttons to move them into the "
-"appropriate address columns."
+"Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</"
+"gui> buttons to get a list of the email addresses in your contacts. Select "
+"addresses and click the arrow buttons to move them into the appropriate "
+"address columns."
 msgstr ""
 "Alternativamente, puede pulsar los botones Para:, Cc:, Cco:, para obtener "
 "una lista de las direcciones de correo-e en su lista de contactos. "
@@ -12461,26 +10613,16 @@ msgstr ""
 msgid "Adding people automatically to my contacts"
 msgstr ""
 
-#: C/contacts-add-automatically.page:27(gui)
-msgid "Automatic Contacts"
-msgstr "Contactos automáticos"
-
-#: C/contacts-add-automatically.page:27(gui)
-#, fuzzy
-msgid "Create address book entries when sending emails"
-msgstr ""
-"Crear entradas _automáticamente en la libreta de direcciones al enviar "
-"correos"
-
 #: C/contacts-add-automatically.page:27(p)
 msgid ""
 "You can add people automatically to your contacts when you reply to received "
-"email. Enable the plugin <placeholder-1/> by going to <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>; click on \"Automatic Contacts\" so that it shows "
-"a check mark. Then go to <guiseq><placeholder-4/><placeholder-5/"
-"><placeholder-6/><placeholder-7/></guiseq> and enable the <placeholder-8/> "
-"option and select an address book in the drop-down field below that will "
-"receive the new contacts."
+"email. Enable the plugin <gui>Automatic Contacts</gui> by going to "
+"<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on \"Automatic "
+"Contacts\" so that it shows a check mark. Then go to <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Automatic "
+"Contacts</gui></guiseq> and enable the <gui>Create address book entries when "
+"sending emails</gui> option and select an address book in the drop-down "
+"field below that will receive the new contacts."
 msgstr ""
 
 #. TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655492 is fixed
@@ -12494,17 +10636,17 @@ msgstr ""
 msgid "Changing the display of the window buttons in the lower left corner."
 msgstr ""
 
-#: C/change-switcher-appearance.page:21(gui)
+#: C/change-switcher-appearance.page:19(title)
 #, fuzzy
-msgid "Switcher Appearance"
-msgstr "Apariencia del _selector"
+msgid "Changing the Switcher appearance"
+msgstr "Cambiar la apariencia del selector:"
 
 #: C/change-switcher-appearance.page:21(p)
 msgid ""
 "The display of the window buttons in the lower left corner (Mail, Contacts, "
-"Calendar, Tasks and Memos) can be changed via <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>. This can be helpful if you have a small display. "
-"You can also completely hide them."
+"Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</"
+"gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have "
+"a small display. You can also completely hide them."
 msgstr ""
 
 #: C/change-switcher-appearance.page:22(p)
@@ -12554,9 +10696,18 @@ msgstr ""
 msgid "To add such a calendar to Evolution, perform the following steps:"
 msgstr ""
 
+#: C/calendar-webdav.page:26(p) C/calendar-weather.page:26(p)
+#: C/calendar-local.page:24(p) C/calendar-google.page:28(p)
+#: C/calendar-caldav.page:27(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Calendario</gui></"
+"guiseq>."
+
 #: C/calendar-webdav.page:31(p) C/calendar-caldav.page:32(p)
 #, fuzzy
-msgid "Enter the address of the calendar in the <placeholder-1/> field."
+msgid "Enter the address of the calendar in the <gui>URL</gui> field."
 msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 
 #: C/calendar-weather.page:5(desc)
@@ -12569,9 +10720,10 @@ msgstr "Mostrar la siguiente conversación"
 msgid "Using a weather calendar"
 msgstr "Calendario meteorológico"
 
-#: C/calendar-weather.page:27(gui)
-msgid "Weather"
-msgstr "Meteorología"
+#: C/calendar-weather.page:27(p)
+#, fuzzy
+msgid "Select the type <gui>Weather</gui>."
+msgstr "gpg <placeholder-1/>"
 
 #: C/calendar-weather.page:31(p)
 msgid "Choose a location by selecting continent, country and city."
@@ -12620,16 +10772,13 @@ msgid ""
 "internet or in a local network."
 msgstr ""
 
-#: C/calendar-using-several-calendars.page:31(link)
-msgid "icalshare.com website"
-msgstr ""
-
 #: C/calendar-using-several-calendars.page:31(p)
 #, fuzzy
 msgid ""
-"For example, the <placeholder-1/> has an extensive list of shared online "
-"calendars, including national and religious holidays, phases of the moon, "
-"sports, and local and regional events."
+"For example, the <link href=\"http://icalshare.com\">icalshare.com website</"
+"link> has an extensive list of shared online calendars, including national "
+"and religious holidays, phases of the moon, sports, and local and regional "
+"events."
 msgstr ""
 "La <ulink url=\"http://icalshare.com\">página web de icalshare.com</ulink> "
 "tiene una extensa lista de calendarios compartidos en línea, incluyendo "
@@ -12666,16 +10815,10 @@ msgstr "Si quiere modificar una tarjeta que ya existe,"
 msgid "Double-click on the appointment that you want to edit in the calendar."
 msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
-#: C/calendar-usage-edit-appointment.page:26(link)
-#: C/calendar-usage-add-appointment.page:20(title)
-#, fuzzy
-msgid "Adding an Appointment"
-msgstr "Editar cita"
-
 #: C/calendar-usage-edit-appointment.page:26(p)
 msgid ""
-"Edit the appointment (see <placeholder-1/> for the list of available "
-"options)."
+"Edit the appointment (see <link xref=\"calendar-usage-add-appointment"
+"\">Adding an Appointment</link> for the list of available options)."
 msgstr ""
 
 #: C/calendar-usage-delete-appointment.page:5(desc)
@@ -12688,23 +10831,14 @@ msgstr "Abra una nueva cita en el calendario."
 msgid "Deleting an Appointment"
 msgstr "_Eliminar cita"
 
-#: C/calendar-usage-delete-appointment.page:22(gui)
-#, fuzzy
-msgid "Delete Appointment"
-msgstr "_Eliminar cita"
-
-#: C/calendar-usage-delete-appointment.page:22(link)
-msgid "list view"
-msgstr ""
-
 #: C/calendar-usage-delete-appointment.page:22(p)
 msgid ""
 "If you want to delete an appointment in your calendars, right-click on the "
-"appointment in the calendar and select <placeholder-1/>, or click on the "
-"appointment and click <placeholder-2/> in the tool bar or press "
-"<keyseq><placeholder-3/><placeholder-4/></keyseq>. If you are in the "
-"<placeholder-5/> you can also use <guiseq><placeholder-6/><placeholder-7/></"
-"guiseq>."
+"appointment in the calendar and select <gui>Delete Appointment</gui>, or "
+"click on the appointment and click <gui>Delete</gui> in the tool bar or "
+"press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link "
+"xref=\"calendar-layout-views\">list view</link> you can also use "
+"<guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:5(desc)
@@ -12712,15 +10846,16 @@ msgstr ""
 msgid "Adding an appointment."
 msgstr "fin de la cita"
 
-#: C/calendar-usage-add-appointment.page:23(gui)
-msgid "Appointment"
-msgstr "Cita"
+#: C/calendar-usage-add-appointment.page:20(title)
+#, fuzzy
+msgid "Adding an Appointment"
+msgstr "Editar cita"
 
 #: C/calendar-usage-add-appointment.page:23(p)
 #, fuzzy
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>, or "
-"double-click in a blank space in the calendar to open the Appointment "
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, "
+"or double-click in a blank space in the calendar to open the Appointment "
 "dialog. The particular time on the calendar view against which you have "
 "double clicked on will be suggested for the new appointment. You can also "
 "directly write in the calendar and then adjust the duration by dragging it "
@@ -12738,103 +10873,69 @@ msgstr "Cita postpuesta"
 #: C/calendar-usage-add-appointment.page:25(p)
 #: C/calendar-meetings-sending-invitation.page:33(p)
 #, fuzzy
-msgid "Select a calendar in the <placeholder-1/> drop-down list."
+msgid "Select a calendar in the <gui>Calendar</gui> drop-down list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
-#: C/calendar-usage-add-appointment.page:26(gui)
-#: C/calendar-meetings-sending-invitation.page:36(gui)
-msgid "Summary"
-msgstr "Resumen"
-
 #: C/calendar-usage-add-appointment.page:26(p)
 #: C/calendar-meetings-sending-invitation.page:36(p)
 #, fuzzy
-msgid "Enter a brief summary in the <placeholder-1/> field."
+#| msgid "Enter a brief summary in the Summary field."
+msgid "Enter a brief summary in the <gui>Summary</gui> field."
 msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
 
 #: C/calendar-usage-add-appointment.page:27(p)
 #: C/calendar-meetings-sending-invitation.page:37(p)
 #, fuzzy
-msgid "(Optional) Type a location in the <placeholder-1/> field."
+msgid "(Optional) Type a location in the <gui>Location</gui> field."
 msgstr "(Opcional) escriba una ubicación en el campo Lugar."
 
-#: C/calendar-usage-add-appointment.page:28(gui)
-#: C/calendar-meetings-sending-invitation.page:38(gui)
-msgid "All Day Event"
-msgstr "Acontecimiento para todo el día"
-
 #: C/calendar-usage-add-appointment.page:28(p)
 #: C/calendar-meetings-sending-invitation.page:38(p)
+#, fuzzy
+#| msgid ""
+#| "To select this appointment as an all day event, click Options &gt; All "
+#| "Day Event."
 msgid ""
-"To select this appointment as an all day event, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq>, or click the <placeholder-3/> button on the "
-"toolbar."
+"To select this appointment as an all day event, click <guiseq><gui>Options</"
+"gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> "
+"button on the toolbar."
 msgstr ""
+"Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
+"Opciones &gt; Acontecimiento para todo el día."
 
 #: C/calendar-usage-add-appointment.page:29(p)
 #: C/calendar-meetings-sending-invitation.page:39(p)
 msgid "Select the date and time."
 msgstr "Seleccione la fecha y la hora."
 
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "For"
-msgstr "o"
-
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "Until"
-msgstr "_Hasta"
-
 #: C/calendar-usage-add-appointment.page:30(p)
 #: C/calendar-meetings-sending-invitation.page:40(p)
 msgid ""
-"If the event is not an all day event, select either <placeholder-1/> to "
-"specify the duration, or select <placeholder-2/> to specify the ending time "
+"If the event is not an all day event, select either <gui>For</gui> to "
+"specify the duration, or select <gui>Until</gui> to specify the ending time "
 "of the event."
 msgstr ""
 
 #: C/calendar-usage-add-appointment.page:31(p)
 #: C/calendar-meetings-sending-invitation.page:41(p)
 #, fuzzy
-msgid "(Optional) Enter a description in the <placeholder-1/> field."
+msgid "(Optional) Enter a description in the <gui>Description</gui> field."
 msgstr "(Opcional) escriba una descripción en el campo Descripción."
 
-#: C/calendar-usage-add-appointment.page:32(link)
-msgid "busy"
-msgstr ""
-
-#: C/calendar-usage-add-appointment.page:32(gui)
-#, fuzzy
-msgid "Show Time as Busy"
-msgstr "Mostrar hora como _ocupada"
-
 #: C/calendar-usage-add-appointment.page:32(p)
 msgid ""
-"To show the time as <placeholder-1/> to others, click <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>."
+"To show the time as <link xref=\"calendar-free-busy\">busy</link> to others, "
+"click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "reminder"
-msgstr "Recordatorios"
-
-#: C/calendar-usage-add-appointment.page:34(link)
-#: C/calendar-meetings-sending-invitation.page:48(link)
-#, fuzzy
-msgid "recurrence"
-msgstr "Repetición"
-
 #: C/calendar-usage-add-appointment.page:34(p)
 #: C/calendar-meetings-sending-invitation.page:48(p)
 msgid ""
-"You can also define a <placeholder-1/>, a <placeholder-2/>, a <placeholder-3/"
-">, a <placeholder-4/>, or a <placeholder-5/> for the event, or add an "
-"attachment."
+"You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
+"<link xref=\"using-categories\">category</link>, a <link xref=\"calendar-"
+"alarms-and-reminders\">reminder</link>, a <link xref=\"calendar-recurrence"
+"\">recurrence</link>, or a <link xref=\"calendar-classifications"
+"\">classification</link> for the event, or add an attachment."
 msgstr ""
 
 #: C/calendar-timezones.page:5(desc)
@@ -12856,35 +10957,20 @@ msgstr "Evolution soporta el uso de varias zonas horarias."
 msgid "Setting your global timezone(s)"
 msgstr ""
 
-#: C/calendar-timezones.page:30(gui) C/calendar-timezones.page:32(gui)
-#: C/calendar-layout-general-formatting.page:29(title)
-msgid "Time"
-msgstr "Hora"
-
-#: C/calendar-timezones.page:30(gui)
-#: C/calendar-layout-general-formatting.page:33(link)
-#, fuzzy
-msgid "Time zone"
-msgstr "Zona horaria:"
-
 #: C/calendar-timezones.page:30(p)
 msgid ""
 "By default Evolution uses the system-wide time zone. This can be changed "
-"under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/><placeholder-6/></guiseq>."
+"under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-timezones.page:32(gui)
-#, fuzzy
-msgid "Second zone"
-msgstr "Zona se_cundaria:"
-
 #: C/calendar-timezones.page:32(p)
 msgid ""
 "If you deal a lot with people in another specific time zone you can display "
 "that second time zone in the day view of the calendar. You can set a second "
-"time zone under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/"
-"><placeholder-4/><placeholder-5/><placeholder-6/></guiseq>."
+"time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar "
+"and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/calendar-timezones.page:36(title)
@@ -12892,20 +10978,16 @@ msgstr ""
 msgid "Setting a timezone for an appointment"
 msgstr "Convierte una reunión en una cita"
 
-#: C/calendar-timezones.page:38(link)
-#, fuzzy
-msgid "add a new or edit an existing appointment"
-msgstr "Convierte una reunión en una cita"
-
 #: C/calendar-timezones.page:38(p)
 #, fuzzy
 msgid ""
 "You can also configure time zone information specific to each appointment. "
-"To do that, <placeholder-1/> and click the globe button to customize the "
-"time zone that the time exists in. For example, if you live in New York but "
-"have a telephone meeting set for noon with someone in California, you need "
-"to make sure that your schedules are coordinated. Setting time zones on a "
-"per-appointment basis helps avoid that potential confusion."
+"To do that, <link xref=\"calendar-usage\">add a new or edit an existing "
+"appointment</link> and click the globe button to customize the time zone "
+"that the time exists in. For example, if you live in New York but have a "
+"telephone meeting set for noon with someone in California, you need to make "
+"sure that your schedules are coordinated. Setting time zones on a per-"
+"appointment basis helps avoid that potential confusion."
 msgstr ""
 "También puede configurar información específica de la zona horaria a la hora "
 "de inicio y fin de cada cita. Para ello cree una nueva cita y pulse sobre el "
@@ -12950,30 +11032,18 @@ msgstr "Crear de citas"
 msgid "Using Recurrence"
 msgstr "Repetición"
 
-#: C/calendar-recurrence.page:25(gui)
-msgid "Recurrence"
-msgstr "Repetición"
-
-#: C/calendar-recurrence.page:25(gui)
-#, fuzzy
-msgid "Appointment Editor"
-msgstr "Lista de citas:"
-
-#: C/calendar-recurrence.page:25(gui)
-msgid "Exceptions"
-msgstr "Excepciones"
-
 #: C/calendar-recurrence.page:25(p)
 #, fuzzy
 msgid ""
 "If you have an appointment that takes place regurlarly, you can define its "
-"recurrence by clicking the <placeholder-1/> button in the <placeholder-2/> "
-"or by clicking <guiseq><placeholder-3/><placeholder-4/></guiseq>. You can "
-"then choose a time and date when the appointment stops recurring, and, under "
-"<placeholder-5/>, pick individual days when the appointment does not recur. "
-"Make your selections from left to right, and you form a sentence: \"Every "
-"two weeks on Monday and Friday until January 3, 2015\" or \"Every month on "
-"the first Friday for 12 occurrences.\""
+"recurrence by clicking the <gui>Recurrence</gui> button in the "
+"<gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</"
+"gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when "
+"the appointment stops recurring, and, under <gui>Exceptions</gui>, pick "
+"individual days when the appointment does not recur. Make your selections "
+"from left to right, and you form a sentence: \"Every two weeks on Monday and "
+"Friday until January 3, 2015\" or \"Every month on the first Friday for 12 "
+"occurrences.\""
 msgstr ""
 "El botón de la herramienta de Repetición le permite describir la "
 "periodicidad de las citas que puede variar desde diaria hasta cada 100 años. "
@@ -12988,15 +11058,16 @@ msgstr ""
 msgid "Post your calendar content in public."
 msgstr ""
 
-#: C/calendar-publishing.page:23(title) C/calendar-publishing.page:24(gui)
+#: C/calendar-publishing.page:23(title)
 msgid "Calendar Publishing"
 msgstr "Publicar el calendario"
 
 #: C/calendar-publishing.page:24(p)
 msgid ""
 "In order to make one of your calendars available to the public, you can "
-"define calendars to be uploaded to a web server under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/><placeholder-5/></guiseq>."
+"define calendars to be uploaded to a web server under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Calendar "
+"Publishing</gui><gui style=\"button\">Add</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-publishing.page:26(p)
@@ -13022,16 +11093,18 @@ msgstr ""
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
-#: C/calendar-publishing.page:30(gui)
-#, fuzzy
-msgid "Publish Calendar Information"
-msgstr "_Publicar información del calendario"
-
 #: C/calendar-publishing.page:30(p)
+#, fuzzy
+#| msgid ""
+#| "To immediately publish calendar information, go to the Calendar tool and "
+#| "click Actions &gt; Publish Calendar Information."
 msgid ""
-"To immediately publish calendar information, click <guiseq><placeholder-1/"
-"><placeholder-2/></guiseq> in the calendar."
+"To immediately publish calendar information, click <guiseq><gui>Actions</"
+"gui><gui>Publish Calendar Information</gui></guiseq> in the calendar."
 msgstr ""
+"Para publicar inmediatamente la información del calendario, vaya a la "
+"herramienta del Calendario y pulse Acciones &gt; Publicar información del "
+"calendario."
 
 #: C/calendar-organizing.page:5(desc)
 msgid "On using several calendars, searching, and categories."
@@ -13069,10 +11142,10 @@ msgstr ""
 msgid ""
 "If you do not need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
-"and select <placeholder-1/>. This opens a new email message with the event "
-"notification attached as an announcement. Recipients can add the event to "
-"their calendars with one click, but it will not automatically send you email "
-"about whether they plan to attend."
+"and select <gui>Forward as iCalendar</gui>. This opens a new email message "
+"with the event notification attached as an announcement. Recipients can add "
+"the event to their calendars with one click, but it will not automatically "
+"send you email about whether they plan to attend."
 msgstr ""
 "Si no necesita recibir confirmaciones de asistencia al planificar un "
 "acontecimiento y sólo necesita anunciarlo, pulse con el botón derecho sobre "
@@ -13085,20 +11158,16 @@ msgstr ""
 msgid "To schedule a meeting:"
 msgstr "Para planificar una reunión:"
 
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-free-busy.page:33(gui)
-msgid "Meeting"
-msgstr "Reunión"
-
-#: C/calendar-meetings-sending-invitation.page:32(gui)
-msgid "Organizer"
-msgstr "Organizador"
+#: C/calendar-meetings-sending-invitation.page:31(p)
+#: C/calendar-free-busy.page:33(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>."
+msgstr ""
 
 #: C/calendar-meetings-sending-invitation.page:32(p)
 #, fuzzy
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
-"item in the <placeholder-1/> field."
+"item in the <gui>Organizer</gui> field."
 msgstr ""
 "Si tiene múltiples cuentas de correo seleccione la que quiere usar "
 "seleccionando un elemento en el campo Organizador."
@@ -13107,54 +11176,37 @@ msgstr ""
 #: C/calendar-free-busy.page:34(p)
 #, fuzzy
 msgid ""
-"Click <placeholder-1/> to add the email addresses of people you want to "
-"invite."
+"Click <gui style=\"button\">Add</gui> to add the email addresses of people "
+"you want to invite."
 msgstr ""
 "Pulse añadir para añadir las direcciones de correo-e de las personas a las "
 "que quiere invitar."
 
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Type"
-msgstr "Tipo"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Role"
-msgstr "Papel"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "RSVP"
-msgstr "Confirmar"
-
 #: C/calendar-meetings-sending-invitation.page:35(p)
+#, fuzzy
+#| msgid ""
+#| "Click View on the menu bar to show or hide the Type, Role, Status, and "
+#| "RSVP fields."
 msgid ""
-"Click <placeholder-1/> in the menu bar to show or hide the <placeholder-2/>, "
-"<placeholder-3/>, <placeholder-4/>, and <placeholder-5/> fields."
+"Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, "
+"<gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields."
 msgstr ""
-
-#: C/calendar-meetings-sending-invitation.page:42(link)
-#, fuzzy
-msgid "free/busy"
-msgstr "Disponibilidad"
-
-#: C/calendar-meetings-sending-invitation.page:42(gui)
-#: C/calendar-free-busy.page:35(gui)
-msgid "Free/Busy"
-msgstr "Disponibilidad"
+"Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
+"Estado y RSVP."
 
 #: C/calendar-meetings-sending-invitation.page:42(p)
 #, fuzzy
 msgid ""
-"To query <placeholder-1/> information for the attendees, click the "
-"<placeholder-2/> button on the toolbar, or click <guiseq><placeholder-3/"
-"><placeholder-4/></guiseq>."
+"To query <link xref=\"calendar-free-busy\">free/busy</link> information for "
+"the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or "
+"click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
 msgstr ""
 "Para preguntar la información de Disponibilidad de los asistentes, pulse el "
 "botón Disponibilidad en la barra de herramientas."
 
 #: C/calendar-meetings-sending-invitation.page:43(p)
-#, fuzzy
-msgid "Click <placeholder-1/> to save the meeting."
-msgstr "Pulse Guardar para guardar la reunión."
+msgid "Click <gui>Save</gui> to save the meeting."
+msgstr "Pulse <gui>Guardar</gui> para guardar la reunión."
 
 #: C/calendar-meetings-sending-invitation.page:46(p)
 msgid ""
@@ -13190,26 +11242,14 @@ msgstr "Aceptar y responder a solicitudes de reuniones"
 msgid "Replying to a Meeting Request"
 msgstr "Aceptar y responder a solicitudes de reuniones"
 
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Accept"
-msgstr "Aceptar"
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Tentatively Accept"
-msgstr "Aceptado provisionalmente"
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Decline"
-msgstr "Rehusar"
-
 #: C/calendar-meetings-replying-to-invitation.page:26(p)
 #, fuzzy
 msgid ""
 "Meeting requests are sent as attachments. To view or respond to one, click "
 "the attachment icon and view it in the mail window. All the details about "
 "the event are shown, including time and dates. Then you can choose how to "
-"reply to the invitation - the options are to <placeholder-1/>, "
-"<placeholder-2/>, or <placeholder-3/>."
+"reply to the invitation - the options are to <gui>Accept</gui>, "
+"<gui>Tentatively Accept</gui>, or <gui>Decline</gui>."
 msgstr ""
 "Las peticiones de reunión se envían como adjuntos iCal. Para ver o responder "
 "a uno, pulse el icono del adjunto y véalo en línea en la ventana del correo. "
@@ -13220,8 +11260,9 @@ msgstr ""
 #: C/calendar-meetings-replying-to-invitation.page:28(p)
 #, fuzzy
 msgid ""
-"Click <placeholder-1/> to send your answer per email to the organizer. The "
-"event is also added automatically to your calendar if you accept."
+"Click <gui style=\"button\">OK</gui> to send your answer per email to the "
+"organizer. The event is also added automatically to your calendar if you "
+"accept."
 msgstr ""
 "Pulse Aceptar para enviar un correo-e con su respuesta al organizador. Si "
 "acepta el acontecimiento también se añadirá a su calendario."
@@ -13237,15 +11278,11 @@ msgstr ""
 "a la información, pero si el organizador original envía otra actualización, "
 "sus cambios se sobreescribirán."
 
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-msgid "Conflict Search"
-msgstr "Búsqueda de conflictos"
-
 #: C/calendar-meetings-replying-to-invitation.page:31(p)
 msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"><placeholder-5/></guiseq> you can define which calendars are used for "
-"warning you of meeting conflicts."
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
+"gui><gui>Calendar and Tasks</gui><gui>Conflict Search</gui></guiseq> you can "
+"define which calendars are used for warning you of meeting conflicts."
 msgstr ""
 
 #: C/calendar-meetings.page:5(desc)
@@ -13278,10 +11315,10 @@ msgstr ""
 "En el Calendario, pulse con el botón derecho en la reunión que quiere "
 "delegar."
 
-#: C/calendar-meetings-delegating.page:32(gui)
-#, fuzzy
-msgid "Delegate Meeting"
-msgstr "_Delegar reunión…"
+#: C/calendar-meetings-delegating.page:32(p)
+#| msgid "Click Delegate Meeting."
+msgid "Click <gui>Delegate Meeting</gui>."
+msgstr "Pulse<gui>Delegar reunión</gui>."
 
 #: C/calendar-meetings-delegating.page:35(p)
 msgid "Select the contacts you want to delegate the meeting to."
@@ -13334,37 +11371,29 @@ msgid "Evolution offers five different views of your calendar data:"
 msgstr ""
 
 #: C/calendar-layout-views.page:27(p)
-msgid "Day (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
+msgid "Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
 msgstr ""
 
 #: C/calendar-layout-views.page:28(p)
-msgid "Work Week (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
+msgid "Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
 msgstr ""
 
-#: C/calendar-layout-views.page:29(key)
-msgid "K"
-msgstr "K"
-
 #: C/calendar-layout-views.page:29(p)
-msgid "Week (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
+msgid "Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
 msgstr ""
 
 #: C/calendar-layout-views.page:30(p)
-msgid "Month (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
+msgid "Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
 msgstr ""
 
 #: C/calendar-layout-views.page:31(p)
-msgid "List (<keyseq><placeholder-1/><placeholder-2/></keyseq>)"
+msgid "List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
 msgstr ""
 
-#: C/calendar-layout-views.page:34(gui)
-msgid "Current View"
-msgstr "Vista actual"
-
 #: C/calendar-layout-views.page:34(p)
 msgid ""
 "You can switch the view by either using the buttons in the toolbar, or by "
-"clicking <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+"clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>."
 msgstr ""
 
 #: C/calendar-layout-views.page:36(p)
@@ -13375,32 +11404,24 @@ msgstr ""
 "Puede elegir cualquier rango de días en el calendario pequeño en la barra "
 "lateral. Para ello seleccione los días que quiere ver en el calendario."
 
-#: C/calendar-layout-views.page:38(gui)
-msgid "Select today"
-msgstr "Selecciona hoy"
-
 #: C/calendar-layout-views.page:38(p)
 #, fuzzy
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
-"To return to today's listing, click the <placeholder-1/> button between the "
-"two arrow buttons in the toolbar."
+"To return to today's listing, click the <gui>Select today</gui> button "
+"between the two arrow buttons in the toolbar."
 msgstr ""
 "Los botones Anterior y Siguiente sirven para desplazarse adelante y atrás "
 "por las páginas del calendario. Si está usando la vista de semana o mes, "
 "puede desplazarse una semana o un mes. Para volver al día de hoy pulse Hoy "
 "en la barra de tareas."
 
-#: C/calendar-layout-views.page:40(gui)
-msgid "Select a specific date"
-msgstr "Selecciona una fecha específica"
-
 #: C/calendar-layout-views.page:40(p)
 #, fuzzy
 msgid ""
-"To visit calendar entries for a specific date, click the <placeholder-1/> "
-"button in the toolbar."
+"To visit calendar entries for a specific date, click the <gui>Select a "
+"specific date</gui> button in the toolbar."
 msgstr ""
 "Para visitar las entradas del calendario para una fecha específica, pulse en "
 "Ir a para abrir un cuadro de diálogo donde elegir la fecha."
@@ -13426,10 +11447,15 @@ msgstr "Opciones gene_rales"
 
 #: C/calendar-layout-general-formatting.page:27(p)
 msgid ""
-"The following options are available under <guiseq><placeholder-1/"
-"><placeholder-2/><placeholder-3/><placeholder-4/></guiseq>."
+"The following options are available under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></"
+"guiseq>."
 msgstr ""
 
+#: C/calendar-layout-general-formatting.page:29(title)
+msgid "Time"
+msgstr "Hora"
+
 #: C/calendar-layout-general-formatting.page:31(p)
 msgid "Time format:"
 msgstr "Formato de la hora:"
@@ -13439,9 +11465,8 @@ msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
 
 #: C/calendar-layout-general-formatting.page:33(p)
-#, fuzzy
-msgid "<placeholder-1/> and Second zone:"
-msgstr "gpg <placeholder-1/>"
+msgid "<link xref=\"calendar-timezones\">Time zone</link> and Second zone:"
+msgstr ""
 
 #: C/calendar-layout-general-formatting.page:34(p)
 #, fuzzy
@@ -13514,10 +11539,14 @@ msgstr "fin de la cita"
 #: C/calendar-layout-appointment-display.page:29(p)
 msgid ""
 "The following calendar-related options are available under "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/></"
-"guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>Display</gui></guiseq>."
 msgstr ""
 
+#: C/calendar-layout-appointment-display.page:32(title)
+msgid "General"
+msgstr "General"
+
 #: C/calendar-layout-appointment-display.page:34(p)
 msgid "Time Divisions:"
 msgstr "Divisiones de horas:"
@@ -13582,7 +11611,7 @@ msgstr "Formato de la fecha y hora"
 
 #: C/calendar-layout-appointment-display.page:50(p)
 msgid ""
-"You can change the format of the <placeholder-1/> column by setting your "
+"You can change the format of the <gui>Date</gui> column by setting your "
 "prefered format."
 msgstr ""
 
@@ -13615,11 +11644,6 @@ msgid ""
 "of invitees."
 msgstr ""
 
-#: C/calendar-free-busy.page:29(link)
-#, fuzzy
-msgid "meeting invitations"
-msgstr "El servidor gesti_ona las invitaciones a reuniones"
-
 #. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed
 #: C/calendar-free-busy.page:29(p)
 #, fuzzy
@@ -13630,7 +11654,8 @@ msgid ""
 "Microsoft Exchange and Novell GroupWise. However, you can also publish Free/"
 "Busy information online, and access Free/Busy information published "
 "elsewhere. If not everyone you collaborate with publishes Free/Busy data, "
-"you can still use <placeholder-1/> to coordinate schedules with other people."
+"you can still use <link xref=\"calendar-meetings-sending-invitation"
+"\">meeting invitations</link> to coordinate schedules with other people."
 msgstr ""
 "Además de las herramientas estándar de planificación de reuniones puede usar "
 "la vista de disponibilidad para comprobar de antemano si la gente estará "
@@ -13647,24 +11672,25 @@ msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
 #: C/calendar-free-busy.page:35(p)
+#, fuzzy
+#| msgid ""
+#| "Click the Free/Busy button on the toolbar, or click Options &gt; Free/"
+#| "Busy."
 msgid ""
-"Click the <placeholder-1/> button on the toolbar, or click "
-"<guiseq><placeholder-2/><placeholder-3/></guiseq>."
+"Click the <gui>Free/Busy</gui> button on the toolbar, or click "
+"<guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
 msgstr ""
-
-#: C/calendar-free-busy.page:36(gui)
-#, fuzzy
-msgid "Autopick"
-msgstr "_Auto-seleccionar"
+"Pulse el botón Disponibilidad en la barra de herramientas o pulse Opciones "
+"&gt; Disponibilidad."
 
 #: C/calendar-free-busy.page:36(p)
 #, fuzzy
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
-"the <placeholder-1/> buttons to choose a time automatically, then click "
-"<placeholder-2/>. Attendees on an Exchange server have the appointment "
-"updated automatically; others receive email notification of any change in "
-"plans."
+"the <gui>Autopick</gui> buttons to choose a time automatically, then click "
+"<gui style=\"button\">Close</gui>. Attendees on an Exchange server have the "
+"appointment updated automatically; others receive email notification of any "
+"change in plans."
 msgstr ""
 "Ajuste la hora de reunión, arrastrando los bordes de la reunión o pulsando "
 "en Autoseleccionar para hacer una elección automática, después pulse Guardar "
@@ -13710,20 +11736,13 @@ msgstr ""
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
-#: C/calendar-free-busy.page:49(gui)
-msgid "Personal Information"
-msgstr "Información personal"
-
-#: C/calendar-free-busy.page:49(gui)
-msgid "Web Addresses"
-msgstr "Páginas web"
-
 #: C/calendar-free-busy.page:49(p)
 #, fuzzy
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their web calendar, "
-"you can add the URL under <guiseq><placeholder-1/><placeholder-2/></guiseq> "
-"in the <placeholder-3/>. Then, when you schedule a meeting with them, "
+"you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web "
+"Addresses</gui></guiseq> in the <link xref=\"contacts-usage-edit-contact"
+"\">Contact Editor</link>. Then, when you schedule a meeting with them, "
 "Evolution looks up the schedule and displays it in the Free/Busy data."
 msgstr ""
 "Si personas individuales de proporcionan sus datos de Disponibilidad en un "
@@ -13747,30 +11766,14 @@ msgid ""
 "server, you can select a classification to determine who can view it."
 msgstr ""
 
-#: C/calendar-classifications.page:26(gui)
-msgid "Classifications"
-msgstr "Clasificaciones"
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Public"
-msgstr "Público"
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Private"
-msgstr "Privado"
-
-#: C/calendar-classifications.page:26(gui)
-msgid "Confidential"
-msgstr "Confidencial"
-
 #: C/calendar-classifications.page:26(p)
 msgid ""
 "To set a classification for an appointment or a task, click "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq> and select a "
-"classification in the editor. <placeholder-3/> is the default category, and "
+"<guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a "
+"classification in the editor. <gui>Public</gui> is the default category, and "
 "a public appointment can be viewed by anyone on the calendar-sharing "
-"network. <placeholder-4/> denotes one level of security, and <placeholder-5/"
-"> an even higher level."
+"network. <gui>Private</gui> denotes one level of security, and "
+"<gui>Confidential</gui> an even higher level."
 msgstr ""
 
 #: C/calendar-classifications.page:27(p)
@@ -13789,9 +11792,10 @@ msgstr "Examinar para calendarios CalDAV"
 msgid "Using a CalDAV calendar"
 msgstr "Examinar para calendarios CalDAV"
 
-#: C/calendar-caldav.page:28(gui)
-msgid "CalDAV"
-msgstr "CalDAV"
+#: C/calendar-caldav.page:28(p)
+#, fuzzy
+msgid "Select the type <gui>CalDAV</gui>."
+msgstr "gpg <placeholder-1/>"
 
 #: C/calendar-alarms-and-reminders.page:5(desc)
 #, fuzzy
@@ -13810,19 +11814,14 @@ msgstr "fin de la cita"
 msgid "General Settings"
 msgstr "Ajustes generales del correo"
 
-#: C/calendar-alarms-and-reminders.page:28(gui)
-#: C/calendar-alarms-and-reminders.page:37(gui)
-msgid "Reminders"
-msgstr "Recordatorios"
-
 #: C/calendar-alarms-and-reminders.page:28(p)
 msgid ""
-"Under <guiseq><placeholder-1/><placeholder-2/><placeholder-3/><placeholder-4/"
-"></guiseq> you can select those calendars for which you want to receive "
-"reminder notifications. If you do not select a calendar, you will not "
-"receive reminders for any events in this calendar. You can also define "
-"whether to show a reminder for every appointment and for every birthday and "
-"anniversary."
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>Reminders</gui></guiseq> you can select those calendars for which "
+"you want to receive reminder notifications. If you do not select a calendar, "
+"you will not receive reminders for any events in this calendar. You can also "
+"define whether to show a reminder for every appointment and for every "
+"birthday and anniversary."
 msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:33(title)
@@ -13838,25 +11837,21 @@ msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:37(p)
 msgid ""
-"Click <guiseq><placeholder-1/><placeholder-2/></guiseq> or press the "
+"Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the "
 "Reminder button in the toolbar."
 msgstr ""
 
-#: C/calendar-alarms-and-reminders.page:38(gui)
-#: C/calendar-alarms-and-reminders.page:39(gui)
-msgid "Customize"
-msgstr "Personalizar"
-
 #: C/calendar-alarms-and-reminders.page:38(p)
 msgid ""
 "From the dropdown menu, choose either one of the available default options "
-"when to show a notification reminder, or choose <placeholder-1/>."
+"when to show a notification reminder, or choose <gui>Customize</gui>."
 msgstr ""
 
 #: C/calendar-alarms-and-reminders.page:39(p)
 msgid ""
-"In case of <placeholder-1/>, the reminder can be a popup, a sound played, or "
-"a program ran. You can also define whether the reminder should be repeated."
+"In case of <gui>Customize</gui>, the reminder can be a popup, a sound "
+"played, or a program ran. You can also define whether the reminder should be "
+"repeated."
 msgstr ""
 
 #: C/backup-restore.page:5(desc)
@@ -13880,23 +11875,22 @@ msgstr ""
 msgid "Backing up"
 msgstr "Opciones de seguimiento"
 
-#: C/backup-restore.page:28(gui)
-#, fuzzy
-msgid "Back up Evolution Settings..."
-msgstr "_Respaldar ajustes de Evolution…"
+#: C/backup-restore.page:28(p)
+msgid ""
+"Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></"
+"guiseq>."
+msgstr ""
 
 #: C/backup-restore.page:29(p)
 msgid ""
 "Choose a filename and the folder where you want to save the backup file, and "
-"click <placeholder-1/>."
+"click <gui style=\"button\">Save</gui>."
 msgstr ""
 
-#: C/backup-restore.page:30(gui) C/backup-restore.page:39(gui)
-msgid "Yes"
-msgstr "Sí"
-
 #: C/backup-restore.page:30(p) C/backup-restore.page:39(p)
-msgid "You will get asked to close Evolution. Answer with <placeholder-1/>."
+msgid ""
+"You will get asked to close Evolution. Answer with <gui style=\"button"
+"\">Yes</gui>."
 msgstr ""
 
 #: C/backup-restore.page:35(title)
@@ -13904,36 +11898,1563 @@ msgstr ""
 msgid "Restoring"
 msgstr "Repetición"
 
-#: C/backup-restore.page:37(gui)
-#, fuzzy
-msgid "Restore Evolution Settings..."
-msgstr "R_estaurar ajustes de Evolution…"
+#: C/backup-restore.page:37(p)
+msgid ""
+"Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></"
+"guiseq>."
+msgstr ""
 
 #: C/backup-restore.page:38(p)
 #, fuzzy
-msgid "Choose the file, and click <placeholder-1/>."
+msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr "Seleccione el archivo y pulse Abrir."
 
-#: C/backup-restore.page:41(link)
-#, fuzzy
-msgid "first-run assistant"
-msgstr "Uso del asistente para la primera ejecución"
-
 #: C/backup-restore.page:41(p)
 #, fuzzy
 msgid ""
-"In the <placeholder-1/>, you can restore Evolution data from a backup file."
+"In the <link xref=\"intro-first-run\">first-run assistant</link>, you can "
+"restore Evolution data from a backup file."
 msgstr ""
 "¿Está seguro de que quiere restaurar Evolution desde el archivo de respaldo "
 "seleccionado?"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/backup-restore.page:0(None)
+#: C/index.page:0(None)
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
+#, fuzzy
+#~ msgid "Categories..."
+#~ msgstr "Ca_tegorías…"
+
+#, fuzzy
+#~ msgid "View"
+#~ msgstr "Ver:"
+
+#~ msgid "Categories"
+#~ msgstr "Categorías"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Available Categories"
+#~ msgstr "Categorías _disponibles:"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#, fuzzy
+#~ msgid "Click <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Categories Editor"
+#~ msgstr "Editor de categorías"
+
+#~ msgid "Delete"
+#~ msgstr "Eliminar"
+
+#, fuzzy
+#~ msgid "search"
+#~ msgstr "Buscar:"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Archivo:"
+
+#~ msgid "New"
+#~ msgstr "Nuevo"
+
+#~ msgid "Task List"
+#~ msgstr "Lista de tareas"
+
+#~ msgid "Memo List"
+#~ msgstr "Lista de notas"
+
+#, fuzzy
+#~ msgid "On the Web"
+#~ msgstr "en el futuro"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Use secure connection"
+#~ msgstr "Usar _conexión segura"
+
+#, fuzzy
+#~ msgid "Open Task"
+#~ msgstr "_Abrir tarea"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Delete Task"
+#~ msgstr "Eliminar tarea"
+
+#~ msgid "Task"
+#~ msgstr "Tarea"
+
+#~ msgid "T"
+#~ msgstr "T"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#, fuzzy
+#~ msgid "time zone"
+#~ msgstr "Zona horaria:"
+
+#, fuzzy
+#~ msgid "category"
+#~ msgstr "Categoría"
+
+#, fuzzy
+#~ msgid "classification"
+#~ msgstr "Clasificación"
+
+#, fuzzy
+#~ msgid "meetings"
+#~ msgstr "Reunión"
+
+#, fuzzy
+#~ msgid "This is similar to <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Assigned Task"
+#~ msgstr "Tareas asignadas"
+
+# #En conflicto con _Mensaje
+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~ msgid "Add Condition"
+#~ msgstr "Añadir a_cción"
+
+# Conflicto con _Ver del menú principal
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "_Vaciar"
+
+#~ msgid "Q"
+#~ msgstr "Q"
+
+#~ msgid "Save Search"
+#~ msgstr "Guardar búsqueda"
+
+#, fuzzy
+#~ msgid "Edit Saved Searches"
+#~ msgstr "Editar búsquedas guardadas:"
+
+#~ msgid "Edit Rule"
+#~ msgstr "Editar regla"
+
+#~ msgid "On This Computer"
+#~ msgstr "En este equipo"
+
+#, fuzzy
+#~ msgid "Preferences"
+#~ msgstr "Prefere_ncias"
+
+#~ msgid "Calendar and Tasks"
+#~ msgstr "Calendario y tareas"
+
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#, fuzzy
+#~ msgid "SyncEvolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "SyncML"
+#~ msgstr "HotSync"
+
+#, fuzzy
+#~ msgid "GNOME Pilot Synchronization..."
+#~ msgstr "_sincronización de GNOME Pilot…"
+
+#~ msgid "/dev/pilot"
+#~ msgstr "/dev/pilot"
+
+#~ msgid "/dev/ttyS0"
+#~ msgstr "/dev/ttyS0"
+
+#~ msgid "/dev/ttyUSB1"
+#~ msgstr "/dev/ttyUSB1"
+
+#~ msgid "ttyUSB0"
+#~ msgstr "ttyUSB0"
+
+#~ msgid "ttyUSB1"
+#~ msgstr "ttyUSB1"
+
+#, fuzzy
+#~ msgid "Pilot Conduits"
+#~ msgstr "Seleccionar un conducto"
+
+#~ msgid "EAddress"
+#~ msgstr "EAddress"
+
+#~ msgid "ECalendar"
+#~ msgstr "ECalendar"
+
+#~ msgid "ETodo"
+#~ msgstr "ETodo"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "Activado"
+
+#~ msgid "Settings"
+#~ msgstr "Ajustes"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "Deshabilitado:"
+
+#, fuzzy
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar:"
+
+#, fuzzy
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar desde Pilot:"
+
+#, fuzzy
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar hacia Pilot:"
+
+#~ msgid ".local/share/evolution"
+#~ msgstr ".local/share/evolution"
+
+#~ msgid "HotSync"
+#~ msgstr "HotSync"
+
+#, fuzzy
+#~ msgid "Evolution mailing list"
+#~ msgstr "Lista de correo %s"
+
+#, fuzzy
+#~ msgid "Evolution project website"
+#~ msgstr "Página web de Evolution"
+
+#, fuzzy
+#~ msgid "notification area"
+#~ msgstr "Mostrar icono en el área de _notificación"
+
+#, fuzzy
+#~ msgid "Open Memo"
+#~ msgstr "_Abrir nota"
+
+#~ msgid "Delete Memo"
+#~ msgstr "Eliminar nota"
+
+#~ msgid "Memo"
+#~ msgstr "Nota"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#, fuzzy
+#~ msgid "Shared Memo"
+#~ msgstr "Nota _compartida"
+
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "Mail Preferences"
+#~ msgstr "Opciones de correo"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Tipografías del mensaje"
+
+#, fuzzy
+#~ msgid "Use the same fonts as other applications"
+#~ msgstr "_Usar las mismas tipografías que en otras aplicaciones"
+
+#, fuzzy
+#~ msgid "bug report"
+#~ msgstr "Envía un informe de fallos"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "Propiedades:"
+
+#~ msgid "Work Offline"
+#~ msgstr "Trabajar desconectado"
+
+#, fuzzy
+#~ msgid "Download Messages for Offline Usage"
+#~ msgstr "_Descargar correos para trabajar sin conexión"
+
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "Formato:"
+
+#, fuzzy
+#~ msgid "Paragraph Style"
+#~ msgstr "Paraguay"
+
+#, fuzzy
+#~ msgid "Preformatted"
+#~ msgstr "Ver _sin formato"
+
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
+
+#, fuzzy
+#~ msgid "Vertical View"
+#~ msgstr "Vista vertical:"
+
+#, fuzzy
+#~ msgid "Classical View"
+#~ msgstr "Vista clásica:"
+
+#~ msgid "Folder"
+#~ msgstr "Carpeta"
+
+#, fuzzy
+#~ msgid "Subscriptions"
+#~ msgstr "_Suscripciones…"
+
+#~ msgid "Trash"
+#~ msgstr "Papelera"
+
+#, fuzzy
+#~ msgid "Search folder"
+#~ msgstr "carpeta de búsqueda"
+
+#~ msgid "Junk"
+#~ msgstr "SPAM"
+
+#, fuzzy
+#~ msgid "Plugins"
+#~ msgstr "Com_plementos"
+
+#, fuzzy
+#~ msgid "Close"
+#~ msgstr "_Cerrar"
+
+#~ msgid "S"
+#~ msgstr "S"
+
+#, fuzzy
+#~ msgid "Select <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Mail Accounts"
+#~ msgstr "Cuentas de correo"
+
+#~ msgid "Receiving Options"
+#~ msgstr "Opciones de recepción"
+
+#, fuzzy
+#~ msgid "Mark as Not Junk"
+#~ msgstr "Marcar como no _SPAM"
+
+#~ msgid "J"
+#~ msgstr "J"
+
+#~ msgid "Not Junk"
+#~ msgstr "No es SPAM"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "_Quitar"
+
+#~ msgid "Email"
+#~ msgstr "Correo-e"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "_Añadir"
+
+#, fuzzy
+#~ msgid "All Message Headers"
+#~ msgstr "_Todas las cabeceras del mensaje"
+
+#, fuzzy
+#~ msgid "Message Source"
+#~ msgstr "Me_nsaje en bruto"
+
+#~ msgid "U"
+#~ msgstr "U"
+
+#, fuzzy
+#~ msgid "Group By Threads"
+#~ msgstr "A_grupar por conversaciones"
+
+#, fuzzy
+#~ msgid "Remove This Column"
+#~ msgstr "Quitar esta c_olumna"
+
+#~ msgid "Add a Column"
+#~ msgstr "Añadir una columna"
+
+#, fuzzy
+#~ msgid "creating folders"
+#~ msgstr "Creando carpeta «%s»"
+
+#, fuzzy
+#~ msgid "creating filters"
+#~ msgstr "Borrar filtros"
+
+#, fuzzy
+#~ msgid "Message Filters..."
+#~ msgstr "Filtros de mensajes"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#, fuzzy
+#~ msgid "Check for Supported Types"
+#~ msgstr "C_omprobar tipos soportados"
+
+#, fuzzy
+#~ msgid "here"
+#~ msgstr "Dónde:"
+
+#, fuzzy
+#~ msgid "Composing mail"
+#~ msgstr "Importando buzón de correo"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar / Recibir"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#, fuzzy
+#~ msgid "Check for new messages every ... minutes"
+#~ msgstr "Comprobar los mensajes nuevos cada x minutos"
+
+#~ msgid "Using Search Folders"
+#~ msgstr "Usar las carpetas de búsqueda"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Actualizar"
+
+#, fuzzy
+#~ msgid "filters"
+#~ msgstr "filtro"
+
+#, fuzzy
+#~ msgid "folder"
+#~ msgstr "Carpeta:"
+
+#~ msgid "filter"
+#~ msgstr "filtro"
+
+#~ msgid "Unmatched"
+#~ msgstr "No coincidente"
+
+#, fuzzy
+#~ msgid "custom ones"
+#~ msgstr "Usar tipografía personalizada"
+
+#, fuzzy
+#~ msgid "Any header including <placeholder-1/>."
+#~ msgstr "Cualquier cabecera, incluyendo las personalizadas."
+
+#, fuzzy
+#~ msgid "labels"
+#~ msgstr "Etiquetas"
+
+#, fuzzy
+#~ msgid "flagged for follow-up"
+#~ msgstr "Marcar los mensajes seleccionados para seguimiento"
+
+#, fuzzy
+#~ msgid "Checks whether the message is <placeholder-1/>."
+#~ msgstr "Comprueba si el mensaje está marcado para seguimiento."
+
+#~ msgid "Search Folders"
+#~ msgstr "Carpetas de búsqueda"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
+#, fuzzy
+#~ msgid "Create Rule"
+#~ msgstr "Crear _regla"
+
+#, fuzzy
+#~ msgid "Create Search Folder From Search..."
+#~ msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
+
+#~ msgid "Rule name"
+#~ msgstr "Nombre de la regla"
+
+#, fuzzy
+#~ msgid "Available Search Folder conditions"
+#~ msgstr "Activar las Carpetas de _búsqueda"
+
+#, fuzzy
+#~ msgid "Find items"
+#~ msgstr "_Buscar elementos:"
+
+#~ msgid "Search Folder Sources"
+#~ msgstr "Orígenes de las carpetas de búsqueda"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#, fuzzy
+#~ msgid "Thread-*"
+#~ msgstr "_Conversación siguiente"
+
+#, fuzzy
+#~ msgid "subscriptions window"
+#~ msgstr "Anchura de la ventana «Suscripciones de carpetas»"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "R_uta:"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#, fuzzy
+#~ msgid "Filters"
+#~ msgstr "filtro"
+
+#, fuzzy
+#~ msgid "Apply filters to new messages in INBOX"
+#~ msgstr ""
+#~ "Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este "
+#~ "servidor"
+
+#~ msgid "Other..."
+#~ msgstr "Otro…"
+
+#, fuzzy
+#~ msgid "Leave messages on server"
+#~ msgstr "¿Borrar los mensajes en la carpeta de búsqueda?"
+
+#, fuzzy
+#~ msgid "subscribed folders"
+#~ msgstr "Desuscribirse de carpetas"
+
+#, fuzzy
+#~ msgid "Authenticate"
+#~ msgstr "A_utenticar"
+
+#, fuzzy
+#~ msgid "Global Address List/Active Directory"
+#~ msgstr "Lista de direcciones global"
+
+#, fuzzy
+#~ msgid "contact lists"
+#~ msgstr "Lista de contactos"
+
+#~ msgid "switcher"
+#~ msgstr "selector"
+
+#~ msgid "Mail Notification"
+#~ msgstr "Notificación de correo"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Request Read Receipt"
+#~ msgstr "_Solicitar confirmación de lectura"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Destinatarios del mensaje"
+
+#, fuzzy
+#~ msgid "Backspace"
+#~ msgstr "_Respaldo"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "&gt;"
+#~ msgstr "&gt;"
+
+#~ msgid "&lt;"
+#~ msgstr "&lt;"
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid "["
+#~ msgstr "["
+
+#, fuzzy
+#~ msgid "Page Down"
+#~ msgstr "Página %d"
+
+#, fuzzy
+#~ msgid "Send and Receive"
+#~ msgstr "Enviar / Recibir"
+
+#, fuzzy
+#~ msgid "Work online"
+#~ msgstr "_Trabajar conectado"
+
+#, fuzzy
+#~ msgid "deleting emails"
+#~ msgstr "Borrado de correo"
+
+#, fuzzy
+#~ msgid "search folders"
+#~ msgstr "carpeta de búsqueda"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#, fuzzy
+#~ msgid "New Label"
+#~ msgstr "Etiqueta n_ueva"
+
+#~ msgid "IMAP Subscriptions Manager"
+#~ msgstr "Gestor de suscripciones IMAP"
+
+#~ msgid "IMAP Features"
+#~ msgstr "Características IMAP"
+
+#, fuzzy
+#~ msgid "Basic Headers"
+#~ msgstr "Cabeceras básicas:"
+
+#~ msgid "Custom Headers"
+#~ msgstr "Cabeceras personalizadas"
+
+#, fuzzy
+#~ msgid "Mark for Follow Up..."
+#~ msgstr "Marcar para se_guimiento…"
+
+#, fuzzy
+#~ msgid "Click <placeholder-1/>"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Mark as"
+#~ msgstr "Marcar como _SPAM"
+
+#, fuzzy
+#~ msgid "Follow Up..."
+#~ msgstr "Se_guimiento…"
+
+#~ msgid "G"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Flag Completed"
+#~ msgstr "Ma_rcar como terminado"
+
+#, fuzzy
+#~ msgid "Clear Flag"
+#~ msgstr "_Quitar marca"
+
+#, fuzzy
+#~ msgid "add a Flag Status column"
+#~ msgstr "Marca de estado"
+
+#~ msgid "search folder"
+#~ msgstr "carpeta de búsqueda"
+
+#, fuzzy
+#~ msgid "Mark as Important"
+#~ msgstr "Marcar como imp_ortante"
+
+#~ msgid "Important"
+#~ msgstr "Importante"
+
+#, fuzzy
+#~ msgid "New Folder"
+#~ msgstr "Carpeta nueva:"
+
+#, fuzzy
+#~ msgid "Create"
+#~ msgstr "Creado"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover a la carpeta"
+
+#~ msgid "V"
+#~ msgstr "V"
+
+#~ msgid "Apply filters to new messages in Inbox on this server"
+#~ msgstr ""
+#~ "Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este "
+#~ "servidor"
+
+# Colisión en la A
+#, fuzzy
+#~ msgid "Apply Filters"
+#~ msgstr "Aplicar _filtros"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "Select All"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "Message Filters"
+#~ msgstr "Filtros de mensajes"
+
+#~ msgid "Then"
+#~ msgstr "Luego"
+
+#, fuzzy
+#~ msgid "Available Filter actions"
+#~ msgstr "Campos disponibles"
+
+#, fuzzy
+#~ msgid "Add Action"
+#~ msgstr "Añadir a_cción"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar de procesar"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "A_cciones"
+
+#~ msgid "filters.xml"
+#~ msgstr "filters.xml"
+
+#, fuzzy
+#~ msgid ""
+#~ "If the error message: <placeholder-1/> pops up, perform the following "
+#~ "steps:"
+#~ msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
+
+#~ msgid "~/.evolution/mail/local/"
+#~ msgstr "~/.evolution/mail/local/"
+
+#~ msgid "~/.local/share/evolution/mail/local/"
+#~ msgstr "~/.local/share/evolution/mail/local/"
+
+#~ msgid "evolution --force-shutdown"
+#~ msgstr "evolution --force-shutdown"
+
+#, fuzzy
+#~ msgid "Go"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Location..."
+#~ msgstr "Lugar"
+
+#, fuzzy
+#~ msgid "Folder for sent messages"
+#~ msgstr "Seleccione uno o más mensajes."
+
+#, fuzzy
+#~ msgid "added your certificate"
+#~ msgstr "Falló al importar el certificado"
+
+#, fuzzy
+#~ msgid "S/MIME Sign"
+#~ msgstr "Fi_rmar con S/MIME"
+
+#, fuzzy
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "C_ifrar con S/MIME"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME seguro (S/MIME)"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Seleccionar…"
+
+#, fuzzy
+#~ msgid "Signing Certificate"
+#~ msgstr "Certificado de _firma:"
+
+#, fuzzy
+#~ msgid "Encryption Certificate"
+#~ msgstr "Certificado de ci_frado:"
+
+#~ msgid "Certificates"
+#~ msgstr "Certificados"
+
+#~ msgid "Your Certificates"
+#~ msgstr "Sus certificados"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Contact Certificates"
+#~ msgstr "Certificados de contactos"
+
+#~ msgid "Authorities"
+#~ msgstr "Autoridades"
+
+#, fuzzy
+#~ msgid "PGP Sign"
+#~ msgstr "_Firmar con PGP"
+
+#, fuzzy
+#~ msgid "PGP Encrypt"
+#~ msgstr "Cif_rar con PGP"
+
+#, fuzzy
+#~ msgid "PGP/GPG Key ID"
+#~ msgstr "ID de c_lave GPG/PGP:"
+
+#~ msgid "gpg --list-keys"
+#~ msgstr "gpg --list-keys"
+
+#~ msgid "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
+#~ msgstr "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
+
+#~ msgid "keyid"
+#~ msgstr "keyid"
+
+#~ msgid "Security Information"
+#~ msgstr "Información de seguridad"
+
+#~ msgid "gpg --gen-key"
+#~ msgstr "gpg --gen-key"
+
+#~ msgid ""
+#~ "/home/you/.gnupg/pubring.gpg ---------------------------- pub "
+#~ "1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 "
+#~ "2011-06-20 [expires: 2012-11-14]"
+#~ msgstr ""
+#~ "/home/you/.gnupg/pubring.gpg ---------------------------- pub "
+#~ "1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 "
+#~ "2011-06-20 [expires: 2012-11-14]"
+
+#~ msgid "~/.gnupg/pubring.gpg"
+#~ msgstr "~/.gnupg/pubring.gpg"
+
+#~ msgid "1024D"
+#~ msgstr "1024D"
+
+#~ msgid "pub"
+#~ msgstr "pub"
+
+#~ msgid "32j38dk2"
+#~ msgstr "32j38dk2"
+
+#~ msgid "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
+#~ msgstr "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Remove Duplicate Messages"
+#~ msgstr "Quitar correos _duplicados"
+
+#~ msgid "$HOME/.local/share/evolution/mail/pop/"
+#~ msgstr "$HOME/.local/share/evolution/mail/pop/"
+
+#~ msgid "Headers"
+#~ msgstr "Cabeceras"
+
+#, fuzzy
+#~ msgid "Show the photograph of sender in the message preview"
+#~ msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
+
+#, fuzzy
+#~ msgid "Search for sender photograph only in local address books"
+#~ msgstr ""
+#~ "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
+
+#, fuzzy
+#~ msgid "Load Images"
+#~ msgstr "Cargar _imágenes"
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "HTML Messages"
+#~ msgstr "Mensajes HTML"
+
+#~ msgid "Loading Images"
+#~ msgstr "Cargando imágenes"
+
+#, fuzzy
+#~ msgid "Load images only in messages from contacts"
+#~ msgstr "Cargar i_mágenes en los mensajes de mis contactos"
+
+#, fuzzy
+#~ msgid "Always show address of the autocompleted contact"
+#~ msgstr "_Siempre mostrar la dirección del contacto autocompletado"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "_Para:"
+
+#, fuzzy
+#~ msgid "Cc:"
+#~ msgstr "_Cc:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Character Encoding"
+#~ msgstr "Codificación de caracteres"
+
+#~ msgid "Message Display"
+#~ msgstr "Mostrado de mensajes"
+
+#, fuzzy
+#~ msgid "Default character encoding"
+#~ msgstr "_Codificación de caracteres predeterminada:"
+
+#, fuzzy
+#~ msgid "Show Deleted Messages"
+#~ msgstr "Mostrar los mensajes _eliminados"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Purgar"
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#, fuzzy
+#~ msgid "Undelete message"
+#~ msgstr "_Recuperar mensaje"
+
+#, fuzzy
+#~ msgid "Mail Message"
+#~ msgstr "_Mensaje de correo"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "_Enviar"
+
+#, fuzzy
+#~ msgid "Return"
+#~ msgstr "devuelve"
+
+#~ msgid "Composer Preferences"
+#~ msgstr "Editor de correo"
+
+#~ msgid "Spell Checking"
+#~ msgstr "Ortografía"
+
+#, fuzzy
+#~ msgid "Languages"
+#~ msgstr "_Idiomas"
+
+#, fuzzy
+#~ msgid "Checking spelling while I type"
+#~ msgstr "Comprobar orto_grafía mientras se escribe"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#, fuzzy
+#~ msgid "Bcc:"
+#~ msgstr "Cc_o:"
+
+#, fuzzy
+#~ msgid "Bcc Field"
+#~ msgstr "Campo «Cc_o»"
+
+#, fuzzy
+#~ msgid "Find"
+#~ msgstr "Buscar:"
+
+#, fuzzy
+#~ msgid "<placeholder-1/>:"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Reemplazar:"
+
+#, fuzzy
+#~ msgid "Regular expressions"
+#~ msgstr "expresión regular"
+
+#~ msgid "Reply"
+#~ msgstr "Responder"
+
+#~ msgid "Reply to List"
+#~ msgstr "Responder a la lista"
+
+#~ msgid "Replies and Forwards"
+#~ msgstr "Respuestas y reenvíos"
+
+#, fuzzy
+#~ msgid "Forward style"
+#~ msgstr "_Estilo de reenvío:"
+
+#, fuzzy
+#~ msgid "Insert"
+#~ msgstr "_Insertar"
+
+#, fuzzy
+#~ msgid "Prioritize Message"
+#~ msgstr "Priorizar mensaje:"
+
+#~ msgid "Templates"
+#~ msgstr "Plantillas"
+
+#, fuzzy
+#~ msgid "Move to folder"
+#~ msgstr "Mover a la carpeta"
+
+#, fuzzy
+#~ msgid "Copy to folder"
+#~ msgstr "Copiar a la carpeta"
+
+#~ msgid "Save as Template"
+#~ msgstr "Guardar como plantilla"
+
+#~ msgid "signature"
+#~ msgstr "firma"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#, fuzzy
+#~ msgid "encryption"
+#~ msgstr "Cifrado"
+
+#, fuzzy
+#~ msgid "Composer preferences"
+#~ msgstr "Editor de correo"
+
+#~ msgid "Signatures"
+#~ msgstr "Firmas"
+
+#, fuzzy
+#~ msgid "account settings"
+#~ msgstr "Configuración de la cuenta de Yahoo:"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#, fuzzy
+#~ msgid "Header 1"
+#~ msgstr "Cabecera"
+
+#, fuzzy
+#~ msgid "Header 6"
+#~ msgstr "Cabecera"
+
+#, fuzzy
+#~ msgid "Preformat"
+#~ msgstr "Formato de la hora:"
+
+#, fuzzy
+#~ msgid "Bulleted List"
+#~ msgstr "Eli_minar la lista de notas"
+
+#, fuzzy
+#~ msgid "Style"
+#~ msgstr "Nombre del estilo:"
+
+#, fuzzy
+#~ msgid "Page Style"
+#~ msgstr "Configuración de la página:"
+
+#, fuzzy
+#~ msgid "Table..."
+#~ msgstr "Tabla"
+
+#, fuzzy
+#~ msgid "Rule..."
+#~ msgstr "_Nombre completo…"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Comportamiento predeterminado"
+
+#, fuzzy
+#~ msgid "Format messages in HTML"
+#~ msgstr "Dar formato _HTML a los mensajes"
+
+#, fuzzy
+#~ msgid "Insert Link"
+#~ msgstr "Insertar un enlace"
+
+#, fuzzy
+#~ msgid "Image..."
+#~ msgstr "Imagen"
+
+# #-#-#-#-#  usage-exchange.po  #-#-#-#-#
+# index.docbook:342, index.docbook:514
+#~ msgid "Forward"
+#~ msgstr "Reenviar"
+
+#~ msgid "F"
+#~ msgstr "F"
+
+#, fuzzy
+#~ msgid "Forward as"
+#~ msgstr "Reenviar _como"
+
+#, fuzzy
+#~ msgid "Forward as..."
+#~ msgstr "_Reenviar contacto…"
+
+#, fuzzy
+#~ msgid "Forward Style"
+#~ msgstr "_Estilo de reenvío:"
+
+#~ msgid "Custom Header"
+#~ msgstr "Cabecera personalizada"
+
+#, fuzzy
+#~ msgid "Enable <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "/apps/evolution/mail/composer/message_attribution"
+#~ msgstr "/apps/evolution/mail/composer/message_attribution"
+
+#, fuzzy
+#~ msgid "Date/Time format"
+#~ msgstr "Formato de la fecha y hora"
+
+#, fuzzy
+#~ msgid "Add a Column..."
+#~ msgstr "Añadir una c_olumna…"
+
+#~ msgid "Read Messages"
+#~ msgstr "Mensajes leídos"
+
+#, fuzzy
+#~ msgid "Show Message Preview"
+#~ msgstr "Mostrar vista _previa del correo"
+
+#, fuzzy
+#~ msgid "Show Hidden Messages"
+#~ msgstr "_Mostrar mensajes ocultos"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Cuentas de correo-e"
+
+#, fuzzy
+#~ msgid "Forward as iCalendar"
+#~ msgstr "Reenviar como i_Calendar…"
+
+#, fuzzy
+#~ msgid "Add Attachment..."
+#~ msgstr "_Añadir adjunto…"
+
+#, fuzzy
+#~ msgid "Save All"
+#~ msgstr "Guardar _todo"
+
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Guardar como…"
+
+#, fuzzy
+#~ msgid "Image Viewer"
+#~ msgstr "Archivos de imágenes"
+
+#, fuzzy
+#~ msgid "First-Run Assistant"
+#~ msgstr "Uso del asistente para la primera ejecución"
+
+#, fuzzy
+#~ msgid "Forwarding and POP/IMAP"
+#~ msgstr "Reenviar un mensaje:"
+
+#, fuzzy
+#~ msgid "Configuration instructions"
+#~ msgstr "Versión de la configuración"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#, fuzzy
+#~ msgid "Standard Instructions"
+#~ msgstr "Tipografía _estándar:"
+
+#, fuzzy
+#~ msgid "GMail Help"
+#~ msgstr "Destinatario del correo"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Estilo de la distribución"
+
+#, fuzzy
+#~ msgid "Show Side Bar"
+#~ msgstr "Mostrar barra _lateral"
+
+#, fuzzy
+#~ msgid "Contact Preview"
+#~ msgstr "Vista _previa de contactos"
+
+#, fuzzy
+#~ msgid "import data from other applications."
+#~ msgstr "Importa datos de otros programas"
+
+#, fuzzy
+#~ msgid "Server Type"
+#~ msgstr "_Tipo de servidor:"
+
+#, fuzzy
+#~ msgid "Standard Unix Mbox Spool"
+#~ msgstr "Archivo spool mbox estándar de Unix:"
+
+#, fuzzy
+#~ msgid "Continue with <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "configure a Maildir account"
+#~ msgstr "Configurar cuentas de correo-e"
+
+#~ msgid "Importer Type"
+#~ msgstr "Tipo de importador"
+
+#, fuzzy
+#~ msgid "Import a single file"
+#~ msgstr "Importar un _único archivo"
+
+#, fuzzy
+#~ msgid "Mail Folder"
+#~ msgstr "_Carpeta de correo"
+
+#, fuzzy
+#~ msgid "folders"
+#~ msgstr "Carpeta:"
+
+#, fuzzy
+#~ msgid "Import single file"
+#~ msgstr "Importar un _único archivo"
+
+#, fuzzy
+#~ msgid "File type"
+#~ msgstr "_Tipo de archivo:"
+
+# index.docbook:88, index.docbook:89
+#, fuzzy
+#~ msgid "old Evolution manual"
+#~ msgstr "Calendario de Evolution"
+
+#~ msgid "evolution --express"
+#~ msgstr "evolution --express"
+
+#, fuzzy
+#~ msgid "Save as mbox..."
+#~ msgstr "_Guardar como mbox…"
+
+#, fuzzy
+#~ msgid "Save Address Book As vCard"
+#~ msgstr "G_uardar la libreta de direcciones como VCard"
+
+#, fuzzy
+#~ msgid "Save Contact as VCard"
+#~ msgstr "G_uardar contacto como vCard…"
+
+#~ msgid "Save as vCard"
+#~ msgstr "Guardar como vCard"
+
+#, fuzzy
+#~ msgid "Save as"
+#~ msgstr "Guardar tarea"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Guardar como iCalendar…"
+
+#~ msgid "expunge"
+#~ msgstr "purgar"
+
+#, fuzzy
+#~ msgid "Empty Trash"
+#~ msgstr "_Vaciar papelera"
+
+#, fuzzy
+#~ msgid "Remove Attachments"
+#~ msgstr "Q_uitar adjuntos"
+
+#, fuzzy
+#~ msgid "Purge"
+#~ msgstr "Purg_ar"
+
+#, fuzzy
+#~ msgid "Activities"
+#~ msgstr "Autoridades"
+
+#, fuzzy
+#~ msgid "System Settings"
+#~ msgstr "Configuración de «shell»"
+
+#, fuzzy
+#~ msgid "System Info"
+#~ msgstr "Ordenar información"
+
+# index.docbook:29, index.docbook:30
+#, fuzzy
+#~ msgid "Default Applications"
+#~ msgstr "Ajustes predeterminados"
+
+#~ msgid "$HOME/.local/share/applications/mimeapps.list"
+#~ msgstr "$HOME/.local/share/applications/mimeapps.list"
+
+#~ msgid "Contact List"
+#~ msgstr "Lista de contactos"
+
+#~ msgid "Where:"
+#~ msgstr "Dónde:"
+
+#~ msgid "Select..."
+#~ msgstr "Seleccionar…"
+
+#, fuzzy
+#~ msgid "Send Message to List"
+#~ msgstr "_Enviar un correo a la lista"
+
+#, fuzzy
+#~ msgid "Delete Contact"
+#~ msgstr "_Eliminar contacto"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Full Name"
+#~ msgstr "Nombre completo"
+
+#, fuzzy
+#~ msgid "Edit Full"
+#~ msgstr "_Editar todo"
+
+#~ msgid "Contact Editor"
+#~ msgstr "Editor de contactos"
+
+#~ msgid "Address Book"
+#~ msgstr "Libreta de direcciones"
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "En servidores LDAP"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "ObjectClass=*"
+#~ msgstr "ObjectClass=*"
+
+#~ msgid "ObjectClass=User"
+#~ msgstr "ObjectClass=User"
+
+#~ msgid "(&amp;(mail=*)(ObjectClass=*))"
+#~ msgstr "(&amp;(mail=*)(ObjectClass=*))"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Automatic Contacts"
+#~ msgstr "Contactos automáticos"
+
+#, fuzzy
+#~ msgid "Create address book entries when sending emails"
+#~ msgstr ""
+#~ "Crear entradas _automáticamente en la libreta de direcciones al enviar "
+#~ "correos"
+
+#, fuzzy
+#~ msgid "Switcher Appearance"
+#~ msgstr "Apariencia del _selector"
+
+#~ msgid "Weather"
+#~ msgstr "Meteorología"
+
+#, fuzzy
+#~ msgid "Delete Appointment"
+#~ msgstr "_Eliminar cita"
+
+#~ msgid "Appointment"
+#~ msgstr "Cita"
+
+#~ msgid "Summary"
+#~ msgstr "Resumen"
+
+#, fuzzy
+#~ msgid "Enter a brief summary in the <placeholder-1/> field."
+#~ msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
+
+#~ msgid "All Day Event"
+#~ msgstr "Acontecimiento para todo el día"
+
+#, fuzzy
+#~ msgid "For"
+#~ msgstr "o"
+
+#, fuzzy
+#~ msgid "Until"
+#~ msgstr "_Hasta"
+
+#, fuzzy
+#~ msgid "Show Time as Busy"
+#~ msgstr "Mostrar hora como _ocupada"
+
+#, fuzzy
+#~ msgid "reminder"
+#~ msgstr "Recordatorios"
+
+#, fuzzy
+#~ msgid "recurrence"
+#~ msgstr "Repetición"
+
+#, fuzzy
+#~ msgid "Time zone"
+#~ msgstr "Zona horaria:"
+
+#, fuzzy
+#~ msgid "Second zone"
+#~ msgstr "Zona se_cundaria:"
+
+#, fuzzy
+#~ msgid "add a new or edit an existing appointment"
+#~ msgstr "Convierte una reunión en una cita"
+
+#~ msgid "Recurrence"
+#~ msgstr "Repetición"
+
+#, fuzzy
+#~ msgid "Appointment Editor"
+#~ msgstr "Lista de citas:"
+
+#~ msgid "Exceptions"
+#~ msgstr "Excepciones"
+
+#, fuzzy
+#~ msgid "Publish Calendar Information"
+#~ msgstr "_Publicar información del calendario"
+
+#~ msgid "Meeting"
+#~ msgstr "Reunión"
+
+#~ msgid "Organizer"
+#~ msgstr "Organizador"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Role"
+#~ msgstr "Papel"
+
+#~ msgid "RSVP"
+#~ msgstr "Confirmar"
+
+#, fuzzy
+#~ msgid "free/busy"
+#~ msgstr "Disponibilidad"
+
+#~ msgid "Free/Busy"
+#~ msgstr "Disponibilidad"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Tentatively Accept"
+#~ msgstr "Aceptado provisionalmente"
+
+#~ msgid "Decline"
+#~ msgstr "Rehusar"
+
+#~ msgid "Conflict Search"
+#~ msgstr "Búsqueda de conflictos"
+
+#, fuzzy
+#~ msgid "Delegate Meeting"
+#~ msgstr "_Delegar reunión…"
+
+#~ msgid "K"
+#~ msgstr "K"
+
+#~ msgid "Current View"
+#~ msgstr "Vista actual"
+
+#~ msgid "Select today"
+#~ msgstr "Selecciona hoy"
+
+#~ msgid "Select a specific date"
+#~ msgstr "Selecciona una fecha específica"
+
+#, fuzzy
+#~ msgid "<placeholder-1/> and Second zone:"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "meeting invitations"
+#~ msgstr "El servidor gesti_ona las invitaciones a reuniones"
+
+#, fuzzy
+#~ msgid "Autopick"
+#~ msgstr "_Auto-seleccionar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información personal"
+
+#~ msgid "Web Addresses"
+#~ msgstr "Páginas web"
+
+#~ msgid "Classifications"
+#~ msgstr "Clasificaciones"
+
+#~ msgid "Public"
+#~ msgstr "Público"
+
+#~ msgid "Private"
+#~ msgstr "Privado"
+
+#~ msgid "Confidential"
+#~ msgstr "Confidencial"
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Reminders"
+#~ msgstr "Recordatorios"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#, fuzzy
+#~ msgid "Back up Evolution Settings..."
+#~ msgstr "_Respaldar ajustes de Evolution…"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#, fuzzy
+#~ msgid "Restore Evolution Settings..."
+#~ msgstr "R_estaurar ajustes de Evolution…"
+
+#, fuzzy
+#~ msgid "first-run assistant"
+#~ msgstr "Uso del asistente para la primera ejecución"
+
 #~ msgid ""
 #~ "@@image: 'figures/evo_gwreceive_a.png'; "
 #~ "md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
@@ -13956,13 +13477,6 @@ msgstr ""
 #~ "md5=abaf292ea7b663824123f1f7f171b014"
 
 #~ msgid ""
-#~ "@@image: 'figures/evo_popreceive_a.png'; "
-#~ "md5=a635f0e8d9bb4f0bcda34221c258f273"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_popreceive_a.png'; "
-#~ "md5=a635f0e8d9bb4f0bcda34221c258f273"
-
-#~ msgid ""
 #~ "@@image: 'figures/evo_usereceive_a.png'; "
 #~ "md5=3c14cafdde81fca95d480851aee9db0f"
 #~ msgstr ""
@@ -14024,16 +13538,6 @@ msgstr ""
 #~ "md5=41335f17f056cb0b06e3df4900d08865"
 
 #~ msgid ""
-#~ "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-
-#~ msgid ""
-#~ "@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
-#~ msgstr ""
-#~ "@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa"
-
-#~ msgid ""
 #~ "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 #~ msgstr ""
 #~ "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
@@ -14084,13 +13588,6 @@ msgstr ""
 #~ "md5=2ce150b3eb63cc4ec0f0292e13167be8"
 
 #~ msgid ""
-#~ "@@image: 'figures/filter-new-fig.png'; "
-#~ "md5=75a2b8ccfe0f7a4982859827c867d578"
-#~ msgstr ""
-#~ "@@image: 'figures/filter-new-fig.png'; "
-#~ "md5=75a2b8ccfe0f7a4982859827c867d578"
-
-#~ msgid ""
 #~ "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 #~ msgstr ""
 #~ "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
@@ -14113,13 +13610,6 @@ msgstr ""
 #~ "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 
 #~ msgid ""
-#~ "@@image: 'figures/evo_Wcal_prop_a.png'; "
-#~ "md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_Wcal_prop_a.png'; "
-#~ "md5=dcd10f32a1ac7cbcb44d67e1a4b71a78"
-
-#~ msgid ""
 #~ "@@image: 'figures/google_cal_view.png'; "
 #~ "md5=e9ad85fb604b18447bcf9be09a540989"
 #~ msgstr ""
@@ -14146,20 +13636,6 @@ msgstr ""
 #~ "@@image: 'figures/evo_memo_a.png'; md5=29e23aefd253747b3a42f182825b75bd"
 
 #~ msgid ""
-#~ "@@image: 'figures/exchng-rec-mails.png'; "
-#~ "md5=b56dfa570c8d1c9b942c6493fd973d68"
-#~ msgstr ""
-#~ "@@image: 'figures/exchng-rec-mails.png'; "
-#~ "md5=b56dfa570c8d1c9b942c6493fd973d68"
-
-#~ msgid ""
-#~ "@@image: 'figures/exchng-rec-options.png'; "
-#~ "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
-#~ msgstr ""
-#~ "@@image: 'figures/exchng-rec-options.png'; "
-#~ "md5=31a2bbe7ef9de1dc79da40949e0dc7ae"
-
-#~ msgid ""
 #~ "@@image: 'figures/evo_send_option_a.png'; "
 #~ "md5=c1cca904625d1a7de13c851cd15235f6"
 #~ msgstr ""
@@ -14186,13 +13662,6 @@ msgstr ""
 #~ "md5=9a72b7725da27ce1970592cff67f4bbd"
 
 #~ msgid ""
-#~ "@@image: 'figures/groupwise_resend.png'; "
-#~ "md5=697ce252ac6f3f2f4f361039818d1262"
-#~ msgstr ""
-#~ "@@image: 'figures/groupwise_resend.png'; "
-#~ "md5=697ce252ac6f3f2f4f361039818d1262"
-
-#~ msgid ""
 #~ "@@image: 'figures/groupwise_resend_retract.png'; "
 #~ "md5=4eac3186389940b8305cf676f9fc3ef4"
 #~ msgstr ""
@@ -14242,16 +13711,6 @@ msgstr ""
 #~ "md5=cfa45a42e19ea3b09587f08990cf178f"
 
 #~ msgid ""
-#~ "@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3"
-
-#~ msgid ""
-#~ "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-
-#~ msgid ""
 #~ "@@image: 'figures/evolution_mail_preference.png'; "
 #~ "md5=191c1e890aa1cded550c9579d1af06e9"
 #~ msgstr ""
@@ -14259,11 +13718,6 @@ msgstr ""
 #~ "md5=191c1e890aa1cded550c9579d1af06e9"
 
 #~ msgid ""
-#~ "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9"
-
-#~ msgid ""
 #~ "@@image: 'figures/evo_caltasks_a.png'; "
 #~ "md5=88a894d8414c9205da0a6bab34de018c"
 #~ msgstr ""
@@ -14420,18 +13874,6 @@ msgstr ""
 #~ msgid "Enter <command>evolution</command>."
 #~ msgstr "Escriba <command>evolution</command>."
 
-#~ msgid ""
-#~ "The first time you run Evolution, it creates a directory named <emphasis>."
-#~ "evolution</emphasis> in your home directory, where it stores all of its "
-#~ "local data. Then, it opens a First-Run Assistant to help you set up email "
-#~ "accounts and import data from other applications."
-#~ msgstr ""
-#~ "La primera vez que ejecute Evolution, éste crea un directorio llamado "
-#~ "<emphasis>.evolution</emphasis> en su directorio de inicio de sesión, "
-#~ "donde almacena toda su información local. Después se abrirá un asistente, "
-#~ "sólo la primera vez, con el fin de ayudarle a configurar sus cuentas de "
-#~ "correo, así como para importar datos de otras aplicaciones."
-
 #~ msgid "Using the first-run assistant takes two to five minutes."
 #~ msgstr ""
 #~ "El asistente de primer inicio requiere entre dos y cinco minutos de su "
@@ -14476,9 +13918,8 @@ msgstr ""
 #~ "When the First-Run Assistant starts, the Welcome page is displayed. Click "
 #~ "Forward to proceed to the Identity window."
 #~ msgstr ""
-#~ "Cuando se inicia el «Asistente de primera ejecución», se muestra la "
-#~ "página de «Bienvenida». Pulse «Adelante» para proceder a la ventana de "
-#~ "«Identidad»."
+#~ "Cuando se inicia el «Asistente de primera ejecución», se muestra la página "
+#~ "de «Bienvenida». Pulse «Adelante» para proceder a la ventana de «Identidad»."
 
 #~ msgid "Type your full name in the Full Name field."
 #~ msgstr "Teclee su nombre completo en el campo «Nombre completo»."
@@ -14548,8 +13989,8 @@ msgstr ""
 #~ "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
 #~ "Configuration Options</link>."
 #~ msgstr ""
-#~ "Para las opciones de configuración, vea <link linkend="
-#~ "\"bstfw13\">Opciones de configuración remota</link>."
+#~ "Para las opciones de configuración, vea <link linkend=\"bstfw13"
+#~ "\">Opciones de configuración remota</link>."
 
 #~ msgid ""
 #~ "Available only if the evolution-exchange package is installed. Select "
@@ -15264,9 +14705,6 @@ msgstr ""
 #~ msgid "Click Folder &gt; New."
 #~ msgstr "Pulse en Carpeta &gt; Nueva."
 
-#~ msgid "Click OK."
-#~ msgstr "Pulse «Aceptar»."
-
 #~ msgid ""
 #~ "To change the appearance of your switcher click <emphasis>View &gt; "
 #~ "Switcher Appearance</emphasis> from the Menu Bar. Under Switcher "
@@ -15673,18 +15111,6 @@ msgstr ""
 #~ msgid "Composing New Email Messages"
 #~ msgstr "Redacción de mensajes de correo-e nuevos"
 
-#~ msgid ""
-#~ "If you are not already viewing mail, switch to the mail tool by clicking "
-#~ "the Mail shortcut button, or press Ctrl+1. To read a message, select it "
-#~ "in the message list; if you'd like to see it in its own window, either "
-#~ "double-click it, press Enter, or press Ctrl+O."
-#~ msgstr ""
-#~ "Si no está viendo ya el correo, cambie la la herramienta de correo "
-#~ "pulsando en el botón Correo, o pulsando Ctrl+1. Para leer un mensaje, "
-#~ "selecciónelo en la lista de mensajes, si quiere verlo en su propia "
-#~ "ventana, puede o bien pulsar dos veces en él, pulsar Intro o pulsar Ctrl"
-#~ "+O."
-
 #~ msgid "Magic Spacebar for Reading Mail"
 #~ msgstr "Barra espaciadora mágica para leer correos"
 
@@ -15893,18 +15319,6 @@ msgstr ""
 #~ msgstr "Vista vertical y vista clásica"
 
 #~ msgid ""
-#~ "To switch to vertical view, click View &gt; Preview &gt; Vertical View."
-#~ msgstr ""
-#~ "Para cambiar a la vista vertical, pulse Ver &gt; Vista previa &gt; Vista "
-#~ "vertical."
-
-#~ msgid ""
-#~ "To switch to classical view, click View &gt; Preview &gt; Classical View."
-#~ msgstr ""
-#~ "Para cambiar a la vista clásica, pulse Ver &gt; Vista previa &gt; Vista "
-#~ "clásica."
-
-#~ msgid ""
 #~ "Use the following procedure to set the limit of addresses to be displayed:"
 #~ msgstr ""
 #~ "Use el siguiente procedimiento para establecer el límite de direcciones "
@@ -15913,9 +15327,6 @@ msgstr ""
 #~ msgid "Select Edit &gt; Preferences."
 #~ msgstr "Seleccione Editar &gt; Preferencias."
 
-#~ msgid "Select Mail Preferences."
-#~ msgstr "Seleccione Opciones de correo."
-
 #~ msgid ""
 #~ "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit "
 #~ "the address."
@@ -15970,8 +15381,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Bajo la pestaña Recepción de correo elija el tipo de archivo de correo "
 #~ "que usa su otra aplicación y escriba la ruta de directorios completa a "
-#~ "ese lugar. Una elección habitual son los archivos mbox, con la ruta «/"
-#~ "home/<varname>nombresdelusuario</varname>/Mail»."
+#~ "ese lugar. Una elección habitual son los archivos mbox, con la ruta «/home/"
+#~ "<varname>nombresdelusuario</varname>/Mail»."
 
 #~ msgid ""
 #~ "You can only use one mail client at a time. The mail files are locked by "
@@ -16067,9 +15478,6 @@ msgstr ""
 #~ "Cargar imágenes en el correo de los contactos o Siempre cargar las "
 #~ "imágenes desde internet."
 
-#~ msgid "Click Close."
-#~ msgstr "Pulse Cerrar."
-
 #~ msgid "Using Evolution for News"
 #~ msgstr "Usar Evolution para noticias"
 
@@ -16128,15 +15536,6 @@ msgstr ""
 #~ "link>."
 
 #~ msgid ""
-#~ "You can start writing a new email message by clicking File &gt; New &gt; "
-#~ "Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking "
-#~ "New in the toolbar."
-#~ msgstr ""
-#~ "Puede comenzar a escribir un nuevo mensaje de correo-e pulsando Archivo "
-#~ "&gt; Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la "
-#~ "herramienta de correo o pulsando Nuevo en la barra de herramientas."
-
-#~ msgid ""
 #~ "Enter an address in the To field. If you want to enter multiple email "
 #~ "addresses, type in the addresses separated by comma. You can also use a "
 #~ "contact list to send messages to multiple recipients. Enter a subject in "
@@ -16385,13 +15784,6 @@ msgstr ""
 #~ "cuando pulsa el botón de desconexión sin descargar los mensajes."
 
 #~ msgid ""
-#~ "To download messages for offline operations, select File &gt; Download "
-#~ "messages for offline."
-#~ msgstr ""
-#~ "Para descargar los mensajes para operaciones en modo desconectado, "
-#~ "seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
-
-#~ msgid ""
 #~ "You can also drag a file to the attachment bar of the composer window. If "
 #~ "you want to send it as an inline attachment, right-click the attachment "
 #~ "and click Properties, then select Automatic Display of Attachments."
@@ -16471,9 +15863,6 @@ msgstr ""
 #~ msgid "Complete the rest of your message."
 #~ msgstr "Complete el resto de su mensaje."
 
-#~ msgid "Click Send."
-#~ msgstr "Pulse Enviar."
-
 #~ msgid ""
 #~ "Address auto-completion is enabled in Evolution by default when you "
 #~ "create contacts. Evolution makes it easy for you to quickly fill in the "
@@ -16725,11 +16114,6 @@ msgstr ""
 #~ msgid "Select Edit &gt; Plugins, then select Templates."
 #~ msgstr "Seleccione Editar &gt; Complementos, después seleccione Plantillas."
 
-#~ msgid "Right-click &gt; Move to folder / Copy to folder."
-#~ msgstr ""
-#~ "Pulse con el botón derecho del ratón &gt; Mover a la carpeta / Copiar a "
-#~ "la carpeta."
-
 #~ msgid "Select the Template local folder."
 #~ msgstr "Seleccione la carpeta local de la plantilla."
 
@@ -16896,21 +16280,6 @@ msgstr ""
 #~ "puse Y cuando se le pregunte la verificación de su elección."
 
 #~ msgid ""
-#~ "After the keys are generated, you can view your key information by "
-#~ "entering <command>gpg --list-keys</command>. You should see something "
-#~ "similar to this: <computeroutput> /home/you/.gnupg/pubring.gpg "
-#~ "----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
-#~ "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  "
-#~ "</computeroutput>"
-#~ msgstr ""
-#~ "Después de que se hayan generado estas claves, puede ver su información "
-#~ "introduciendo <command>gpg --list-keys</command>. Debería ver algo "
-#~ "similar a esto: <computeroutput> /home/you/.gnupg/pubring.gpg "
-#~ "----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
-#~ "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  "
-#~ "</computeroutput>"
-
-#~ msgid ""
 #~ "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is "
 #~ "assigned to multiple hosts in various networks. The gpg utility tries to "
 #~ "connect to one in the current network; and if that particular host is "
@@ -16935,9 +16304,6 @@ msgstr ""
 #~ "--keyserver wwwkeys.pgp.net keyid con el número de dirección IP explícito "
 #~ "que devolvió la utilidad del servidor."
 
-#~ msgid "Click the Security tab."
-#~ msgstr "Pulse en la pestaña de Seguridad."
-
 #~ msgid "Encrypting Messages"
 #~ msgstr "Cifrar mensajes"
 
@@ -17214,14 +16580,6 @@ msgstr ""
 #~ "columnas de la lista de mensajes."
 
 #~ msgid ""
-#~ "To look at the complete headers for a message, click View &gt; All "
-#~ "Message Headers. To see all message data, click View &gt; Message Source."
-#~ msgstr ""
-#~ "Para ver todas las cabeceras de un mensaje, pulse Ver &gt; Todas las "
-#~ "cabeceras del mensaje. Para ver todos los datos del mensaje, pulse Ver "
-#~ "&gt; Mensaje en bruto."
-
-#~ msgid ""
 #~ "You can also choose a threaded message view. Click View &gt; Group By "
 #~ "Threads to turn the threaded view on or off. When you select this option, "
 #~ "Evolution groups the replies to a message with the original, so you can "
@@ -17373,9 +16731,6 @@ msgstr ""
 #~ msgid "Using the Follow-Up Feature"
 #~ msgstr "Usar la característica de Marca de seguimiento"
 
-#~ msgid "Click Mark for Follow Up."
-#~ msgstr "Pulse Marca para seguimiento."
-
 #~ msgid "You can also open the Flag to Follow Up window by"
 #~ msgstr "También puede abrir la ventana de Marcar para seguimiento así"
 
@@ -17593,10 +16948,6 @@ msgstr ""
 #~ msgid "Current Message"
 #~ msgstr "Mensaje actual"
 
-#~ msgid "Type the search string in the search entry and press Enter."
-#~ msgstr ""
-#~ "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
-
 #~ msgid ""
 #~ "The folder list will be disabled while you perform search on All Accounts "
 #~ "or Current Account."
@@ -17656,9 +17007,6 @@ msgstr ""
 #~ msgid "Click Edit Saved Searches to open the Searches window."
 #~ msgstr "Pulse Editar búsquedas guardadas para abrir la ventana Búsquedas."
 
-#~ msgid "Click the Edit button to open the Edit Rule window."
-#~ msgstr "Pulse el botón Editar para abrir la ventana Editar regla."
-
 #~ msgid ""
 #~ "You can also add or remove searches from the list by using the respective "
 #~ "buttons available at the right."
@@ -18402,21 +17750,6 @@ msgstr ""
 #~ "demás, incluyendo la posibilidad de enviar la lista a otra persona y la "
 #~ "de enviar un mensaje a la lista."
 
-#~ msgid ""
-#~ "To mail the list, open a new email and type the name you chose for the "
-#~ "list. Evolution addresses the message to the entire list when you send "
-#~ "the message. You can also right-click the list's address card in the "
-#~ "contacts tool and select Send Message to List."
-#~ msgstr ""
-#~ "Para enviar un mensaje a la lista, abra un mensaje nuevo y escriba el "
-#~ "nombre correspondiente. Al enviarlo, Evolution transmitirá el mensaje a "
-#~ "todos los miembros de la lista. También puede pulsar con el botón derecho "
-#~ "en la tarjeta correspondiente en la libreta de direcciones, y seleccionar "
-#~ "Enviar un mensaje a la lista."
-
-#~ msgid "Click the Categories button at the left."
-#~ msgstr "Pulse el botón Categorías de la izquierda."
-
 #~ msgid "The Categories window is shown below."
 #~ msgstr "La ventana de Categorías se muestra debajo."
 
@@ -18708,13 +18041,6 @@ msgstr ""
 #~ "Seleccione la duración requerida en la vista del calendario y escriba el "
 #~ "resumen."
 
-#~ msgid ""
-#~ "To select this appointment as an all day event, click Options &gt; All "
-#~ "Day Event."
-#~ msgstr ""
-#~ "Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
-#~ "Opciones &gt; Acontecimiento para todo el día."
-
 #~ msgid "Click the All Day Event button on the toolbar."
 #~ msgstr ""
 #~ "Pulse el botón Acontecimiento para todo el día de la barra de "
@@ -19010,13 +18336,6 @@ msgstr ""
 #~ msgid "To edit a field, select the field and click Edit."
 #~ msgstr "Para editar un campo, seleccione el campo y pulse Editar."
 
-#~ msgid ""
-#~ "Click View on the menu bar to show or hide the Type, Role, Status, and "
-#~ "RSVP fields."
-#~ msgstr ""
-#~ "Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
-#~ "Estado y RSVP."
-
 #~ msgid "Click Options &gt; Free/Busy."
 #~ msgstr "Pulse Opciones &gt; Disponibilidad."
 
@@ -19043,13 +18362,6 @@ msgstr ""
 #~ "podrá ver el estado de los participantes, ej. cuántos han aceptado o "
 #~ "rechazado la petición de reunión."
 
-#~ msgid ""
-#~ "Click the Free/Busy button on the toolbar, or click Options &gt; Free/"
-#~ "Busy."
-#~ msgstr ""
-#~ "Pulse el botón Disponibilidad en la barra de herramientas o pulse "
-#~ "Opciones &gt; Disponibilidad."
-
 #~ msgid "To set up Calendar or Free/Busy publishing:"
 #~ msgstr "Para establecer la disponibilidad de publicación de un Calendario:"
 
@@ -19076,14 +18388,6 @@ msgstr ""
 #~ msgstr "Escriba su nombre de usuario y contraseña."
 
 #~ msgid ""
-#~ "To immediately publish calendar information, go to the Calendar tool and "
-#~ "click Actions &gt; Publish Calendar Information."
-#~ msgstr ""
-#~ "Para publicar inmediatamente la información del calendario, vaya a la "
-#~ "herramienta del Calendario y pulse Acciones &gt; Publicar información del "
-#~ "calendario."
-
-#~ msgid ""
 #~ "You can specify a template to use when posting to the Free/Busy server."
 #~ msgstr ""
 #~ "Puede especificar una plantilla para usar cuando publique contra el "
@@ -19156,9 +18460,6 @@ msgstr ""
 #~ "después introduzca el número de días de acontecimientos pasados que "
 #~ "quiere mantener. Pulse Aceptar para purgar los elementos."
 
-#~ msgid "Click Delegate Meeting."
-#~ msgstr "Pulse Delegar reunión."
-
 #~ msgid "Multiple Calendars, Web Calendars and CalDAV"
 #~ msgstr "Múltiples calendarios, calendarios web y CalDAV"
 
@@ -19835,9 +19136,6 @@ msgstr ""
 #~ "Autenticar, después introduzca la contraseña al ser preguntar. El "
 #~ "servidor autenticará su cuenta."
 
-#~ msgid "Click the Receiving Options tab."
-#~ msgstr "Pulse en la pestaña Opciones de recepción."
-
 #~ msgid ""
 #~ "Specify how often to check for new mail, your Global Catalog server name "
 #~ "and whether to apply filters to messages in your Inbox, check for junk, "
@@ -20800,8 +20098,8 @@ msgstr ""
 #~ "Reply for Items You Send</link>."
 #~ msgstr ""
 #~ "Puede recibir una notificación cuando el destinatario abre o borra un "
-#~ "mensaje. Para obtener más información consulte <link linkend="
-#~ "\"Ak05sv1\">Recibir notificaciones acerca de elementos que envíe</link>."
+#~ "mensaje. Para obtener más información consulte <link linkend=\"Ak05sv1"
+#~ "\">Recibir notificaciones acerca de elementos que envíe</link>."
 
 #~ msgid "Request a Reply:"
 #~ msgstr "Pedir una respuesta:"
@@ -20850,13 +20148,6 @@ msgstr ""
 #~ "la carpeta de Correo enviado."
 
 #~ msgid ""
-#~ "For more information, see <link linkend=\"Aal54a9\">Checking the Status "
-#~ "of an Item You Have Sent</link>."
-#~ msgstr ""
-#~ "Para obtener más información, consulte <link linkend="
-#~ "\"Aal54a9\">Comprobar el estado de un elemento que ha enviado</link>."
-
-#~ msgid ""
 #~ "(Optional) Select the check box next to Auto-delete sent item to "
 #~ "automatically delete the sent item from the Sent folder."
 #~ msgstr ""
@@ -21369,8 +20660,8 @@ msgstr ""
 #~ "For more information, see <link linkend=\"bshoty0\">Certificates</link>."
 #~ msgstr ""
 #~ "Use estos ajustes para certificar el manejo para los sistemas de "
-#~ "seguridad S/MIME. Para obtener más información vea <link linkend="
-#~ "\"bshoty0\">Certificados</link>."
+#~ "seguridad S/MIME. Para obtener más información vea <link linkend=\"bshoty0"
+#~ "\">Certificados</link>."
 
 #~ msgid ""
 #~ "Previous versions of Evolution included directory servers, folder "
@@ -21512,13 +20803,6 @@ msgstr ""
 #~ "Exchange (si ha instalado Evolution Connector para Microsoft Exchange), "
 #~ "<link linkend=\"sendmail\">Sendmail</link> o muchas otras opciones."
 
-#~ msgid ""
-#~ "For additional information, see <link linkend=\"third-step\">Sending "
-#~ "Mail</link>."
-#~ msgstr ""
-#~ "Para obtener información adicional vea <link linkend=\"third-step\">Envío "
-#~ "de correo</link>."
-
 #~ msgid "Defaults:"
 #~ msgstr "Predeterminados:"
 
@@ -21602,14 +20886,6 @@ msgstr ""
 #~ "usar. Para activar el autocompletado, seleccione cada una de las libretas "
 #~ "de direcciones que quiere usar en la página Autocompletado."
 
-#~ msgid ""
-#~ "Select the Always show address of the autocompleted contact check box to "
-#~ "show the email address along with the username."
-#~ msgstr ""
-#~ "Seleccione la casilla de verificación Siempre mostrar la dirección del "
-#~ "contacto autocompletado para mostrar la dirección del correo-e junto con "
-#~ "el nombre de usuario."
-
 #~ msgid "IMAP Mail Headers"
 #~ msgstr "Cabeceras de correo IMAP"
 
@@ -21876,16 +21152,6 @@ msgstr ""
 #~ "la parte derecha del panel de vista preliminar."
 
 #~ msgid ""
-#~ "To enable this feature, select Edit &gt; Preferences &gt; Mail "
-#~ "Preferences &gt; Headers &gt; Show the photograph of sender in the email "
-#~ "preview. Deselect this option to disable this feature."
-#~ msgstr ""
-#~ "Para activar esta característica, seleccione Editar &gt; Preferencias "
-#~ "&gt; Opciones de correo &gt; Cabeceras &gt; Mostrar la foto del remitente "
-#~ "en la vista preliminar del correo-e. Deseleccione esta opción para "
-#~ "desactivar esta característica."
-
-#~ msgid ""
 #~ "By default it searches only in the local address books enabled for "
 #~ "autocompletion. If you deselect the option <guilabel>Search for sender "
 #~ "photograph only in the local address book</guilabel>, it searches in all "
@@ -22942,10 +22208,10 @@ msgstr ""
 #~ "<command>/root</command>."
 #~ msgstr ""
 #~ "Una descripción imaginaria de los grupos de archivos del sistema. La "
-#~ "parte superior de ese árbol se llama el directorio raíz («root» en "
-#~ "inglés) y se indica con el carácter <command>/</command>. El resto de las "
-#~ "ramas cuelgan de la raíz. No confunda el directorio raíz con la cuenta "
-#~ "del superusuario («root») ni con el directorio de inicio del superusuario "
+#~ "parte superior de ese árbol se llama el directorio raíz («root» en inglés) "
+#~ "y se indica con el carácter <command>/</command>. El resto de las ramas "
+#~ "cuelgan de la raíz. No confunda el directorio raíz con la cuenta del "
+#~ "superusuario («root») ni con el directorio de inicio del superusuario "
 #~ "<command>/root</command>."
 
 #~ msgid ""
@@ -23406,13 +22672,6 @@ msgstr ""
 #~ "@@image: 'figures/folder_size_preference.png'; "
 #~ "md5=8d9067996afa74c865417b5b9171d4c0"
 
-#~ msgid ""
-#~ "@@image: 'figures/folder_size_mapi.png'; "
-#~ "md5=4b20ea9d82999051360f14da27e7c15d"
-#~ msgstr ""
-#~ "@@image: 'figures/folder_size_mapi.png'; "
-#~ "md5=4b20ea9d82999051360f14da27e7c15d"
-
 #~ msgid "Evolution MAPI Features"
 #~ msgstr "Características MAPI de Evolution"
 
@@ -23931,11 +23190,6 @@ msgstr ""
 #~ "Contacto nuevo. También puede pulsar Archivo &gt; Nuevo &gt; Contacto o "
 #~ "pulsar Mayús+Ctrl+C."
 
-#~ msgid ""
-#~ "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-#~ msgstr ""
-#~ "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-
 #~| msgid ""
 #~| "@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
 #~ msgid ""