Updated Galician translations

1 files changed, 3828 insertions, 4769 deletions

diff --git a/help/gl/gl.po b/help/gl/gl.po
index d151a42d7a..729c88b6e4 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2010 evolution's COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Fran Dieguez <frandieguez@ubuntu.com>, 2010.
+# Fran Dieguez <frandieguez@gnome.org>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
-"POT-Creation-Date: 2011-08-04 15:40+0200\n"
-"PO-Revision-Date: 2010-08-03 16:26+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
-"Language: gl\n"
+"POT-Creation-Date: 2011-09-14 11:01+0000\n"
+"PO-Revision-Date: 2011-09-18 02:34+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: C/using-categories.page:5(desc)
@@ -79,13 +79,14 @@ msgstr ""
 #: C/mail-layout-changing.page:11(name) C/mail-labels.page:12(name)
 #: C/mail-imap-subscriptions.page:13(name) C/mail-imap-headers.page:12(name)
 #: C/mail-follow-up-flag.page:11(name) C/mail-folders.page:12(name)
-#: C/mail-filters.page:11(name) C/mail-filters-conditions.page:11(name)
+#: C/mail-filters.page:11(name) C/mail-filters-not-working.page:16(name)
+#: C/mail-filters-conditions.page:11(name)
 #: C/mail-filters-actions.page:11(name)
 #: C/mail-error-folder-mismatch.page:15(name)
 #: C/mail-error-failed-to-append-to-sent-folder.page:15(name)
 #: C/mail-encryption-s-mime-signing-encrypting.page:11(name)
 #: C/mail-encryption-s-mime-manage.page:11(name)
-#: C/mail-encryption.page:24(name)
+#: C/mail-encryption.page:25(name)
 #: C/mail-encryption-gpg-signing-encrypting.page:11(name)
 #: C/mail-encryption-gpg-set-up.page:11(name)
 #: C/mail-encryption-gpg-getting-keys.page:11(name)
@@ -99,8 +100,8 @@ msgstr ""
 #: C/mail-displaying-collapsible-headers.page:11(name)
 #: C/mail-displaying-character-encodings.page:11(name)
 #: C/mail-delete-and-undelete.page:13(name)
-#: C/mail-default-folder-locations.page:22(name)
-#: C/mail-default-CC-and-BCC.page:18(name)
+#: C/mail-default-folder-locations.page:23(name)
+#: C/mail-default-CC-and-BCC.page:23(name)
 #: C/mail-composer-write-new-message.page:11(name)
 #: C/mail-composer-spellcheck.page:11(name)
 #: C/mail-composer-several-recipients.page:14(name)
@@ -140,7 +141,7 @@ msgstr ""
 #: C/mail-account-manage-imap.page:11(name)
 #: C/mail-access-gmail-imap-account.page:13(name)
 #: C/intro-main-window.page:13(name) C/intro-first-run.page:11(name)
-#: C/index.page:13(name) C/import-supported-file-formats.page:11(name)
+#: C/index.page:14(name) C/import-supported-file-formats.page:11(name)
 #: C/import-single-files.page:11(name) C/import-data.page:11(name)
 #: C/import-apps-outlook.page:11(name) C/import-apps-mozilla.page:11(name)
 #: C/groupwise-placeholder.page:11(name) C/google-services.page:9(name)
@@ -245,13 +246,14 @@ msgstr "Andre Klapper"
 #: C/mail-layout-changing.page:12(email) C/mail-labels.page:13(email)
 #: C/mail-imap-subscriptions.page:14(email) C/mail-imap-headers.page:13(email)
 #: C/mail-follow-up-flag.page:12(email) C/mail-folders.page:13(email)
-#: C/mail-filters.page:12(email) C/mail-filters-conditions.page:12(email)
+#: C/mail-filters.page:12(email) C/mail-filters-not-working.page:17(email)
+#: C/mail-filters-conditions.page:12(email)
 #: C/mail-filters-actions.page:12(email)
 #: C/mail-error-folder-mismatch.page:16(email)
 #: C/mail-error-failed-to-append-to-sent-folder.page:16(email)
 #: C/mail-encryption-s-mime-signing-encrypting.page:12(email)
 #: C/mail-encryption-s-mime-manage.page:12(email)
-#: C/mail-encryption.page:25(email)
+#: C/mail-encryption.page:26(email)
 #: C/mail-encryption-gpg-signing-encrypting.page:12(email)
 #: C/mail-encryption-gpg-set-up.page:12(email)
 #: C/mail-encryption-gpg-getting-keys.page:12(email)
@@ -265,8 +267,8 @@ msgstr "Andre Klapper"
 #: C/mail-displaying-collapsible-headers.page:12(email)
 #: C/mail-displaying-character-encodings.page:12(email)
 #: C/mail-delete-and-undelete.page:14(email)
-#: C/mail-default-folder-locations.page:23(email)
-#: C/mail-default-CC-and-BCC.page:19(email)
+#: C/mail-default-folder-locations.page:24(email)
+#: C/mail-default-CC-and-BCC.page:24(email)
 #: C/mail-composer-write-new-message.page:12(email)
 #: C/mail-composer-spellcheck.page:12(email)
 #: C/mail-composer-several-recipients.page:15(email)
@@ -308,7 +310,7 @@ msgstr "Andre Klapper"
 #: C/mail-account-manage-imap.page:12(email)
 #: C/mail-access-gmail-imap-account.page:14(email)
 #: C/intro-main-window.page:14(email) C/intro-first-run.page:12(email)
-#: C/index.page:14(email) C/import-supported-file-formats.page:12(email)
+#: C/index.page:15(email) C/import-supported-file-formats.page:12(email)
 #: C/import-single-files.page:12(email) C/import-data.page:12(email)
 #: C/import-apps-outlook.page:12(email) C/import-apps-mozilla.page:12(email)
 #: C/groupwise-placeholder.page:12(email) C/google-services.page:10(email)
@@ -480,13 +482,13 @@ msgstr "Novell, Inc"
 #: C/mail-layout-changing.page:15(p) C/mail-labels.page:16(p)
 #: C/mail-imap-subscriptions.page:20(p) C/mail-imap-headers.page:19(p)
 #: C/mail-follow-up-flag.page:18(p) C/mail-folders.page:23(p)
-#: C/mail-filters.page:18(p) C/mail-filters-not-working.page:16(p)
+#: C/mail-filters.page:18(p) C/mail-filters-not-working.page:20(p)
 #: C/mail-filters-conditions.page:18(p) C/mail-filters-actions.page:18(p)
 #: C/mail-error-no-provider-available.page:15(p)
 #: C/mail-error-folder-mismatch.page:19(p)
 #: C/mail-error-failed-to-append-to-sent-folder.page:19(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:18(p)
-#: C/mail-encryption-s-mime-manage.page:18(p) C/mail-encryption.page:28(p)
+#: C/mail-encryption-s-mime-manage.page:18(p) C/mail-encryption.page:29(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:18(p)
 #: C/mail-encryption-gpg-set-up.page:18(p)
 #: C/mail-encryption-gpg-getting-keys.page:18(p)
@@ -498,8 +500,8 @@ msgstr "Novell, Inc"
 #: C/mail-displaying-collapsible-headers.page:18(p)
 #: C/mail-displaying-character-encodings.page:15(p)
 #: C/mail-delete-and-undelete.page:20(p)
-#: C/mail-default-folder-locations.page:26(p)
-#: C/mail-default-CC-and-BCC.page:22(p)
+#: C/mail-default-folder-locations.page:27(p)
+#: C/mail-default-CC-and-BCC.page:27(p)
 #: C/mail-composer-write-new-message.page:18(p)
 #: C/mail-composer-spellcheck.page:15(p)
 #: C/mail-composer-several-recipients.page:21(p)
@@ -538,7 +540,7 @@ msgstr "Novell, Inc"
 #: C/mail-account-manage-imap.page:15(p)
 #: C/mail-access-gmail-pop-account.page:17(p)
 #: C/mail-access-gmail-imap-account.page:17(p) C/intro-main-window.page:24(p)
-#: C/intro-first-run.page:15(p) C/index.page:17(p)
+#: C/intro-first-run.page:15(p) C/index.page:18(p)
 #: C/import-supported-file-formats.page:18(p) C/import-single-files.page:15(p)
 #: C/import-data.page:15(p) C/import-apps-outlook.page:18(p)
 #: C/import-apps-mozilla.page:15(p) C/groupwise-placeholder.page:15(p)
@@ -594,300 +596,84 @@ msgid ""
 "category because he is a friend."
 msgstr ""
 
-#: C/using-categories.page:30(title)
+#: C/using-categories.page:29(p)
+msgid ""
+"To display only the objects in a particular category, select the "
+"corresponding category in the quick <link xref=\"searching-items\">search</"
+"link> bar."
+msgstr ""
+
+#: C/using-categories.page:32(title)
 msgid "Setting categories for an object"
 msgstr ""
 
-#: C/using-categories.page:32(p)
+#: C/using-categories.page:34(p)
 msgid "To mark an object as belonging to a category,"
 msgstr ""
 
-#: C/using-categories.page:34(p)
+#: C/using-categories.page:36(p)
 msgid "Double-click the object to bring up the corresponding editor."
 msgstr ""
 
-#: 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)
+#: C/using-categories.page:37(p) C/using-categories.page:49(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)
+#: C/using-categories.page:38(p)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
 msgstr ""
 
-#: C/using-categories.page:42(title)
+#: C/using-categories.page:44(title)
 msgid "Adding and managing categories"
 msgstr ""
 
-#: 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)
-#, fuzzy
-msgid "Edit"
-msgstr "_Editar"
-
-#: C/using-categories.page:44(gui)
-#, fuzzy
-msgid "Available Categories"
-msgstr "Cate_gorias dispoñíbeis"
-
-#: C/using-categories.page:44(p)
+#: C/using-categories.page:46(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)
+#: C/using-categories.page:48(p)
 msgid "Double-click any object to bring up th corresponding editor."
 msgstr ""
 
-#: C/using-categories.page:48(p)
+#: C/using-categories.page:50(p)
 msgid "Enter the new category in the entry box at the top."
 msgstr ""
 
-#: 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/using-categories.page:51(p) C/using-categories.page:53(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-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-search-folders-add.page:46(p) C/mail-filters.page:50(p)
+#: C/mail-filters.page:71(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/using-categories.page:50(p)
-msgid ""
-"You can now see the category in the <placeholder-1/> text field in the "
-"editor."
+#: C/contacts-usage-add-contact.page:27(p)
+#: C/calendar-meetings-delegating.page:38(p)
+msgid "Click <gui style=\"button\">OK</gui>."
 msgstr ""
 
-#: 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)
+#: C/using-categories.page:52(p)
 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."
+"You can now see the category in the <gui>Categories</gui> text field in the "
+"editor."
 msgstr ""
 
-#: C/using-categories.page:57(link) C/mail-search-folders.page:24(link)
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "search"
-msgstr "Buscando"
-
-#: C/using-categories.page:57(p)
+#: C/using-categories.page:56(p)
 msgid ""
-"To display only the objects in a particular category, select the "
-"corresponding category in the quick <placeholder-1/> bar."
+"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 ""
 
 #: C/tasks-webdav.page:5(desc)
@@ -908,85 +694,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 "_Ficheiro"
-
-#: 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 "Novo"
-
-#: 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 tarefas"
-
-#: 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)
-#, fuzzy
-msgid "On the Web"
-msgstr "no 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)
+#: C/tasks-webdav.page:27(p) C/tasks-caldav.page:25(p)
+#: C/calendar-webdav.page:27(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)
@@ -1013,51 +731,39 @@ 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)
-msgid "Enter the address of the list in the <placeholder-1/> field."
-msgstr ""
-
-#: 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 unha conexión segura:"
+msgid "Enter the address of the list in the <gui>URL</gui> field."
+msgstr ""
+"Escriba o seu enderezo de correo electrónico no campo Enderezo de correo "
+"electrónico."
 
 #: 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/mail-sending-options-smtp.page:39(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)
+#: C/tasks-webdav.page:33(p) C/mail-sending-options-smtp.page:36(p)
 #: C/calendar-webdav.page:33(p)
 #, fuzzy
 msgid "Enter your username."
 msgstr "Introduza o seu nome completo."
 
-#: 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"
+#: 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 ""
 
-#: C/tasks-webdav.page:37(p) C/calendar-webdav.page:37(p)
-#: C/calendar-weather.page:37(p) C/calendar-local.page:31(p)
-#: C/calendar-google.page:38(p) C/calendar-caldav.page:38(p)
+#: C/tasks-webdav.page:37(p)
 #, fuzzy
-msgid "The calendar will be added to the list of calendars in Evolution."
+msgid "The list will be added in Evolution."
 msgstr "Engadir calendarios meteorolóxicos ao Evolution."
 
 #: C/tasks-using-several-tasklists.page:5(desc)
@@ -1070,15 +776,15 @@ msgstr ""
 
 #: C/tasks-using-several-tasklists.page:22(p)
 msgid ""
-"You can have multiple task or memo lists and overlay them one over the next. "
-"For example, you might have tasks for work, tasks for home, and tasks for "
-"the singing club that you are a member of. The side bar lists those lists, "
-"and you can select or deselect the boxes next to them to show and hide the "
-"tasks or memos in your view."
+"You can have multiple task or memo lists and choose which of your lists get "
+"displayed. For example, you might have tasks for work, tasks for home, and "
+"tasks for the singing club that you are a member of. The side bar lists "
+"those lists, and you can select or deselect any of the boxes next to them to "
+"show and hide the corresponding tasks or memos in your view."
 msgstr ""
 
 #: C/tasks-using-several-tasklists.page:24(p)
-msgid "Tasks and memos for each task or memo list appear as a different color."
+msgid "Tasks and memos from each task or memo list appear as different colors."
 msgstr ""
 
 #: C/tasks-using-several-tasklists.page:26(p)
@@ -1109,15 +815,10 @@ msgstr ""
 msgid "If you want to change a task that already exists in your task lists,"
 msgstr ""
 
-#: C/tasks-usage-edit-task.page:25(key)
-#, fuzzy
-msgid "Open Task"
-msgstr "_Abrir unha tarefa"
-
 #: 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/>."
+"Double-click on the task that you want to edit in the list of tasks, or "
+"right-click on the task and click <key>Open Task</key>."
 msgstr ""
 
 #: C/tasks-usage-edit-task.page:26(p)
@@ -1125,26 +826,13 @@ msgstr ""
 msgid "Edit the task information."
 msgstr "Información da tarefa"
 
-#: 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)
-#, fuzzy
-msgid "Save"
-msgstr "_Gardar"
-
 #: 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)
@@ -1157,53 +845,12 @@ msgstr "Non é posíbel atopar esta tarefa en ningunha lista de tarefas"
 msgid "Deleting a Task"
 msgstr "Eliminar a tarefa"
 
-#: 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 a tarefa"
-
 #: 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)
@@ -1214,44 +861,15 @@ msgstr ""
 msgid "Adding a Task"
 msgstr ""
 
-#: C/tasks-usage-add-task.page:26(gui)
-msgid "Task"
-msgstr "Tarefa"
-
-#: 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 tipo de servidor na lista «Tipo de servidor»."
 
 #: C/tasks-usage-add-task.page:28(p)
@@ -1265,31 +883,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 "Fuso horario:"
-
-#: 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)
@@ -1308,25 +906,25 @@ msgid ""
 "respond."
 msgstr ""
 
-#: C/tasks-usage-add-task.page:41(link)
-#, fuzzy
-msgid "meetings"
-msgstr "Reunión - %s"
-
 #: 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 "Tarefa asigna_da"
+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)
+msgid ""
+"@@image: 'figures/search-icon.png'; md5=cd4b82c84c628bfbbfa39d1e0d1eae89"
 msgstr ""
 
 #: C/tasks-searching.page:5(desc)
@@ -1384,18 +982,10 @@ msgstr ""
 msgid "Select the search condition from the list."
 msgstr "Seleccionar o tipo de ficheiro que desexa importar desde a 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/>."
+msgid "Enter the text you want to search for and press <key>Enter</key>."
 msgstr ""
 
 #: C/tasks-searching.page:37(p) C/tasks-searching.page:43(p)
@@ -1412,16 +1002,9 @@ msgstr ""
 msgid "Searching by category:"
 msgstr "_Base de busca:"
 
-#: 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)
-#, fuzzy
-msgid "Show"
-msgstr "Mostrar mapas"
-
 #: C/tasks-searching.page:41(p) C/memos-searching.page:41(p)
 #: C/contacts-searching.page:41(p) C/calendar-searching.page:41(p)
-msgid "Click the <placeholder-1/> drop-down list."
+msgid "Click the <gui>Show</gui> drop-down list."
 msgstr ""
 
 #: C/tasks-searching.page:42(p) C/memos-searching.page:42(p)
@@ -1438,49 +1021,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 "Busca 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)
-#, fuzzy
-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 "Enga_dir unha condició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)
@@ -1495,7 +1053,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 "Prema aquí para cambiar o tipo de busca"
 
 #: C/tasks-searching.page:60(title) C/memos-searching.page:60(title)
@@ -1505,28 +1064,15 @@ msgstr "Prema aquí para cambiar o tipo de busca"
 msgid "Clearing the Search results"
 msgstr "Limpar a busca"
 
-#: 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 "Limpa_r"
-
-#: 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)
 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 ""
 
 #: C/tasks-searching.page:65(title) C/memos-searching.page:65(title)
@@ -1544,21 +1090,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 "Gardar a busca"
-
 #: 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)
@@ -1568,38 +1108,20 @@ msgstr ""
 msgid "Editing a Saved Search"
 msgstr "_Editar as buscas gardadas…"
 
-#: 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 as buscas gardadas…"
-
 #: 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)
-#: C/mail-searching.page:69(item) C/contacts-searching.page:73(item)
-#: C/calendar-searching.page:73(item)
-#, fuzzy
-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 a  regra"
-
 #: 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)
-msgid "Click the <placeholder-1/> button to open the <placeholder-2/> window."
+msgid ""
+"Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit "
+"Rule</gui> window."
 msgstr ""
 
 #: C/tasks-searching.page:75(p) C/memos-searching.page:75(p)
@@ -1608,6 +1130,12 @@ msgstr ""
 msgid "Edit the title or search conditions from the dialog box."
 msgstr ""
 
+#: 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 <gui>OK</gui>."
+msgstr ""
+
 #: C/tasks-organizing.page:5(desc)
 msgid "On task and memo lists, searching, and categories."
 msgstr ""
@@ -1629,10 +1157,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 "Neste computador"
+#: 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."
@@ -1647,134 +1176,35 @@ msgstr ""
 msgid "Displaying of tasks"
 msgstr "Cargando as tarefas"
 
-#: 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 "Preferencias de correo"
-
-#: 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 e tarefas"
-
-#: 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)
+#. TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome.
+#: C/tasks-display-settings.page:27(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>Tasks</gui></"
+"guiseq>."
 msgstr ""
 
-#: C/tasks-display-settings.page:32(p)
+#: C/tasks-display-settings.page:31(p)
 msgid "Tasks due today:"
 msgstr ""
 
-#: C/tasks-display-settings.page:33(p)
+#: C/tasks-display-settings.page:32(p)
 msgid "Select the color for tasks due today."
 msgstr ""
 
-#: C/tasks-display-settings.page:34(p)
+#: C/tasks-display-settings.page:33(p)
 msgid "Overdue tasks:"
 msgstr ""
 
-#: C/tasks-display-settings.page:35(p)
+#: C/tasks-display-settings.page:34(p)
 msgid "Select the color for overdue tasks."
 msgstr ""
 
-#: C/tasks-display-settings.page:36(p)
+#: C/tasks-display-settings.page:35(p)
 msgid "Hide completed tasks after:"
 msgstr ""
 
-#: C/tasks-display-settings.page:37(p)
+#: C/tasks-display-settings.page:36(p)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you do not select this option, "
@@ -1806,44 +1236,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)
@@ -1863,135 +1278,68 @@ msgstr ""
 msgid "Enabling Synchronization"
 msgstr ""
 
-#: C/sync-with-other-devices.page:38(gui)
-msgid "GNOME Pilot Synchronization..."
-msgstr ""
-
-#: 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)
 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 ""
 
 #: C/sync-with-other-devices.page:41(title)
 msgid "Selecting Conduits"
 msgstr ""
 
-#: C/sync-with-other-devices.page:42(gui)
-msgid "Pilot Conduits"
-msgstr ""
-
-#: 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)
 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 ""
 
-#: 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 "Axustes"
-
 #: C/sync-with-other-devices.page:43(p)
 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 ""
 
-#: C/sync-with-other-devices.page:45(gui)
-#, fuzzy
-msgid "Disabled"
-msgstr "_Desactivar"
-
 #: 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)
 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 ""
 
-#: C/sync-with-other-devices.page:47(gui)
-#, fuzzy
-msgid "Copy From Pilot"
-msgstr "Copiar o cartafol a"
-
 #: C/sync-with-other-devices.page:47(p)
 msgid ""
-"<placeholder-1/>: If there is any new data on the handheld device, copy it "
-"to the computer."
-msgstr ""
-
-#: C/sync-with-other-devices.page:48(gui)
-msgid "Copy To Pilot"
+"<gui>Copy From Pilot</gui>: If there is any new data on the handheld device, "
+"copy it to the computer."
 msgstr ""
 
 #: C/sync-with-other-devices.page:48(p)
-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 ""
 
 #: C/sync-with-other-devices.page:50(p)
 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 ""
 
 #: C/sync-with-other-devices.page:54(title)
@@ -2004,23 +1352,16 @@ msgid ""
 "with the data you store in Evolution."
 msgstr ""
 
-#: C/sync-with-other-devices.page:57(file)
-msgid ".local/share/evolution"
-msgstr ".local/share/evolution"
-
 #: C/sync-with-other-devices.page:57(p)
 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 ""
 
-#: C/sync-with-other-devices.page:58(gui)
-msgid "HotSync"
-msgstr "HotSync"
-
 #: C/sync-with-other-devices.page:58(p)
 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 ""
 
 #: C/sync-with-other-devices.page:59(p)
@@ -2036,14 +1377,8 @@ msgstr ""
 msgid "Now your Palm OS device will synchronize data with Evolution."
 msgstr ""
 
-#: 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)
@@ -2052,32 +1387,23 @@ msgid "Searching items"
 msgstr "Buscando"
 
 #: C/problems-reporting-bugs.page:5(desc)
-msgid "How to report bugs."
-msgstr ""
+#, fuzzy
+msgid "How to report mistakes in the application."
+msgstr "Importar os datos doutros programas"
 
 #: C/problems-reporting-bugs.page:21(title)
 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"
+"found a mistake or wrong behavior in the Evolution software, or if you want "
+"to request a feature you can file a 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)
@@ -2085,7 +1411,20 @@ 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-reporting-bugs.page:25(p)
+msgid ""
+"When reporting bugs exact information is welcome as it makes it easier for "
+"others to reproduce and fix the issue. If possible please include "
+"information such as the Evolution version (under <guiseq><gui>Help</"
+"gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to "
+"reproduce the problem, click by click. See the <link href=\"https://bugzilla."
+"gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</link> for "
+"more information."
 msgstr ""
 
 #: C/problems-getting-help.page:5(desc)
@@ -2093,19 +1432,16 @@ 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 talk to developers and other users in the IRC chat channel "
+"#evolution on the server irc.gimp.net. To connect to an IRC server you can "
+"for example use the internet messenger application Empathy."
 msgstr ""
 
 #: C/problems-debug-how-to.page:5(desc)
@@ -2122,20 +1458,17 @@ msgid ""
 "between the tool bar and the search bar."
 msgstr ""
 
-#: C/problems-debug-how-to.page:25(link)
-#, fuzzy
-msgid "Evolution project website"
-msgstr "Sitio web do 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)
@@ -2198,29 +1531,22 @@ msgstr "loonycookie@gmail.com"
 msgid "Minimizing Evolution to the system tray"
 msgstr "Inicio de Evolution por primeira vez"
 
-#: C/minimize-to-system-tray.page:27(link)
-#, fuzzy
-msgid "notification area"
-msgstr "Mostrar a icona na á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)
@@ -2228,9 +1554,8 @@ msgid "On adding, editing, and deleting memos."
 msgstr ""
 
 #: C/memos-usage.page:20(title)
-#, fuzzy
 msgid "Add, Edit and Delete Memos"
-msgstr "Eliminar as notas"
+msgstr "Engadir, editar e eliminar recordatorios"
 
 #: C/memos-usage.page:22(p)
 msgid ""
@@ -2251,21 +1576,15 @@ msgstr ""
 msgid "If you want to change a memo that already exists in your memo lists,"
 msgstr ""
 
-#: C/memos-usage-edit-memo.page:25(key)
-#, fuzzy
-msgid "Open Memo"
-msgstr "_Abrir a 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 memo and click <key>Open Memo</key>."
 msgstr ""
 
 #: C/memos-usage-edit-memo.page:26(p)
-#, fuzzy
 msgid "Edit the memo information."
-msgstr "Información da nota"
+msgstr "Editar a información dun recordatorio"
 
 #: C/memos-usage-delete-memo.page:5(desc)
 #, fuzzy
@@ -2273,19 +1592,15 @@ msgid "Deleting a memo from your memo list."
 msgstr "Non é posíbel atopar esta nota en ningunha lista de notas"
 
 #: C/memos-usage-delete-memo.page:20(title)
-#, fuzzy
 msgid "Deleting a Memo"
-msgstr "Eliminar a nota"
-
-#: C/memos-usage-delete-memo.page:22(gui)
-msgid "Delete Memo"
-msgstr "Eliminar a nota"
+msgstr "Eliminar un recordatorio"
 
 #: 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 memo 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)
@@ -2296,24 +1611,20 @@ msgstr ""
 msgid "Adding a Memo"
 msgstr ""
 
-#: 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 tipo de servidor na lista «Tipo de servidor»."
 
 #: C/memos-usage-add-memo.page:28(p)
-#, fuzzy
 msgid "Enter the memo information."
-msgstr "Información da nota"
+msgstr "Escriba a información do recordatorio"
 
 #: C/memos-usage-add-memo.page:32(p)
 msgid ""
@@ -2323,14 +1634,14 @@ 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 ""
 
 #: C/memos-usage-add-memo.page:37(title)
-#, fuzzy
 msgid "Shared Memos"
-msgstr "Nota _compartida"
+msgstr "Recordatorios compartidos"
 
 #: C/memos-usage-add-memo.page:39(p)
 msgid ""
@@ -2346,14 +1657,11 @@ msgstr ""
 msgid "To send a Shared Memo,"
 msgstr "Nota _compartida"
 
-#: 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 ""
@@ -2369,7 +1677,7 @@ msgstr ""
 
 #: C/memos-usage-add-memo.page:46(p)
 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 ""
 
@@ -2384,14 +1692,12 @@ msgid ""
 msgstr ""
 
 #: C/memos-searching.page:5(desc)
-#, fuzzy
 msgid "Searching memos."
-msgstr "Buscando"
+msgstr "Buscar recordatorios."
 
 #: C/memos-searching.page:28(title)
-#, fuzzy
 msgid "Searching Memos"
-msgstr "Buscando"
+msgstr "Buscando recordatorios"
 
 #: C/memos-searching.page:31(p)
 msgid ""
@@ -2408,45 +1714,24 @@ msgstr ""
 msgid "Message fonts are not the same fonts as in other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: 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 "Preferencias de correo"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-msgid "Message Fonts"
-msgstr "A mensaxe contén"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(gui)
-#, fuzzy
-msgid "Use the same fonts as other applications"
-msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
-
 #: 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."
-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)
-msgid "bug report"
+"In version 3.0 it can happen that <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Preferences</gui><gui>General</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(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/>."
+"This bug is fixed from Evolution version 3.0.3 (stable series) and 3.1.4 "
+"(unstable development series) onwards. If this is not the case, please add a "
+"comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
+"show_bug.cgi?id=655002\">bug report</link>. Note that from version 3.2 "
+"onwards this setting is located under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+"gui><gui>Message Display</gui><gui>Use the same fonts as other applications</"
+"gui></guiseq>."
 msgstr ""
 
 #: C/mail-working-offline.page:5(desc)
@@ -2484,18 +1769,13 @@ msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexión?"
 msgid "To mark a mail folder for offline use,"
 msgstr "A lista de tarefas non está marcada para o seu uso sen conexión."
 
-#: C/mail-working-offline.page:33(gui)
-#, fuzzy
-msgid "Properties"
-msgstr "_Propiedades"
-
 #: C/mail-working-offline.page:33(p)
-msgid "Right-click the folder, then click <placeholder-1/>."
+msgid "Right-click the folder, then click <gui>Properties</gui>."
 msgstr ""
 
-#: 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 o contido da a_xenda de enderezos localmente para operar sen conexión"
 
@@ -2504,30 +1784,21 @@ msgstr ""
 msgid "Syncing messages for offline usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: C/mail-working-offline.page:40(gui)
-#, fuzzy
-msgid "Work Offline"
-msgstr "_Traballar sen conexión"
-
 #: C/mail-working-offline.page:40(p)
 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 ""
 
-#: C/mail-working-offline.page:41(gui)
-#, fuzzy
-msgid "Download Messages for Offline Usage"
-msgstr "_Descargar as mensaxes para o uso sen conexión"
-
 #: C/mail-working-offline.page:41(p)
 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 ""
 
 #: C/mail-working-offline.page:45(title)
@@ -2556,26 +1827,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)
-msgid "Paragraph Style"
-msgstr ""
-
-#: C/mail-word-wrap.page:23(gui)
-#, fuzzy
-msgid "Preformatted"
-msgstr "Visualizar sen _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)
@@ -2583,9 +1839,8 @@ msgid "Changing the mail view for widescreen displays."
 msgstr ""
 
 #: C/mail-vertical-view.page:22(title)
-#, fuzzy
 msgid "Vertical view"
-msgstr "Visualización _vertical"
+msgstr "Vista vertical"
 
 #: C/mail-vertical-view.page:24(p)
 msgid ""
@@ -2596,21 +1851,10 @@ msgid ""
 "extra width of wide screen monitors."
 msgstr ""
 
-#: 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 "Previsualización"
-
-#: C/mail-vertical-view.page:26(gui)
-#, fuzzy
-msgid "Vertical View"
-msgstr "Visualización _vertical"
-
 #: C/mail-vertical-view.page:26(p)
 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 ""
 
 #: C/mail-vertical-view.page:28(p)
@@ -2621,15 +1865,10 @@ msgid ""
 "Subject in the second line."
 msgstr ""
 
-#: C/mail-vertical-view.page:30(gui)
-#, fuzzy
-msgid "Classical View"
-msgstr "Visualización _clásica"
-
 #: C/mail-vertical-view.page:30(p)
 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 ""
 
 #: C/mail-usenet-subscriptions.page:5(desc)
@@ -2647,28 +1886,8 @@ msgid ""
 "To subscribe to a newsgroup:"
 msgstr ""
 
-#: 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 "Cartafol"
-
-#: C/mail-usenet-subscriptions.page:29(gui)
-#: C/mail-imap-subscriptions.page:30(gui)
-#, fuzzy
-msgid "Subscriptions"
-msgstr "_Subscricións…"
-
-#: 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>."
+#: C/mail-usenet-subscriptions.page:29(p)
+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)
@@ -2698,49 +1917,31 @@ msgid ""
 "Evolution."
 msgstr ""
 
-#: C/mail-two-trash-folders.page:24(gui) C/mail-two-trash-folders.page:26(gui)
-msgid "Trash"
-msgstr "Lixo"
-
-#: C/mail-two-trash-folders.page:24(link)
-#, fuzzy
-msgid "Search folder"
-msgstr "Cartafoles de busca"
-
 #: 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 "Correo lixo"
-
 #: 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 ""
 
 #: C/mail-spam-settings.page:5(desc)
-msgid "How to set up handling unwanted junk and spam mail."
+msgid "How to set up handling unwanted junk/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 "Axustes do correo lixo"
 
@@ -2761,25 +1962,11 @@ msgid "Install spamassassin now."
 msgstr ""
 
 #: C/mail-spam-settings.page:34(p)
-#, fuzzy
 msgid "To enable the plugins:"
-msgstr "Activar e desactivar os engadidos"
-
-#: 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 "_Engadidos"
+msgstr "Para activar os engadidos:"
 
-#: 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)
@@ -2788,169 +1975,78 @@ msgid ""
 "SpamAssassin, or both."
 msgstr ""
 
-#: 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 "_Pechar"
+#: 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 <gui>Close</gui>."
+msgstr ""
+
+#: C/mail-spam-settings.page:41(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><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>."
+msgstr ""
 
-#: C/mail-spam-settings.page:42(title)
+#: C/mail-spam-settings.page:44(title)
 msgid "Junk Mail Preferences"
 msgstr ""
 
-#: C/mail-spam-settings.page:43(p)
+#: C/mail-spam-settings.page:45(p)
 msgid ""
 "You can modify how Evolution handles junk mail by changing the Junk Mail "
 "Preferences:"
 msgstr ""
 
-#: C/mail-spam-settings.page:45(key)
-msgid "S"
-msgstr "S"
-
-#: C/mail-spam-settings.page:45(p)
+#: C/mail-spam-settings.page:47(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)
+#: C/mail-spam-settings.page:48(p)
 #, fuzzy
-msgid "Select <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#| msgid "Mail Preferences"
+msgid "Select <gui>Mail Preferences</gui>."
+msgstr "Preferencias de correo"
 
-#: C/mail-spam-settings.page:47(p)
-msgid "Click on the <placeholder-1/> tab. Here, you can specify the following:"
+#: C/mail-spam-settings.page:49(p)
+msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
 msgstr ""
 
-#: C/mail-spam-settings.page:49(p)
+#: C/mail-spam-settings.page:51(p)
 #, fuzzy
 msgid "Checking incoming mail for junk messages."
 msgstr "Comprobar se o correo entrante é correo lixo"
 
-#: C/mail-spam-settings.page:50(p)
+#: C/mail-spam-settings.page:52(p)
 msgid ""
 "Deleting junk messages upon exit, and how often junk messages are to be "
 "deleted."
 msgstr ""
 
-#: C/mail-spam-settings.page:51(p)
+#: C/mail-spam-settings.page:53(p)
 #, fuzzy
 msgid "Checking custom headers for junk."
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: C/mail-spam-settings.page:52(p)
+#: C/mail-spam-settings.page:54(p)
 #, fuzzy
-msgid "Marking messages as junk if the sender is in the address book."
+msgid "Marking messages as not junk if the sender is in the address book."
 msgstr ""
 "Non ma_rcar as mensaxes como correo lixo se o remitente está na miña axenda "
 "de enderezos"
 
-#: C/mail-spam-settings.page:53(p)
-#, fuzzy
+#: C/mail-spam-settings.page:55(p)
 msgid "The default junk filter."
-msgstr "O engadido predeterminado para o tratamento do correo lixo"
+msgstr "O filtro de correo lixo predeterminado."
 
-#: C/mail-spam-settings.page:54(p)
+#: C/mail-spam-settings.page:56(p)
 msgid ""
 "Bogofilter and SpamAssassin options. These options are available only if the "
 "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 "Contas 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 "Opcións 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>."
-msgstr ""
-
 #: C/mail-spam.page:5(desc)
 msgid "How to automatically handle unwanted mail."
 msgstr ""
@@ -2981,9 +2077,8 @@ msgid "barbtobias09@gmail.com"
 msgstr "barbtobias09@gmail.com"
 
 #: C/mail-spam-marking.page:27(title)
-#, fuzzy
 msgid "Marking Junk Mail"
-msgstr "Marcar como correo l_ixo"
+msgstr "Marcar como correo lixo"
 
 #: C/mail-spam-marking.page:28(p)
 msgid ""
@@ -3003,40 +2098,22 @@ 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 "Desmarcar como correo lixo"
-
-#: 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)
 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 "
+"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 <gui>Mark as Junk</"
+"gui> 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 ""
 
-#: C/mail-spam-marking.page:31(gui)
-#, fuzzy
-msgid "Not Junk"
-msgstr "_Non é correo lixo"
-
 #: 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)
@@ -3060,8 +2137,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)
@@ -3080,18 +2158,12 @@ msgid "Removing an Email Address from Your Junk List"
 msgstr ""
 
 #: C/mail-spam-groupwise-remove-from-list.page:26(p)
-msgid "Right-click a message, then click <placeholder-1/>."
+msgid "Right-click a message, then click <gui>Junk Mail Settings</gui>."
 msgstr ""
 
-#: C/mail-spam-groupwise-remove-from-list.page:27(gui)
-#: C/mail-filters.page:63(gui)
-#, fuzzy
-msgid "Remove"
-msgstr "Elimina_r"
-
 #: 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 "Copiar o enderezo de correo ao portapapeis"
 
 #: C/mail-spam-groupwise-mark-message.page:5(desc)
@@ -3104,8 +2176,8 @@ msgstr ""
 
 #: C/mail-spam-groupwise-mark-message.page:25(p)
 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 ""
 
 #: C/mail-spam-groupwise-mark-message.page:26(p)
@@ -3124,15 +2196,16 @@ msgstr ""
 
 #: 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."
+msgid ""
+"Right-click on a message and select the <gui>Junk Mail Settings</gui> option."
 msgstr ""
 
 #: C/mail-spam-groupwise-manage-list.page:30(p)
 msgid "Specify whether you wish to Enable or Disable junk mail handling."
 msgstr ""
 
-#: 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)
@@ -3143,45 +2216,18 @@ msgstr ""
 msgid "Adding an Email Address to Your Junk List"
 msgstr ""
 
-#: C/mail-spam-groupwise-add-to-list.page:30(gui)
-msgid "Email"
-msgstr "Correo electrónico"
-
 #: 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 o seu enderezo de correo electrónico no campo Enderezo de correo "
 "electrónico."
 
-#: 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 "Eng_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)
@@ -3205,48 +2251,29 @@ msgstr "Xerando a lista de mensaxes"
 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 as ca_beceiras da mensaxe"
-
 #: C/mail-sorting-message-list.page:31(p)
 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 "Fonte da _mensaxe"
-
-#: C/mail-sorting-message-list.page:32(key)
-msgid "U"
-msgstr "U"
-
 #: 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)
 msgid "Sorting Mail in Email Threads"
 msgstr ""
 
-#: C/mail-sorting-message-list.page:36(gui)
-#, fuzzy
-msgid "Group By Threads"
-msgstr "A_grupar por conversas"
-
 #: 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)
@@ -3291,24 +2318,9 @@ msgstr ""
 msgid "Right-click on the header."
 msgstr ""
 
-#: C/mail-sorting-message-list.page:49(gui)
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Remove This Column"
-msgstr "Eliminar esta _columna"
-
-#: C/mail-sorting-message-list.page:49(gui)
-msgid "Add a Column"
-msgstr "Engadir unha columna"
-
 #: C/mail-sorting-message-list.page:49(p)
-msgid "Select the <placeholder-1/> or <placeholder-2/> option."
-msgstr ""
-
-#: C/mail-sorting-message-list.page:46(list)
 msgid ""
-"<item><placeholder-1/></item><item><placeholder-2/></item>S "
-"<item><placeholder-3/></item>"
+"Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:52(p)
@@ -3329,14 +2341,11 @@ 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 "O_rdenar por"
+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)
@@ -3348,11 +2357,8 @@ msgid "Right-click on the message list column headers."
 msgstr "Altura do panel da lista de mensaxes."
 
 #: 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 "gpg <placeholder-1/>"
 
 #: C/mail-sorting-message-list.page:63(p)
@@ -3360,11 +2366,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"
 
@@ -3373,13 +2378,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 "Localización"
 
@@ -3408,26 +2410,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 "Data"
 
 #: C/mail-sorting-message-list.page:77(p)
-#: C/mail-change-columns-in-message-list.page:23(gui)
 msgid "Subject"
 msgstr "Titular"
 
 #: 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)
-#, fuzzy
 msgid "Attachment"
 msgstr "Anexo"
 
@@ -3436,7 +2430,6 @@ msgid "Flagged"
 msgstr "Marcada"
 
 #: C/mail-sorting-message-list.page:81(p)
-#: C/calendar-meetings-sending-invitation.page:35(gui)
 msgid "Status"
 msgstr "Estado"
 
@@ -3449,10 +2442,13 @@ msgid "Select the option you wish to use in sorting email messages."
 msgstr ""
 
 #: C/mail-sorting-message-list.page:90(title)
-#: C/mail-sorting-message-list.page:93(gui)
-#, fuzzy
 msgid "Sort Ascending"
-msgstr "Orde _ascendente"
+msgstr "Orde ascendente"
+
+#: C/mail-sorting-message-list.page:93(p)
+#, fuzzy
+msgid "Select the <gui>Sort Ascending</gui> option."
+msgstr "gpg <placeholder-1/>"
 
 #: C/mail-sorting-message-list.page:95(p)
 #, fuzzy
@@ -3462,10 +2458,13 @@ msgstr ""
 "instante actual no que se produce o filtrado."
 
 #: C/mail-sorting-message-list.page:99(title)
-#: C/mail-sorting-message-list.page:102(gui)
-#, fuzzy
 msgid "Sort Descending"
-msgstr "Orde _descendente"
+msgstr "Orde descendente"
+
+#: C/mail-sorting-message-list.page:102(p)
+#, fuzzy
+msgid "Select the <gui>Sort Descending</gui> option."
+msgstr "gpg <placeholder-1/>"
 
 #: C/mail-sorting-message-list.page:104(p)
 #, fuzzy
@@ -3475,10 +2474,13 @@ msgstr ""
 "instante actual no que se produce o filtrado."
 
 #: C/mail-sorting-message-list.page:108(title)
-#: C/mail-sorting-message-list.page:111(gui)
-#, fuzzy
 msgid "Unsort"
-msgstr "Sen ord_enar"
+msgstr "Desordenar"
+
+#: C/mail-sorting-message-list.page:111(p)
+#, fuzzy
+msgid "Select the <gui>Unsort</gui> option."
+msgstr "gpg <placeholder-1/>"
 
 #: C/mail-sorting-message-list.page:113(p)
 msgid ""
@@ -3500,28 +2502,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 o cartafol «%s»"
-
-#: C/mail-several-pop-accounts.page:25(link)
-#, fuzzy
-msgid "creating filters"
-msgstr "Creando o cartafol «%s»"
-
-#: C/mail-several-pop-accounts.page:25(gui)
-#, fuzzy
-msgid "Message Filters..."
-msgstr "Filtros de mensaxe"
-
 #: 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."
@@ -3536,103 +2524,45 @@ msgstr ""
 msgid "SMTP sending options"
 msgstr "Opcións de recepción"
 
-#: 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 ""
 
 #: C/mail-sending-options-smtp.page:31(p)
-#: C/mail-receiving-options-usenet-news.page:29(p)
-#: C/mail-receiving-options-pop.page:33(p)
-#: C/mail-receiving-options-pop.page:35(p)
-#: C/mail-receiving-options-imap-plus.page:29(p)
-#: C/mail-receiving-options-imap.page:29(p)
+#: C/mail-receiving-options-usenet-news.page:33(p)
+#: C/mail-receiving-options-pop.page:37(p)
+#: C/mail-receiving-options-pop.page:39(p)
+#: C/mail-receiving-options-imap-plus.page:33(p)
+#: C/mail-receiving-options-imap.page:33(p)
 msgid ""
 "Free webmail providers often supply information about which of these options "
 "can be used. If you are in an organizational environment, you may want to "
 "contact your system administrator for more information."
 msgstr ""
 
-#: C/mail-sending-options-smtp.page:32(p)
+#: C/mail-sending-options-smtp.page:33(p)
 msgid ""
 "If the server requires authentication, you need to provide the following "
 "information:"
 msgstr ""
 
-#: 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 "Comprobar os tipos compatíb_eis"
-
-#: C/mail-sending-options-smtp.page:34(p)
+#: C/mail-sending-options-smtp.page:35(p)
 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."
-msgstr ""
-
-#: 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 "_Onde:"
+"<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 ""
 
 #. 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)
+#: C/mail-sending-options-smtp.page:43(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)
@@ -3644,15 +2574,11 @@ msgstr ""
 msgid "Sending and receiving mail"
 msgstr "Enviar e recibir correo"
 
-#: C/mail-send-and-receive.page:22(link)
-#, fuzzy
-msgid "Composing mail"
-msgstr "Importando a caixa 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 xref=\"index#mail-composing"
+"\">Composing mail</link> section."
 msgstr ""
 
 #: C/mail-send-and-receive-manual.page:5(desc)
@@ -3665,28 +2591,26 @@ msgstr "Enviar e recibir correo"
 msgid "Manually send and receive message"
 msgstr "Produciuse un fallo ao obter as mensaxes."
 
-#: 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-manual.page:23(p)
+msgid ""
+"If you just want to send messages which are in your Outbox, you can right-"
+"click on the Outbox and click <gui>Flush Outbox</gui>."
 msgstr ""
 
 #: C/mail-send-and-receive-automatically.page:5(desc)
@@ -3694,61 +2618,26 @@ msgid "Check automatically and regularly for new received mail."
 msgstr ""
 
 #: C/mail-send-and-receive-automatically.page:20(title)
-#, fuzzy
 msgid "Automatically check for new mail"
-msgstr "Iniciar automaticamente cando se edite un novo correo"
-
-#: 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 automaticamente se hai mensaxes _novas cada"
-
-#: 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"
+msgstr "Compmrobar automaticamente novos correos"
 
 #: 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)
-#, fuzzy
 msgid "Searching messages."
-msgstr "Enviando a mensaxe"
+msgstr "Buscar mensaxes."
 
 #: C/mail-searching.page:28(title)
-#, fuzzy
 msgid "Searching Mail"
-msgstr "Recibindo o correo"
+msgstr "Buscar correos"
 
 #: C/mail-searching.page:31(p)
 msgid ""
@@ -3771,15 +2660,11 @@ msgid ""
 "subjects and addresses and scope will be \"Current folder\"."
 msgstr ""
 
-#: C/mail-searching.page:40(link)
-msgid "Using Search Folders"
-msgstr ""
-
 #: C/mail-searching.page:40(p)
 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 ""
 
 #: C/mail-searching.page:45(title)
@@ -3801,9 +2686,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-search-folders-refresh.page:5(desc)
-#, fuzzy
 msgid "Ways of updating Search folders."
-msgstr "Actualizando os cartafoles de busca para «%s»"
+msgstr "Formas de actualizar cartafoles de busca."
 
 #: C/mail-search-folders-refresh.page:24(title)
 #, fuzzy
@@ -3817,17 +2701,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)
@@ -3837,40 +2715,25 @@ msgid ""
 msgstr ""
 
 #: C/mail-search-folders.page:22(title)
-#, fuzzy
 msgid "Using Search folders"
-msgstr "Cartafoles de busca"
-
-#: 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 "filters.xml"
+msgstr "Usar cartafoles de busca"
 
 #: 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."
-msgstr ""
-
-#: C/mail-search-folders.page:26(link)
-#, fuzzy
-msgid "folder"
-msgstr "Seleccionar un cartafol"
-
-#: C/mail-search-folders.page:26(link)
-msgid "filter"
+"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(p)
 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 ""
 
 #: C/mail-search-folders.page:28(p)
@@ -3879,23 +2742,19 @@ 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 "Sen coincidencias"
-
 #: C/mail-search-folders.page:30(p)
 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 ""
 
 #: C/mail-search-folders.page:32(p)
 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 ""
 
 #: C/mail-search-folders-conditions.page:5(desc)
@@ -3929,9 +2788,8 @@ msgstr ""
 
 #: C/mail-search-folders-conditions.page:32(p)
 #: C/mail-filters-conditions.page:32(p)
-#, fuzzy
 msgid "CC:"
-msgstr "Cc"
+msgstr "Cc:"
 
 #: C/mail-search-folders-conditions.page:33(p)
 #: C/mail-filters-conditions.page:33(p)
@@ -3953,9 +2811,8 @@ msgstr ""
 
 #: C/mail-search-folders-conditions.page:38(p)
 #: C/mail-filters-conditions.page:38(p)
-#, fuzzy
 msgid "Sender or Recipients:"
-msgstr "Remitente ou destinatarios"
+msgstr "Remitente ou destinatarios:"
 
 #: C/mail-search-folders-conditions.page:39(p)
 #: C/mail-filters-conditions.page:39(p)
@@ -3967,7 +2824,7 @@ msgstr ""
 "Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
 #: 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:"
 
@@ -3981,17 +2838,12 @@ msgstr ""
 msgid "Specific Header:"
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:45(link)
-#: C/mail-filters-conditions.page:45(link)
-#, fuzzy
-msgid "custom ones"
-msgstr "Usar tipos de letra personalizados"
-
 #: C/mail-search-folders-conditions.page:45(p)
 #: C/mail-filters-conditions.page:45(p)
-#, fuzzy
-msgid "Any header including <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+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)
@@ -4023,14 +2875,14 @@ msgstr ""
 #: C/mail-filters-conditions.page:52(p)
 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 ""
 
 #: C/mail-search-folders-conditions.page:54(p)
 #: C/mail-filters-conditions.page:54(p)
-#, fuzzy
 msgid "Date sent:"
-msgstr "Data de envío"
+msgstr "Data de envío:"
 
 #: C/mail-search-folders-conditions.page:55(p)
 #: C/mail-filters-conditions.page:55(p)
@@ -4046,9 +2898,8 @@ msgstr ""
 
 #: C/mail-search-folders-conditions.page:57(p)
 #: C/mail-filters-conditions.page:57(p)
-#, fuzzy
 msgid "Date received:"
-msgstr "Data de recepción"
+msgstr "Data de recepción:"
 
 #: C/mail-search-folders-conditions.page:58(p)
 #: C/mail-filters-conditions.page:58(p)
@@ -4062,17 +2913,12 @@ msgstr ""
 msgid "Label:"
 msgstr ""
 
-#: 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)
 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 ""
 
 #: C/mail-search-folders-conditions.page:63(p)
@@ -4092,9 +2938,8 @@ msgstr ""
 
 #: C/mail-search-folders-conditions.page:66(p)
 #: C/mail-filters-conditions.page:66(p)
-#, fuzzy
 msgid "Size (kB):"
-msgstr "Tamaño (KB)"
+msgstr "Tamaño (KB):"
 
 #: C/mail-search-folders-conditions.page:67(p)
 #: C/mail-filters-conditions.page:67(p)
@@ -4118,42 +2963,36 @@ msgstr ""
 msgid "Follow Up:"
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:73(link)
-#: C/mail-filters-conditions.page:73(link)
-#, fuzzy
-msgid "flagged for follow-up"
-msgstr "Marcar as mensaxes seleccionadas para o seguimento"
-
 #: 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 "Alterna a visualización do fuso horario"
+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 o"
+msgstr "Completado o:"
 
-#: C/mail-search-folders-conditions.page:77(p)
-#: C/mail-filters-conditions.page:77(p)
+#: C/mail-search-folders-conditions.page:78(p)
+#: C/mail-filters-conditions.page:78(p)
 msgid "Attachments:"
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:78(p)
-#: C/mail-filters-conditions.page:78(p)
+#: C/mail-search-folders-conditions.page:79(p)
+#: C/mail-filters-conditions.page:79(p)
 #, fuzzy
 msgid "Checks whether there is an attachment for the email."
 msgstr "Comprobar se o Evolution é o aplicativo de correo predeterminado"
 
-#: C/mail-search-folders-conditions.page:80(p)
-#: C/mail-filters-conditions.page:80(p)
+#: C/mail-search-folders-conditions.page:81(p)
+#: C/mail-filters-conditions.page:81(p)
 msgid "Mailing List"
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:81(p)
-#: C/mail-filters-conditions.page:81(p)
+#: C/mail-search-folders-conditions.page:82(p)
+#: C/mail-filters-conditions.page:82(p)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -4162,20 +3001,16 @@ msgid ""
 "caught by these filters."
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:83(p)
-#: C/mail-filters-conditions.page:83(p)
+#: C/mail-search-folders-conditions.page:84(p)
+#: C/mail-filters-conditions.page:84(p)
 msgid "Regex Match:"
 msgstr ""
 
-#: 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)
+#: C/mail-search-folders-conditions.page:85(p)
+#: C/mail-filters-conditions.page:85(p)
 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 "
@@ -4183,16 +3018,14 @@ msgid ""
 "regular expressions, check the man page for the grep command."
 msgstr ""
 
-#: C/mail-search-folders-conditions.page:86(p)
-#, fuzzy
+#: C/mail-search-folders-conditions.page:87(p)
 msgid "Message Location:"
-msgstr "Localización da mensaxe"
+msgstr "Localización da mensaxe:"
 
-#: C/mail-search-folders-conditions.page:88(p)
-#: C/mail-filters-conditions.page:95(p)
-#, fuzzy
+#: C/mail-search-folders-conditions.page:90(p)
+#: C/mail-filters-conditions.page:96(p)
 msgid "Match All:"
-msgstr "Coincidir todo"
+msgstr "Coincidir todo:"
 
 #: C/mail-search-folders-add.page:5(desc)
 #, fuzzy
@@ -4203,46 +3036,22 @@ msgstr "Configurando o cartafol de busca: %s"
 msgid "Creating A Search Folder"
 msgstr ""
 
-#: C/mail-search-folders-add.page:26(gui)
-msgid "Search Folders"
-msgstr "Cartafoles de busca"
-
-#: 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 "Mensaxe"
-
-#: C/mail-search-folders-add.page:26(gui) C/mail-filters.page:36(gui)
-#, fuzzy
-msgid "Create Rule"
-msgstr "Crear unha r_egra"
-
-#: C/mail-search-folders-add.page:26(gui)
-#, fuzzy
-msgid "Create Search Folder From Search..."
-msgstr "C_rear un cartafol de busca a partir da busca…"
-
 #: 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)
-#, fuzzy
-msgid "Rule name"
-msgstr "Nome da r_egra:"
+#: C/mail-search-folders-add.page:27(p) C/mail-filters.page:37(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr ""
 
 #: 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 "Escriba o seu nome completo no campo «Nome completo»."
 
 #: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
@@ -4251,35 +3060,23 @@ msgid ""
 "which part of the message will be checked and then define the comparison."
 msgstr ""
 
-#: C/mail-search-folders-add.page:29(link)
-#, fuzzy
-msgid "Available Search Folder conditions"
-msgstr "Activar cartafoles de _busca"
-
-#: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
-msgid "For more information on the available conditions see <placeholder-1/>."
+#: C/mail-search-folders-add.page:29(p)
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"search-folders-conditions\">Available Search Folder conditions</link>."
 msgstr ""
 
-#: C/mail-search-folders-add.page:30(gui) C/mail-filters.page:40(gui)
-#, fuzzy
-msgid "Find items"
-msgstr "_Buscar os 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 "Fontes do cartafol de busca"
-
 #: C/mail-search-folders-add.page:31(p)
 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 ""
 
 #: C/mail-search-folders-add.page:33(p)
@@ -4321,7 +3118,7 @@ msgstr ""
 #: C/mail-search-folders-add.page:43(p)
 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 ""
 
 #: C/mail-refresh-folders.page:5(desc)
@@ -4336,20 +3133,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)
@@ -4365,23 +3158,16 @@ msgid "Evolution supports the following headers:"
 msgstr ""
 
 #: C/mail-recognized-thread-related-headers.page:24(p)
-#, fuzzy
 msgid "References"
-msgstr "Referencia rápida"
+msgstr "Referencias"
 
 #: C/mail-recognized-thread-related-headers.page:25(p)
-#, fuzzy
 msgid "In-Reply-To"
-msgstr "Responder a"
-
-#: C/mail-recognized-thread-related-headers.page:29(gui)
-#, fuzzy
-msgid "Thread-*"
-msgstr "Seguin_te conversa"
+msgstr "En-resposta-a"
 
 #: 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 ""
 
@@ -4394,127 +3180,179 @@ msgstr ""
 msgid "Usenet news receiving options"
 msgstr "Seguinte - Opcións 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)
+#: C/mail-receiving-options-usenet-news.page:26(title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:23(title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:23(title)
+#: C/mail-receiving-options-pop.page:30(title)
+#: C/mail-receiving-options-novell-groupwise.page:27(title)
+#: C/mail-receiving-options-mh-format-directories.page:23(title)
+#: C/mail-receiving-options-maildir-format-directories.page:23(title)
+#: C/mail-receiving-options-local-delivery.page:23(title)
+#: C/mail-receiving-options-imap-plus.page:26(title)
+#: C/mail-receiving-options-imap.page:26(title)
+#: C/mail-receiving-options-exchange-mapi.page:23(title)
+#: C/mail-receiving-options-evolution-exchange.page:26(title)
+#: C/intro-first-run.page:36(title)
+msgid "Receiving Email"
+msgstr "Recepción de correo"
+
+#: C/mail-receiving-options-usenet-news.page:28(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:25(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:25(p)
+#: C/mail-receiving-options-pop.page:32(p)
+#: C/mail-receiving-options-novell-groupwise.page:29(p)
+#: C/mail-receiving-options-mh-format-directories.page:25(p)
+#: C/mail-receiving-options-maildir-format-directories.page:25(p)
+#: C/mail-receiving-options-local-delivery.page:25(p)
+#: C/mail-receiving-options-imap-plus.page:28(p)
+#: C/mail-receiving-options-imap.page:28(p)
+#: C/mail-receiving-options-exchange-mapi.page:25(p)
+#: C/mail-receiving-options-evolution-exchange.page:28(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)
-#: C/mail-receiving-options-pop.page:31(p)
-#: C/mail-receiving-options-novell-groupwise.page:28(p)
-#: C/mail-receiving-options-imap-plus.page:27(p)
-#: C/mail-receiving-options-imap.page:27(p)
-#: C/mail-receiving-options-exchange-mapi.page:25(p)
+#: C/mail-receiving-options-usenet-news.page:31(p)
+#: C/mail-receiving-options-pop.page:35(p)
+#: C/mail-receiving-options-novell-groupwise.page:32(p)
+#: C/mail-receiving-options-imap-plus.page:31(p)
+#: C/mail-receiving-options-imap.page:31(p)
+#: C/mail-receiving-options-exchange-mapi.page:28(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 ""
 
-#: C/mail-receiving-options-usenet-news.page:28(p)
-#: C/mail-receiving-options-pop.page:32(p)
-#: C/mail-receiving-options-novell-groupwise.page:29(p)
-#: C/mail-receiving-options-imap-plus.page:28(p)
-#: C/mail-receiving-options-imap.page:28(p)
-#: C/mail-receiving-options-exchange-mapi.page:29(p)
+#: C/mail-receiving-options-usenet-news.page:32(p)
+#: C/mail-receiving-options-pop.page:36(p)
+#: C/mail-receiving-options-novell-groupwise.page:33(p)
+#: C/mail-receiving-options-imap-plus.page:32(p)
+#: C/mail-receiving-options-imap.page:32(p)
+#: C/mail-receiving-options-exchange-mapi.page:32(p)
 msgid "Select if you want to use a secure connection (SSL or TLS)."
 msgstr "Seleccione se quere usar unha conexión segura (SSL ou TLS)."
 
-#: C/mail-receiving-options-usenet-news.page:28(p)
-#: C/mail-receiving-options-pop.page:32(p)
-#: C/mail-receiving-options-novell-groupwise.page:29(p)
-#: C/mail-receiving-options-imap-plus.page:28(p)
-#: C/mail-receiving-options-imap.page:28(p)
+#: C/mail-receiving-options-usenet-news.page:32(p)
+#: C/mail-receiving-options-pop.page:36(p)
+#: C/mail-receiving-options-novell-groupwise.page:33(p)
+#: C/mail-receiving-options-imap-plus.page:32(p)
+#: C/mail-receiving-options-imap.page:32(p)
 msgid "You should enable this option if your server supports it."
 msgstr ""
 
-#: C/mail-receiving-options-usenet-news.page:30(p)
-#: C/mail-receiving-options-pop.page:34(p)
-#: C/mail-receiving-options-novell-groupwise.page:31(p)
-#: C/mail-receiving-options-imap-plus.page:30(p)
-#: C/mail-receiving-options-imap.page:30(p)
-#: C/mail-receiving-options-exchange-mapi.page:28(p)
-#: C/mail-receiving-options-evolution-exchange.page:32(p)
+#: C/mail-receiving-options-usenet-news.page:34(p)
+#: C/mail-receiving-options-pop.page:38(p)
+#: C/mail-receiving-options-novell-groupwise.page:35(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:31(p)
+#: C/mail-receiving-options-evolution-exchange.page:35(p)
 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 ""
 
-#: C/mail-receiving-options-usenet-news.page:31(p)
-#: C/mail-receiving-options-pop.page:36(p)
-#: C/mail-receiving-options-novell-groupwise.page:32(p)
-#: C/mail-receiving-options-imap-plus.page:31(p)
-#: C/mail-receiving-options-imap.page:31(p)
+#: C/mail-receiving-options-usenet-news.page:35(p)
+#: C/mail-receiving-options-pop.page:40(p)
+#: C/mail-receiving-options-novell-groupwise.page:36(p)
+#: C/mail-receiving-options-imap-plus.page:35(p)
+#: C/mail-receiving-options-imap.page:35(p)
 msgid "Select if you want Evolution to remember your password."
 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)
-#: C/mail-receiving-options-novell-groupwise.page:37(p)
-#: C/mail-receiving-options-mh-format-directories.page:28(p)
-#: C/mail-receiving-options-maildir-format-directories.page:28(p)
-#: C/mail-receiving-options-local-delivery.page:29(p)
-#: C/mail-receiving-options-imap-plus.page:36(p)
-#: C/mail-receiving-options-imap.page:37(p)
-#: C/mail-receiving-options-exchange-mapi.page:35(p)
-#: C/mail-receiving-options-evolution-exchange.page:38(p)
+#: C/mail-receiving-options-usenet-news.page:41(title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:34(title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:34(title)
+#: C/mail-receiving-options-pop.page:46(title)
+#: C/mail-receiving-options-novell-groupwise.page:42(title)
+#: C/mail-receiving-options-mh-format-directories.page:34(title)
+#: C/mail-receiving-options-maildir-format-directories.page:34(title)
+#: C/mail-receiving-options-local-delivery.page:34(title)
+#: C/mail-receiving-options-imap-plus.page:41(title)
+#: C/mail-receiving-options-imap.page:41(title)
+#: C/mail-receiving-options-exchange-mapi.page:39(title)
+#: C/mail-receiving-options-evolution-exchange.page:42(title)
+msgid "Receiving Options"
+msgstr "Opcións de recepción"
+
+#: C/mail-receiving-options-usenet-news.page:43(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:36(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:36(p)
+#: C/mail-receiving-options-pop.page:48(p)
+#: C/mail-receiving-options-novell-groupwise.page:44(p)
+#: C/mail-receiving-options-mh-format-directories.page:36(p)
+#: C/mail-receiving-options-maildir-format-directories.page:36(p)
+#: C/mail-receiving-options-local-delivery.page:36(p)
+#: C/mail-receiving-options-imap-plus.page:43(p)
+#: C/mail-receiving-options-imap.page:43(p)
+#: C/mail-receiving-options-exchange-mapi.page:41(p)
+#: C/mail-receiving-options-evolution-exchange.page:44(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:46(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:39(p)
+#: C/mail-receiving-options-pop.page:51(p)
+#: C/mail-receiving-options-novell-groupwise.page:47(p)
+#: C/mail-receiving-options-mh-format-directories.page:39(p)
+#: C/mail-receiving-options-maildir-format-directories.page:39(p)
+#: C/mail-receiving-options-local-delivery.page:39(p)
+#: C/mail-receiving-options-imap-plus.page:46(p)
+#: C/mail-receiving-options-imap.page:46(p)
+#: C/mail-receiving-options-exchange-mapi.page:44(p)
+#: C/mail-receiving-options-evolution-exchange.page:47(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)
+#: C/mail-receiving-options-usenet-news.page:47(p)
 msgid "Select if you want to show folders in short notation."
 msgstr ""
 
-#: C/mail-receiving-options-usenet-news.page:38(p)
+#: C/mail-receiving-options-usenet-news.page:48(p)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr ""
 
-#: C/mail-receiving-options-usenet-news.page:39(link)
-#, fuzzy
-msgid "subscriptions window"
-msgstr "Largura da xanela «Subscricións de cartafoles»"
-
-#: C/mail-receiving-options-usenet-news.page:39(p)
+#: C/mail-receiving-options-usenet-news.page:49(p)
 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 ""
 
-#: C/mail-receiving-options-usenet-news.page:40(p)
+#: C/mail-receiving-options-usenet-news.page:50(p)
 msgid ""
 "If you select to show relative folder names, only the name of the folder is "
 "displayed. For example the folder evolution.mail would appear as evolution."
 msgstr ""
 
+#. 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:57(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:47(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:46(p)
+#: C/mail-receiving-options-pop.page:60(p)
+#: C/mail-receiving-options-novell-groupwise.page:56(p)
+#: C/mail-receiving-options-mh-format-directories.page:46(p)
+#: C/mail-receiving-options-maildir-format-directories.page:47(p)
+#: C/mail-receiving-options-local-delivery.page:46(p)
+#: C/mail-receiving-options-imap-plus.page:58(p)
+#: C/mail-receiving-options-imap.page:57(p)
+#: C/mail-receiving-options-exchange-mapi.page:52(p)
+#: C/mail-receiving-options-evolution-exchange.page:58(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)
 msgid "Receiving options for standard Unix mbox spool file accounts."
 msgstr ""
@@ -4524,54 +3362,20 @@ msgstr ""
 msgid "Standard Unix mbox spool file receiving options"
 msgstr "Cartafol 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 "_Ruta:"
-
-#: 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)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:28(p)
+#: C/mail-receiving-options-local-delivery.page:28(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."
+"Choose the file by clicking on the button next to <gui>File</gui> in the "
+"<gui>Configuration</gui> 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 "Regras de _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"
-msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
-
-#: 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)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:40(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:39(p)
+#: C/mail-receiving-options-maildir-format-directories.page:40(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)
@@ -4584,20 +3388,14 @@ msgstr "Cartafol spool mbox estándar de Unix:"
 msgid "Standard Unix mbox spool directory receiving options"
 msgstr "Cartafol spool mbox 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 "Outro…"
-
-#: 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)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(p)
+#: C/mail-receiving-options-mh-format-directories.page:28(p)
+#: C/mail-receiving-options-maildir-format-directories.page:28(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)
@@ -4606,37 +3404,22 @@ msgid "Receiving options for POP accounts."
 msgstr "Recibir os elementos novos de todas as contas"
 
 #: C/mail-receiving-options-pop.page:27(title)
-#, fuzzy
 msgid "POP receiving options"
-msgstr "Opcións de recepción"
-
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-#, fuzzy
-msgid "Leave messages on server"
-msgstr "Comprobar se hai mensaxes novas ao iniciar"
-
-#: C/mail-receiving-options-pop.page:43(gui)
-#: C/mail-receiving-options-novell-groupwise.page:39(gui)
-msgid "Delete after ... days"
-msgstr ""
+msgstr "Opcións de recepción POP"
 
-#: C/mail-receiving-options-pop.page:43(p)
-#: C/mail-receiving-options-novell-groupwise.page:39(p)
+#: C/mail-receiving-options-pop.page:52(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."
+"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(gui)
-msgid "Disable support for all POP3 extensions"
-msgstr ""
-
-#: C/mail-receiving-options-pop.page:45(p)
+#: C/mail-receiving-options-pop.page:53(p)
 msgid ""
-"The option <placeholder-1/> is only useful when accessing old or "
-"misconfigured mail servers. Such POP3 extensions provide enhanced "
+"The option <gui>Disable support for all POP3 extensions</gui> is only useful "
+"when accessing old or misconfigured mail servers. <link href=\"https://tools."
+"ietf.org/html/rfc2449\">POP3 extensions</link> provide enhanced "
 "functionality, however only some servers support them. In case of problems "
 "with receiving mail, enabling this setting might help."
 msgstr ""
@@ -4646,47 +3429,42 @@ msgid "Available mail receiving options for several server types."
 msgstr ""
 
 #: C/mail-receiving-options.page:18(title)
-#, fuzzy
 msgid "Mail Receiving Options"
-msgstr "Opcións de recepción"
+msgstr "Opcións de recepción de correo"
 
 #: C/mail-receiving-options.page:21(title) C/intro-first-run.page:42(title)
-#, fuzzy
 msgid "Common server types"
-msgstr "Tipo de servidor:"
+msgstr "Tipos de servidores comúns"
 
 #: C/mail-receiving-options.page:24(title) C/intro-first-run.page:55(title)
 msgid "Corporate server types"
 msgstr ""
 
 #: C/mail-receiving-options.page:27(title) C/intro-first-run.page:70(title)
-#, fuzzy
 msgid "Local account server types"
-msgstr "Axustes da conta de Google:"
+msgstr "Tipos de servidor de contas locais"
 
 #: C/mail-receiving-options-novell-groupwise.page:5(desc)
-#, fuzzy
 msgid "Receiving options for Novell Groupwise accounts."
-msgstr "Axuste fino das súas contas GroupWise."
+msgstr "Opcións de recepción para contas Novell Groupwise."
 
 #: C/mail-receiving-options-novell-groupwise.page:24(title)
-#, fuzzy
 msgid "Novell Groupwise receiving options"
-msgstr "Seguinte - Opcións de recepción"
+msgstr "Opcións de recepción para Novell Groupwise"
 
-#: C/mail-receiving-options-novell-groupwise.page:30(p)
-#: C/mail-receiving-options-exchange-mapi.page:27(p)
-#: C/mail-receiving-options-evolution-exchange.page:31(p)
+#: C/mail-receiving-options-novell-groupwise.page:34(p)
+#: C/mail-receiving-options-exchange-mapi.page:30(p)
+#: C/mail-receiving-options-evolution-exchange.page:34(p)
 msgid ""
 "If you are in an organizational environment, you may want to contact your "
 "system administrator for more information."
 msgstr ""
 
-#: C/mail-receiving-options-novell-groupwise.page:41(p)
+#: C/mail-receiving-options-novell-groupwise.page:48(p)
 msgid "Enter the Post Office Agent SOAP port."
 msgstr ""
 
-#: C/mail-receiving-options-novell-groupwise.page:42(p)
+#: C/mail-receiving-options-novell-groupwise.page:49(p)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -4697,75 +3475,63 @@ msgid "Receiving options for MH-format mail directories accounts."
 msgstr ""
 
 #: C/mail-receiving-options-mh-format-directories.page:20(title)
-#, fuzzy
 msgid "MH-format mail directories receiving options"
-msgstr "Cartafoles de correo en formato MH:"
+msgstr "Opcións de recepción para cartafoles de correo en formato MH"
 
 #: C/mail-receiving-options-maildir-format-directories.page:5(desc)
 msgid "Receiving options for Maildir-format mail directories accounts."
 msgstr ""
 
 #: C/mail-receiving-options-maildir-format-directories.page:20(title)
-#, fuzzy
 msgid "Maildir-format mail directories receiving options"
-msgstr "Cartafoles de correo en formato Maildir:"
+msgstr "Opcións de recepción para cartafoles de correo en formato Maildir"
 
 #: C/mail-receiving-options-local-delivery.page:5(desc)
-#, fuzzy
 msgid "Receiving options for Local delivery accounts."
-msgstr "Recibir os elementos novos de todas as contas"
+msgstr "Opcións de recepción para contas de envío locais."
 
 #: C/mail-receiving-options-local-delivery.page:20(title)
-#, fuzzy
 msgid "Local delivery receiving options"
-msgstr "Anterior - Opcións de recepción"
+msgstr ""
 
 #: C/mail-receiving-options-imap-plus.page:5(desc)
-#, fuzzy
 msgid "Receiving options for IMAP+ accounts."
-msgstr "Axuste fino das súas contas IMAP."
+msgstr "Opcións de recepción para contas IMAP+."
 
 #: C/mail-receiving-options-imap-plus.page:23(title)
-#, fuzzy
 msgid "IMAP+ receiving options"
-msgstr "Opcións de recepción"
-
-#: C/mail-receiving-options-imap-plus.page:37(link)
-msgid "IMAP4 Extensions for Quick Mailbox Resynchronization"
-msgstr ""
+msgstr "Opcións de recepción IMAP+"
 
-#: C/mail-receiving-options-imap-plus.page:37(p)
+#: C/mail-receiving-options-imap-plus.page:47(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)
-#: C/mail-receiving-options-imap.page:38(p)
+#: C/mail-receiving-options-imap-plus.page:48(p)
+#: C/mail-receiving-options-imap.page:47(p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders, or "
 "only in subscribed folders."
 msgstr ""
 
-#: C/mail-receiving-options-imap-plus.page:39(p)
-#: C/mail-receiving-options-imap.page:39(p)
+#: C/mail-receiving-options-imap-plus.page:49(p)
+#: C/mail-receiving-options-imap.page:48(p)
 msgid ""
 "Select if you want Evolution to use custom commands to connect to the IMAP "
 "server."
 msgstr ""
 
-#: C/mail-receiving-options-imap-plus.page:40(link)
-#: C/mail-receiving-options-imap.page:40(link)
-#, fuzzy
-msgid "subscribed folders"
-msgstr "Eliminando a subscrición do cartafol «%s»"
-
-#: C/mail-receiving-options-imap-plus.page:40(p)
-#: C/mail-receiving-options-imap.page:40(p)
-msgid "Select if you want Evolution to show only <placeholder-1/>."
+#: C/mail-receiving-options-imap-plus.page:50(p)
+#: C/mail-receiving-options-imap.page:49(p)
+msgid ""
+"Select if you want Evolution to show only <link xref=\"mail-imap-"
+"subscriptions\">subscribed folders</link>."
 msgstr ""
 
-#: C/mail-receiving-options-imap-plus.page:41(p)
-#: C/mail-receiving-options-imap.page:41(p)
+#: C/mail-receiving-options-imap-plus.page:51(p)
+#: C/mail-receiving-options-imap.page:50(p)
 msgid ""
 "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
@@ -4776,9 +3542,8 @@ msgid "Receiving options for IMAP accounts."
 msgstr "Axuste fino das súas contas IMAP."
 
 #: C/mail-receiving-options-imap.page:23(title)
-#, fuzzy
 msgid "IMAP receiving options"
-msgstr "Opcións de recepción"
+msgstr "Opcións de recepción IMAP"
 
 #: C/mail-receiving-options-exchange-mapi.page:5(desc)
 #, fuzzy
@@ -4790,24 +3555,18 @@ msgstr "Recibir os elementos novos de todas as contas"
 msgid "Exchange MAPI receiving options"
 msgstr "Seguinte - Opcións de recepción"
 
-#: C/mail-receiving-options-exchange-mapi.page:26(p)
+#: C/mail-receiving-options-exchange-mapi.page:29(p)
 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 "Autenticación"
-
-#: 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."
-msgstr "Introduza o seu contrasinal."
+#: C/mail-receiving-options-exchange-mapi.page:33(p)
+#: C/mail-receiving-options-evolution-exchange.page:36(p)
+msgid "Click <gui style=\"button\">Authenticate</gui> and enter your password."
+msgstr ""
+"Prema <gui style=\"button\">Autenticar</gui> e escriba o seu contrasinal."
 
-#: C/mail-receiving-options-exchange-mapi.page:37(p)
-#: C/mail-receiving-options-evolution-exchange.page:40(p)
+#: C/mail-receiving-options-exchange-mapi.page:45(p)
+#: C/mail-receiving-options-evolution-exchange.page:48(p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders."
 msgstr ""
@@ -4821,49 +3580,56 @@ msgstr ""
 msgid "Evolution Exchange receiving options"
 msgstr "Seguinte - Opcións de recepción"
 
-#: C/mail-receiving-options-evolution-exchange.page:28(p)
+#: C/mail-receiving-options-evolution-exchange.page:31(p)
 #, fuzzy
 msgid "Enter your username for that server."
 msgstr "Escriba o usuario no campo usuario."
 
-#: C/mail-receiving-options-evolution-exchange.page:29(p)
+#: C/mail-receiving-options-evolution-exchange.page:32(p)
 msgid "Enter the OWA URL for that server."
 msgstr ""
 
-#: C/mail-receiving-options-evolution-exchange.page:30(p)
+#: C/mail-receiving-options-evolution-exchange.page:33(p)
 msgid ""
 "Select if the mailbox name is different from the username. If it is, enter "
 "the mailbox name."
 msgstr ""
 
-#: C/mail-receiving-options-evolution-exchange.page:42(gui)
-msgid "Global Address List/Active Directory"
-msgstr ""
-
-#: C/mail-receiving-options-evolution-exchange.page:42(p)
+#: C/mail-receiving-options-evolution-exchange.page:49(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)
+#: C/mail-receiving-options-evolution-exchange.page:50(p)
 msgid ""
 "Select if you want to limit the number of Global Address List (GAL) "
 "responses as this may increase speed. The GAL contains a list of all email "
 "addresses."
 msgstr ""
 
-#: 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)
+#: C/mail-receiving-options-evolution-exchange.page:51(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:24(None)
+msgid ""
+"@@image: './figures/new-mail-switcher.png'; "
+"md5=be4dbdb5f6e3dcbd5111b87169cae268"
+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:29(None)
+msgid ""
+"@@image: './figures/new-mail-notification.png'; "
+"md5=25a4373da392793406910cd883f0c21c"
 msgstr ""
 
 #: C/mail-received-notification.page:5(desc)
@@ -4875,33 +3641,25 @@ msgstr ""
 msgid "Getting notified of new mail"
 msgstr "Comprobando se hai correo novo"
 
-#: C/mail-received-notification.page:22(link)
-#: C/intro-main-window.page:125(gui)
-msgid "switcher"
-msgstr ""
-
 #: 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)
-#: C/mail-received-notification.page:29(p)
+#: C/mail-received-notification.page:25(p)
+#: C/mail-received-notification.page:30(p)
 #, fuzzy
 msgid "Switcher layout when a new message has arrived"
 msgstr "Re_producir un son cando chegue correo novo"
 
-#: C/mail-received-notification.page:27(gui)
-msgid "Mail Notification"
-msgstr "Notificación de correo"
-
-#: C/mail-received-notification.page:27(p)
+#: C/mail-received-notification.page:28(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 preferred options in the <gui>Configuration</gui> tab."
 msgstr ""
 
 #: C/mail-read-receipts.page:5(desc)
@@ -4922,60 +3680,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 "Opcións"
-
-#: C/mail-read-receipts.page:37(gui)
-#, fuzzy
-msgid "Request Read Receipt"
-msgstr "_Solicitar a 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 "Predefinicións"
-
-#: C/mail-read-receipts.page:39(gui)
-msgid "Message Receipts"
-msgstr "Confirmacións de lectura das mensaxes"
-
 #: 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)
@@ -4988,38 +3705,26 @@ msgid "Using shortcut keys to read mail"
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:27(title)
-#, fuzzy
 msgid "Viewing an email"
-msgstr "Enviar un correo"
+msgstr "Ver un correo electrónico"
 
 #: C/mail-reading-keyboard-shortcuts.page:28(p)
 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 ""
 
 #: C/mail-reading-keyboard-shortcuts.page:32(title)
-#, fuzzy
 msgid "Navigating in a message"
-msgstr "Formatando a mensaxe"
-
-#: 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 "_Copia de seguranza"
+msgstr "Navegar por unha mensaxe"
 
 #: C/mail-reading-keyboard-shortcuts.page:33(p)
 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 ""
 
 #: C/mail-reading-keyboard-shortcuts.page:37(title)
@@ -5035,39 +3740,15 @@ msgstr ""
 msgid "Navigating in a folder's unread mail in the message list"
 msgstr ""
 
-#: 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)
 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 ""
 
 #: C/mail-reading-keyboard-shortcuts.page:47(title)
@@ -5077,7 +3758,7 @@ msgstr ""
 #: C/mail-reading-keyboard-shortcuts.page:49(p)
 msgid ""
 "You can easily read the unread messages in all the mail folders by using the "
-"<placeholder-1/>."
+"<key>Spacebar</key>."
 msgstr ""
 
 #: C/mail-reading-keyboard-shortcuts.page:51(p)
@@ -5091,15 +3772,10 @@ msgid ""
 "unread message."
 msgstr ""
 
-#: C/mail-reading-keyboard-shortcuts.page:54(key)
-#, fuzzy
-msgid "Page Down"
-msgstr "Páxina %d"
-
 #: C/mail-reading-keyboard-shortcuts.page:54(p)
 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 ""
 
 #: C/mail-reading-keyboard-shortcuts.page:55(p)
@@ -5126,29 +3802,26 @@ msgid "On folders, sorting, searching, filters, search folders, and labels."
 msgstr ""
 
 #: C/mail-organizing.page:21(title)
-#, fuzzy
 msgid "Sorting and organizing mail"
-msgstr "Enviar e recibir correo"
+msgstr "Ordenar e organizar correo electrónico"
 
-#: C/mail-organizing.page:24(title)
-#, fuzzy
-msgid "Advanced Options"
-msgstr "Opcións de envío avanzadas"
-
-#: C/mail-organizing.page:27(p)
+#: C/mail-organizing.page:23(p)
 msgid ""
 "Evolution provides several options to organize your mail according to your "
 "needs."
 msgstr ""
 
+#: C/mail-organizing.page:26(title)
+msgid "Advanced Options"
+msgstr "Opcións avanzadas"
+
 #: C/mail-not-sent.page:5(desc)
 msgid "Possible reasons why emails are not sent."
 msgstr ""
 
 #: C/mail-not-sent.page:20(title)
-#, fuzzy
 msgid "Mail is not sent"
-msgstr "non está estabelecido"
+msgstr "O correo non se envía"
 
 #: C/mail-not-sent.page:22(p)
 msgid "There can be several reasons why emails are not sent:"
@@ -5168,22 +3841,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 "_Traballar 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)
@@ -5202,15 +3866,11 @@ msgid ""
 "deletion."
 msgstr ""
 
-#: C/mail-moving-emails.page:28(link)
-#, fuzzy
-msgid "deleting emails"
-msgstr "Recepción 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)
@@ -5228,52 +3888,35 @@ msgid "Use labels to categorize your mail while keeping it in their folders."
 msgstr ""
 
 #: C/mail-labels.page:21(title)
-#, fuzzy
 msgid "Using Labels"
-msgstr "Etiquetas"
+msgstr "Usar 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 "Cartafoles de busca"
-
 #: 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 ""
 
 #: C/mail-labels.page:28(title)
 msgid "Adding a label to a message"
 msgstr ""
 
-#: 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 _nova"
-
 #: 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)
@@ -5282,30 +3925,31 @@ msgstr ""
 
 #: 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)
-#, fuzzy
 msgid "IMAP folder subscriptions."
-msgstr "Subscricións de cartafoles"
+msgstr "Subscricións a cartafoles IMAP "
 
 #: C/mail-imap-subscriptions.page:26(title)
-#, fuzzy
 msgid "IMAP Subscriptions"
-msgstr "Xestionar as _subscricións"
-
-#: C/mail-imap-subscriptions.page:28(gui)
-msgid "IMAP Subscriptions Manager"
-msgstr ""
+msgstr "Subscricións 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:30(p)
+msgid ""
+"Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-"
+"click on the top level node of an email account in the folder list and click "
+"<gui>Manage subscriptions</gui>."
 msgstr ""
 
 #: C/mail-imap-subscriptions.page:32(p)
@@ -5332,44 +3976,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 "Cabeceiras 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 contas"
-
-#: 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)
@@ -5390,9 +4006,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-imap-headers.page:32(p)
-#, fuzzy
 msgid "Basic Headers (Fastest):"
-msgstr "Táboa de cabeceiras de correo"
+msgstr "Cabeceiras básicas (máis rápido):"
 
 #: C/mail-imap-headers.page:32(p)
 msgid ""
@@ -5417,18 +4032,13 @@ msgid ""
 "on with which you can create mailing list filters."
 msgstr ""
 
-#: C/mail-imap-headers.page:33(gui)
-#, fuzzy
-msgid "Basic Headers"
-msgstr "Cabeceiras"
-
 #: C/mail-imap-headers.page:33(p)
 msgid ""
 "This is the default Header preference that comes with Evolution. When this "
 "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 ""
 
 #: C/mail-imap-headers.page:36(p)
@@ -5440,29 +4050,27 @@ msgstr ""
 #: 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 ""
 
-#: 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 ""
+
+#: 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 "Cabeceiras 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)
@@ -5494,35 +4102,15 @@ msgstr ""
 msgid "Right-click one of the messages."
 msgstr ""
 
-#: C/mail-follow-up-flag.page:29(gui)
-#, fuzzy
-msgid "Mark for Follow Up..."
-msgstr "Marcar para _seguimento…"
-
 #: 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 correo l_ixo"
-
-#: C/mail-follow-up-flag.page:31(gui)
-#, fuzzy
-msgid "Follow Up..."
-msgstr "Seguimento…"
-
-#: C/mail-follow-up-flag.page:31(key)
-msgid "G"
-msgstr "G"
+msgid "Click <gui>Mark for Follow Up...</gui>."
+msgstr "Prema <gui>Marcar para seguimento…</gui>."
 
 #: 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)
@@ -5535,21 +4123,11 @@ msgid ""
 "Call, Forward and Reply."
 msgstr ""
 
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Flag Completed"
-msgstr "_Marcar como completado"
-
-#: C/mail-follow-up-flag.page:37(gui)
-#, fuzzy
-msgid "Clear Flag"
-msgstr "E_liminar a marca"
-
 #: C/mail-follow-up-flag.page:37(p)
 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 ""
 
 #: C/mail-follow-up-flag.page:39(p)
@@ -5559,49 +4137,31 @@ msgid ""
 "Call by April 07, 2012, 5:00 PM.\""
 msgstr ""
 
-#: C/mail-follow-up-flag.page:41(link)
-#, fuzzy
-msgid "add a Flag Status column"
-msgstr "Estado das marcas"
-
-#: C/mail-follow-up-flag.page:41(link)
-msgid "search folder"
-msgstr ""
-
 #: C/mail-follow-up-flag.page:41(p)
 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 ""
 
-#: C/mail-follow-up-flag.page:43(gui)
-#, fuzzy
-msgid "Mark as Important"
-msgstr "Marcar como _importante"
-
-#: C/mail-follow-up-flag.page:43(gui)
-msgid "Important"
-msgstr "Importante"
-
 #: C/mail-follow-up-flag.page:43(p)
 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 ""
 
 #: C/mail-folders.page:5(desc)
 msgid "Use folders to organize your mail."
 msgstr ""
 
-#: C/mail-folders.page:28(title) C/intro-main-window.page:66(link)
-#, fuzzy
+#: C/mail-folders.page:28(title)
 msgid "Using Folders"
-msgstr "Migrando cartafoles"
+msgstr "Usar cartafoles"
 
 #: C/mail-folders.page:30(p)
 msgid ""
@@ -5611,24 +4171,18 @@ msgid ""
 msgstr ""
 
 #: C/mail-folders.page:33(title)
-#, fuzzy
 msgid "Creating A Folder"
 msgstr "Crear un cartafol"
 
 #: C/mail-folders.page:34(p)
-#, fuzzy
 msgid "To create a folder:"
-msgstr "Crear un cartafol"
-
-#: C/mail-folders.page:36(gui)
-#, fuzzy
-msgid "New Folder"
-msgstr "Cartafol _novo…"
+msgstr "Crear un cartafol:"
 
 #: 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)
@@ -5636,10 +4190,9 @@ msgstr ""
 msgid "Specify the name and the location of the folder."
 msgstr "Indicar onde crear o cartafol:"
 
-#: C/mail-folders.page:38(gui)
-#, fuzzy
-msgid "Create"
-msgstr "Creado"
+#: C/mail-folders.page:38(p)
+msgid "Click on the <gui>Create</gui> button."
+msgstr ""
 
 #: C/mail-folders.page:40(p)
 msgid ""
@@ -5647,60 +4200,56 @@ msgid ""
 "into the folder."
 msgstr ""
 
-#: C/mail-folders.page:44(title)
+#: C/mail-folders.page:43(p)
+msgid ""
+"The Inbox folders on most IMAP servers cannot contain both messages and "
+"subfolders. When creating additional folders on your IMAP mail server, "
+"branch the folders from the root of the IMAP account and not from the Inbox. "
+"Creating subfolders in your Inbox may prevent you from reading messages that "
+"exist in the Inbox. If this happens, move the folders to the IMAP account."
+msgstr ""
+
+#: C/mail-folders.page:49(title)
 #, fuzzy
 msgid "Moving Messages to New Folders"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: C/mail-folders.page:45(p)
+#: C/mail-folders.page:50(p)
 msgid ""
 "You can move messages into folders by using one of the following methods:"
 msgstr ""
 
-#: C/mail-folders.page:47(p)
+#: C/mail-folders.page:52(p)
 #, fuzzy
 msgid "Drag and drop the messages into the folder."
 msgstr "Non hai mensaxes neste cartafol."
 
-#: C/mail-folders.page:48(gui) C/mail-folders.page:50(gui)
-msgid "Move to Folder"
-msgstr "Mover ao cartafol"
-
-#: C/mail-folders.page:48(p)
-msgid "Right-click on the message and select the <placeholder-1/> option."
-msgstr ""
-
-#: C/mail-folders.page:49(key)
-msgid "V"
-msgstr "V"
+#: C/mail-folders.page:53(p)
+#, fuzzy
+msgid ""
+"Right-click on the message and select the <gui>Move to Folder</gui> option."
+msgstr "Altura do panel da lista de mensaxes."
 
-#: C/mail-folders.page:49(p)
+#: C/mail-folders.page:54(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)
+#: C/mail-folders.page:55(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)
+#: C/mail-folders.page:58(p)
 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/>."
-msgstr ""
-
 #: C/mail-folders.page:60(p)
 msgid ""
-"The Inbox folders on most IMAP servers cannot contain both messages and "
-"subfolders. When creating additional folders on your IMAP mail server, "
-"branch the folders from the root of the IMAP account and not from the Inbox. "
-"Creating subfolders in your Inbox may prevent you from reading messages that "
-"exist in the Inbox. If this happens, move the folders to the IMAP account."
+"Moving files can be done automatically by setting up <link xref=\"mail-"
+"filters\">filters</link>."
 msgstr ""
 
 #: C/mail-filters.page:5(desc)
@@ -5708,9 +4257,8 @@ msgid "Use filter rules to sort your mail automatically into folders."
 msgstr ""
 
 #: C/mail-filters.page:23(title)
-#, fuzzy
 msgid "Using Filters"
-msgstr "Filtros de mensaxe"
+msgstr "Usar filtros"
 
 #: C/mail-filters.page:25(p)
 msgid ""
@@ -5718,49 +4266,29 @@ 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 ""
-
 #: 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 ""
 
-#: C/mail-filters.page:29(gui)
-#, fuzzy
-msgid "Apply Filters"
-msgstr "_Aplicar os filtros"
-
-#: C/mail-filters.page:29(key) C/calendar-layout-views.page:27(key)
-msgid "Y"
-msgstr "Y"
-
 #: C/mail-filters.page:29(p)
 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"
-
 #: C/mail-filters.page:30(p) C/exporting-data-mail.page:25(p)
 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 ""
 
 #: C/mail-filters.page:33(title)
@@ -5768,127 +4296,113 @@ msgstr ""
 msgid "Creating a Filter"
 msgstr "Creando o cartafol «%s»"
 
-#: 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 mensaxe"
-
 #: 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)
-#, fuzzy
-msgid "Available Filter conditions"
-msgstr "Campos dispoñíbeis"
-
-#: C/mail-filters.page:41(gui)
-msgid "Then"
-msgstr "Entón"
+#: C/mail-filters.page:39(p)
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"filters-conditions\">Available Filter conditions</link>."
+msgstr ""
 
-#: C/mail-filters.page:41(p)
-msgid "Select the Actions for the Filter in the <placeholder-1/> section."
+#: C/mail-filters.page:42(p)
+msgid "Select the Actions for the Filter in the <gui>Then</gui> section."
 msgstr ""
 
-#: C/mail-filters.page:41(link)
-#, fuzzy
-msgid "Available Filter actions"
-msgstr "Campos dispoñíbeis"
+#: C/mail-filters.page:42(p)
+msgid ""
+"For more information on the available actions see <link xref=\"mail-filters-"
+"actions\">Available Filter actions</link>."
+msgstr ""
 
-#: C/mail-filters.page:41(p)
-msgid "For more information on the available actions see <placeholder-1/>."
+#: C/mail-filters.page:44(p) C/mail-filters-not-working.page:29(p)
+msgid ""
+"Note that the order of filters is very important. They are applied to the "
+"original message in sequence, like a recipe."
 msgstr ""
 
-#: C/mail-filters.page:42(gui)
-#, fuzzy
-msgid "Add Action"
-msgstr "Engadir unha a_cción"
+#: C/mail-filters.page:45(p) C/mail-filters-not-working.page:30(p)
+msgid ""
+"If your first filter has a <gui>Stop Processing</gui> rule, then all the "
+"email messages that match this filter will ignore all the succeeding filters."
+msgstr ""
 
-#: 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 "Deter o procesamento"
+#: C/mail-filters.page:46(p) C/mail-filters-not-working.page:31(p)
+msgid ""
+"When you move a message to another folder, \"moving\" actually means "
+"appending a copy of the message to the destination folder and marking the "
+"original message for deletion. So any subsequent filter rules will be "
+"applied to the original message that is now marked for deletion. Therefore "
+"moving a message should usually appear last in a sequence of filter rules."
+msgstr ""
 
-#: C/mail-filters.page:42(p)
+#: C/mail-filters.page:49(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)
+#: C/mail-filters.page:56(title)
 msgid "Editing Filters"
 msgstr ""
 
-#: C/mail-filters.page:52(p) C/mail-filters.page:62(p)
+#: C/mail-filters.page:58(p) C/mail-filters.page:68(p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+msgstr ""
+
+#: C/mail-filters.page:59(p) C/mail-filters.page:69(p)
 #, fuzzy
 msgid "Select the filter."
 msgstr "Seleccionar un ficheiro"
 
-#: C/mail-filters.page:54(p)
-msgid "Make the desired corrections, then click <placeholder-1/> twice."
+#: C/mail-filters.page:60(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 ""
+
+#: C/mail-filters.page:61(p)
+msgid ""
+"Make the desired corrections, then click <gui style=\"button\">OK</gui> "
+"twice."
 msgstr ""
 
-#: C/mail-filters.page:59(title)
+#: C/mail-filters.page:66(title)
 msgid "Deleting Filters"
 msgstr ""
 
+#: C/mail-filters.page:70(p)
+msgid "Click <gui style=\"button\">Remove</gui>."
+msgstr ""
+
 #: C/mail-filters-not-working.page:5(desc)
 msgid ""
 "Fix problems with mail filters that do not sort and organize mail as "
 "expected."
 msgstr ""
 
-#: C/mail-filters-not-working.page:21(title)
+#: C/mail-filters-not-working.page:25(title)
 msgid "Mail filters are not working"
 msgstr ""
 
-#: C/mail-filters-not-working.page:22(p)
+#: C/mail-filters-not-working.page:26(p)
 msgid ""
 "Your mail filters are probably working, however, they could be ordered in an "
 "inefficient way. This will make your filters run slowly, so it may seem like "
 "they are not working."
 msgstr ""
 
-#: C/mail-filters-not-working.page:24(p)
+#: C/mail-filters-not-working.page:32(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."
-msgstr ""
-
-#: C/mail-filters-not-working.page:26(p)
-msgid "To check if a filter has a <placeholder-1/> 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>."
-msgstr ""
-
-#: C/mail-filters-not-working.page:30(p)
-msgid ""
-"Select the filter and refer to the list of actions for that particular "
-"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 "_Accións"
-
-#: 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."
+"To check the rules and their order of an existing filter, review its actions "
+"in the <gui>Then</gui> section by <link xref=\"mail-filters#editing"
+"\">editing the filter</link>."
 msgstr ""
 
 #: C/mail-filters-not-working.page:35(p)
@@ -5901,51 +4415,59 @@ 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:86(p)
+#: C/mail-filters-conditions.page:23(title)
+#, fuzzy
+msgid "Available Filter conditions"
+msgstr "Campos dispoñíbeis"
+
+#: C/mail-filters-conditions.page:87(p)
 msgid "Source Account:"
 msgstr ""
 
-#: C/mail-filters-conditions.page:87(p)
+#: C/mail-filters-conditions.page:88(p)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
 msgstr ""
 
-#: C/mail-filters-conditions.page:89(p) C/mail-filters-actions.page:65(p)
+#: C/mail-filters-conditions.page:90(p) C/mail-filters-actions.page:65(p)
 msgid "Pipe to Program:"
 msgstr ""
 
-#: C/mail-filters-conditions.page:90(p)
+#: C/mail-filters-conditions.page:91(p)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
 "This is most commonly used to add an external junk mail filter."
 msgstr ""
 
-#: C/mail-filters-conditions.page:92(p)
+#: C/mail-filters-conditions.page:93(p)
 msgid "Junk Test:"
 msgstr ""
 
-#: C/mail-filters-conditions.page:93(link)
-msgid "junk mail"
-msgstr ""
-
-#: C/mail-filters-conditions.page:93(p)
-msgid "Filters based on the results of the <placeholder-1/> test."
+#: C/mail-filters-conditions.page:94(p)
+msgid ""
+"Filters based on the results of the <link xref=\"mail-spam\">junk mail</"
+"link> test."
 msgstr ""
 
 #: C/mail-filters-actions.page:5(desc)
 msgid "Available actions for setting up filtering."
 msgstr ""
 
+#: C/mail-filters-actions.page:23(title)
+#, fuzzy
+msgid "Available Filter actions"
+msgstr "Campos dispoñíbeis"
+
 #: C/mail-filters-actions.page:26(p)
 msgid "Move to Folder:"
 msgstr ""
@@ -5983,14 +4505,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-filters-actions.page:38(p)
-#, fuzzy
 msgid "Set Label:"
-msgstr "Estabelecer a etiqueta"
+msgstr "Estabelecer etiqueta:"
 
 #: C/mail-filters-actions.page:39(p)
-#, fuzzy
 msgid "Adds a label to a message."
-msgstr "Non foi posíbel obter a mensaxe."
+msgstr "Engádelle unha etiqueta a un mensaxe."
 
 #: C/mail-filters-actions.page:41(p)
 msgid "Assign Color:"
@@ -6069,14 +4589,12 @@ msgid ""
 msgstr ""
 
 #: C/mail-filters-actions.page:68(p)
-#, fuzzy
 msgid "Forward to:"
-msgstr "Reencamiñar a"
+msgstr "Reencamiñar a:"
 
 #: C/mail-filters-actions.page:69(p)
-#, fuzzy
 msgid "Forwards the message to another email address."
-msgstr "Enviar unha mensaxe de resposta a este enderezo"
+msgstr "Reenvía unha mensaxe a outro enderezo de correo."
 
 #: C/mail-error-no-provider-available.page:5(desc)
 #: C/mail-error-folder-mismatch.page:5(desc)
@@ -6096,22 +4614,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)
@@ -6129,8 +4642,12 @@ msgid ""
 "each Copy/Move filter. To do this:"
 msgstr ""
 
+#: C/mail-error-no-provider-available.page:37(p)
+msgid "Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+msgstr ""
+
 #: C/mail-error-no-provider-available.page:38(p)
-msgid "Select the Copy/Move filter and click <placeholder-1/>."
+msgid "Select the Copy/Move filter and click <gui>Edit</gui>."
 msgstr ""
 
 #: C/mail-error-no-provider-available.page:39(p)
@@ -6140,15 +4657,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)
@@ -6156,46 +4669,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)
 msgid ""
-"If the error message: <placeholder-1/> pops up, perform the following steps:"
+"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(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/"
-
 #: 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/>)."
-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"
+"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(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)
@@ -6210,22 +4702,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 "Localización"
-
 #: 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)
@@ -6241,18 +4724,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 "Comprobar automaticamente se hai mensaxes _novas cada"
-
 #: 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 "
@@ -6260,8 +4739,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)
@@ -6270,31 +4758,15 @@ msgstr ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:23(title)
 #: C/mail-encryption-gpg-signing-encrypting.page:23(title)
-#, fuzzy
 msgid "Signing or encrypting messages"
-msgstr "Enviando a mensaxe"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(link)
-#, fuzzy
-msgid "added your certificate"
-msgstr "Produciuse un fallo ao importar o certificado"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Sign"
-msgstr "Asi_nar con S/MIME"
-
-#: C/mail-encryption-s-mime-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "S/MIME Encrypt"
-msgstr "_Cifrar con S/MIME"
+msgstr "Asinar e cifrar mensaxes"
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:25(p)
-#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
 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 ""
 
 #: C/mail-encryption-s-mime-signing-encrypting.page:26(p)
@@ -6307,48 +4779,18 @@ msgstr ""
 msgid "Select the mail account to encrypt the messages in."
 msgstr ""
 
-#: 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 "Seguranza"
-
-#: 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 si_natura:"
-
-#: 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)
+#: C/mail-encryption-gpg-set-up.page:31(p)
+msgid "Click the <gui>Security</gui> tab."
+msgstr "Prema na lapela <gui>Seguranza</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 ""
 
@@ -6368,9 +4810,8 @@ msgid "Adding, editing, viewing and deleting S/MIME certificates."
 msgstr ""
 
 #: C/mail-encryption-s-mime-manage.page:23(title)
-#, fuzzy
 msgid "Managing S/MIME certificates"
-msgstr "Certificado de si_natura:"
+msgstr "Xestionar certificados S/MIME"
 
 #: C/mail-encryption-s-mime-manage.page:25(p)
 msgid ""
@@ -6379,111 +4820,81 @@ msgid ""
 "settings only apply to S/MIME encryption."
 msgstr ""
 
-#: 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 "Os seus 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)
-#, fuzzy
-msgid "Import"
-msgstr "I_mportar"
-
-#: 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)
 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 ""
 
-#: C/mail-encryption-s-mime-manage.page:29(gui)
-msgid "Authorities"
-msgstr "Autoridades"
-
 #: C/mail-encryption-s-mime-manage.page:29(p)
 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 ""
 
 #: C/mail-encryption.page:5(desc)
-#, fuzzy
 msgid "Sending and receiving encrypted mail."
-msgstr "Enviar e recibir correo"
+msgstr "Enviar e recibir correo cifrado."
 
-#: C/mail-encryption.page:33(title)
-#, fuzzy
+#: C/mail-encryption.page:34(title)
 msgid "Mail encryption and certificates"
-msgstr "Certificado de ci_frado:"
+msgstr "Certificado de mensaxes e certificados"
 
-#: C/mail-encryption.page:35(p)
+#: C/mail-encryption.page:36(p)
 msgid ""
 "Evolution offers GPG Encryption and S/MIME Encryption for signing and "
 "encrypting email messages. S/MIME is used most often in corporate "
 "environments."
 msgstr ""
 
-#: C/mail-encryption.page:38(title)
+#: C/mail-encryption.page:39(title)
 msgid "GPG"
 msgstr ""
 
-#: C/mail-encryption.page:42(title)
-#, fuzzy
+#: C/mail-encryption.page:43(title)
 msgid "S/MIME"
-msgstr "Asi_nar con S/MIME"
+msgstr "S/MIME"
 
 #: C/mail-encryption-gpg-signing-encrypting.page:5(desc)
 #: C/mail-encryption-gpg-create-key.page:5(desc)
 msgid "Signing or encrypting messages via GPG that you send."
 msgstr ""
 
-#: C/mail-encryption-gpg-signing-encrypting.page:25(link)
-msgid "set up your GPG key"
+#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
+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 ""
 
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "PGP Sign"
-msgstr "A_sinar con PGP"
-
-#: C/mail-encryption-gpg-signing-encrypting.page:25(gui)
-#, fuzzy
-msgid "PGP Encrypt"
-msgstr "C_ifrar con PGP"
-
-#: 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 "Asinar sem_pre as mensaxes saíntes cando se use esta conta"
 
+#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
+#: C/mail-encryption-gpg-set-up.page:36(p)
+msgid "Click <gui style=\"button\">Close</gui>."
+msgstr ""
+
 #: C/mail-encryption-gpg-set-up.page:5(desc)
 msgid ""
 "Setting up GPG for your mail account to sign and/or encrypt and decrypt "
@@ -6494,30 +4905,20 @@ msgstr ""
 msgid "Setting up GPG for your mail account"
 msgstr ""
 
-#: 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 "Data de creación:"
-
 #: 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)
 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 ""
 
-#: C/mail-encryption-gpg-set-up.page:32(gui)
-#, fuzzy
-msgid "PGP/GPG Key ID"
-msgstr "ID da _chave PGP/GPG:"
-
 #: C/mail-encryption-gpg-set-up.page:32(p)
-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 ""
 
 #: C/mail-encryption-gpg-set-up.page:33(p)
@@ -6527,17 +4928,11 @@ msgid ""
 "using this account, and other options."
 msgstr "Asinar sem_pre as mensaxes saíntes cando se use esta conta"
 
-#: 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)
+#: C/mail-encryption-gpg-set-up.page:38(p)
 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 ""
 
 #: C/mail-encryption-gpg-getting-keys.page:5(desc)
@@ -6556,30 +4951,18 @@ msgid ""
 "need to get the public key and add it to your keyring."
 msgstr ""
 
-#: 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)
 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."
-msgstr ""
-
-#: C/mail-encryption-gpg-getting-keys.page:30(code)
-msgid "gpg --import"
+"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 ""
 
 #: C/mail-encryption-gpg-getting-keys.page:30(p)
 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 ""
 
 #: C/mail-encryption-gpg-decrypting.page:5(desc)
@@ -6617,18 +5000,19 @@ msgstr ""
 msgid "Checking the signature of a received message"
 msgstr ""
 
-#: C/mail-encryption-gpg-decrypting.page:34(gui)
-msgid "Security Information"
-msgstr "Información de seguranza"
-
 #: 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 ""
 
-#: C/mail-encryption-gpg-create-key.page:25(note)
+#: C/mail-encryption-gpg-create-key.page:23(title)
+#, fuzzy
+msgid "Creating a GPG key"
+msgstr "Data de creación:"
+
+#: C/mail-encryption-gpg-create-key.page:25(p)
 msgid ""
 "These steps are very technical. For average users we nowadays recommend "
 "using the Seahorse application for managing GPG keys."
@@ -6641,12 +5025,8 @@ 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)
-msgid "Open a terminal window and enter <placeholder-1/>."
+msgid "Open a terminal window and enter <code>gpg --gen-key</code>."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:31(p)
@@ -6685,67 +5065,47 @@ msgstr ""
 msgid "Move your mouse randomly to generate the keys."
 msgstr ""
 
-#: C/mail-encryption-gpg-create-key.page:42(code)
+#: C/mail-encryption-gpg-create-key.page:42(p)
+#, fuzzy
+#| 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]"
 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]"
+"After the keys are generated, you can view your key information by entering "
+"<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 ""
 "/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)
-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"
-
 #: C/mail-encryption-gpg-create-key.page:43(p)
 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 ""
 
 #: C/mail-encryption-gpg-create-key.page:44(p)
 msgid "If you want, you can upload your keys to a key server:"
 msgstr ""
 
-#: 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)
 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 ""
 
-#: 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)
 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 "
+"32j38dk2</code>. Substitute your key ID for <code>32j38dk2</code>. You need "
+"your password to do this."
 msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:50(p)
@@ -6778,15 +5138,13 @@ msgstr ""
 msgid "Removing duplicate emails"
 msgstr "Desexa eliminar as mensaxes duplicadas?"
 
-#: C/mail-duplicates.page:28(gui)
-#, fuzzy
-msgid "Remove Duplicate Messages"
-msgstr "Eliminar as mensaxes du_plicadas"
-
 #: 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, select multiple messages (or 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>) and "
+"click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></"
+"guiseq>."
 msgstr ""
 
 #: C/mail-duplicates.page:33(title)
@@ -6806,13 +5164,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 "O cartafol seleccionado non é escribíbel."
 
 #: C/mail-displaying-sender-photograph.page:5(desc)
@@ -6833,32 +5189,19 @@ msgid ""
 "photograph."
 msgstr ""
 
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#: C/mail-change-time-format.page:20(gui)
-msgid "Headers"
-msgstr "Cabeceiras"
-
-#: C/mail-displaying-sender-photograph.page:29(gui)
-#, fuzzy
-msgid "Show the photograph of sender in the message preview"
-msgstr "_Mostrar a fotografía do remitente na previsualización das mensaxes"
-
 #: C/mail-displaying-sender-photograph.page:29(p)
 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 "B_uscar a fotografía do remitente só nas axendas de enderezos locais"
-
 #: 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)
@@ -6874,40 +5217,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"
+msgid "This will likely be fixed in version 3.4."
 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)
@@ -6915,9 +5248,8 @@ msgid "Rendering an email and handling its attachments."
 msgstr ""
 
 #: C/mail-displaying-message.page:20(title)
-#, fuzzy
 msgid "Display of a message"
-msgstr "Mostrar a seguinte mensaxe"
+msgstr ""
 
 #: C/mail-displaying-images-in-html.page:5(desc)
 msgid "On embedded pictures in received HTML messages."
@@ -6936,9 +5268,8 @@ msgid ""
 msgstr ""
 
 #: C/mail-displaying-images-in-html.page:33(title)
-#, fuzzy
 msgid "Loading images"
-msgstr "Cargando as imaxes"
+msgstr "Cargar imaxes"
 
 #: C/mail-displaying-images-in-html.page:34(p)
 msgid ""
@@ -6949,89 +5280,60 @@ msgid ""
 "email. Not automatically loading images helps protect your privacy."
 msgstr ""
 
-#: C/mail-displaying-images-in-html.page:36(gui)
-#, fuzzy
-msgid "Load Images"
-msgstr "_Cargar as imaxes"
-
-#: 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 "Mensaxes HTML"
-
-#: C/mail-displaying-images-in-html.page:38(gui)
-#: C/mail-displaying-images-in-html.page:44(gui)
-msgid "Loading Images"
-msgstr "Cargando as imaxes"
-
 #: 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 "Ca_rgar as imaxes só nas mensaxes dos 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 "Completado automático"
-
-#: 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 "Mo_strar sempre o enderezo do contacto completado automaticamente"
-
 #: 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)
-#, fuzzy
 msgid "Saving images"
-msgstr "Cargando as imaxes"
+msgstr "Gardar imaxes"
 
 #: C/mail-displaying-images-in-html.page:51(p)
 msgid ""
-"You currently cannot save images to disk that are embedded in HTML emails."
+"To save an image that is embedded in an HTML email, right-click on the image "
+"and click <gui>Save Image...</gui>."
+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)
+msgid ""
+"@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+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:29(None)
+msgid ""
+"@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
 msgstr ""
 
 #: C/mail-displaying-collapsible-headers.page:5(desc)
@@ -7049,40 +5351,18 @@ msgid ""
 "only five addresses in the message preview."
 msgstr ""
 
-#: 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 ""
 
@@ -7090,8 +5370,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
@@ -7099,35 +5380,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 "Xeral"
-
-#: C/mail-displaying-character-encodings.page:25(gui)
-msgid "Message Display"
-msgstr "Visualización das mensaxes"
-
-#: 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)
@@ -7140,64 +5403,43 @@ msgid "Deleting and undeleting messages"
 msgstr "Mensaxe de reunión incorrecta"
 
 #: C/mail-delete-and-undelete.page:28(title)
-#, fuzzy
 msgid "Deleting Messages"
-msgstr "E_liminar a mensaxe"
+msgstr "Eliminar mensaxes"
 
 #: C/mail-delete-and-undelete.page:30(p)
 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 ""
 
-#: C/mail-delete-and-undelete.page:32(gui)
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Show Deleted Messages"
-msgstr "Mostrar as mensaxes _eliminadas"
-
 #: C/mail-delete-and-undelete.page:32(p)
 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 ""
 
-#: C/mail-delete-and-undelete.page:34(gui) C/deleting-emails.page:31(gui)
-#, fuzzy
-msgid "Expunge"
-msgstr "_Expurgar"
-
-#: 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)
 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 ""
 
 #: C/mail-delete-and-undelete.page:38(title)
 msgid "Undeleting Messages"
 msgstr ""
 
-#: C/mail-delete-and-undelete.page:40(gui)
-#, fuzzy
-msgid "Undelete message"
-msgstr "_Recuperar a mensaxe"
-
 #: C/mail-delete-and-undelete.page:40(p)
 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 ""
 
 #: C/mail-delete-and-undelete.page:42(p)
@@ -7210,20 +5452,20 @@ msgstr ""
 msgid "Changing the location of the Draft folder and Sent folder."
 msgstr ""
 
-#: C/mail-default-folder-locations.page:31(title)
+#: C/mail-default-folder-locations.page:32(title)
 #, fuzzy
 msgid "Mail folder locations"
 msgstr "Localización da caixa de correo"
 
-#: C/mail-default-folder-locations.page:33(p)
+#: C/mail-default-folder-locations.page:34(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)
+#: C/mail-default-folder-locations.page:35(p)
 msgid ""
 "For remote account types (accounts such as IMAP) you can also set a Trash "
 "folder and Junk folder on the mail server so Evolution's local virtual "
@@ -7234,17 +5476,17 @@ msgstr ""
 msgid "Make somebody always receive copies of your sent mail."
 msgstr ""
 
-#: C/mail-default-CC-and-BCC.page:27(title)
+#: C/mail-default-CC-and-BCC.page:32(title)
 msgid "Default CC and BCC"
 msgstr ""
 
-#: C/mail-default-CC-and-BCC.page:29(p)
+#: C/mail-default-CC-and-BCC.page:34(p)
 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)
@@ -7252,56 +5494,29 @@ msgid "Writing a new email to send to a recipient."
 msgstr ""
 
 #: C/mail-composer-write-new-message.page:23(title)
-#, fuzzy
 msgid "Composing a new message"
-msgstr "Escribir unha mensaxe de correo nova"
-
-#: C/mail-composer-write-new-message.page:25(gui)
-#: C/mail-composer-custom-header-lines.page:41(gui)
-#, fuzzy
-msgid "Mail Message"
-msgstr "_Mensaxe 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"
+msgstr "Compoñer unha nova mensaxe"
 
 #: C/mail-composer-write-new-message.page:25(p)
 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 ""
 
 #: 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 "retorna"
-
 #: 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)
@@ -7309,7 +5524,6 @@ msgid "On spell checking your mail in the composer."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:20(title)
-#, fuzzy
 msgid "Spell checking"
 msgstr "Comprobación ortográfica"
 
@@ -7317,19 +5531,11 @@ msgstr "Comprobación ortográfica"
 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 ""
 
@@ -7342,42 +5548,23 @@ msgid "Install enchant now."
 msgstr ""
 
 #: C/mail-composer-spellcheck.page:32(title)
-#, fuzzy
 msgid "Global Preferences"
-msgstr "Preferencias 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 "Preferencias do editor"
-
-#: 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 "Comprobación ortográfica"
+msgstr "Preferencias globais"
 
 #: 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 "I_diomas"
-
 #: 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)
@@ -7385,20 +5572,12 @@ msgstr ""
 msgid "Manual spell checking in the composer"
 msgstr "Cor da comprobación ortográfica"
 
-#: C/mail-composer-spellcheck.page:41(gui)
-#, fuzzy
-msgid "Checking spelling while I type"
-msgstr "Comprobar a ortografía men_tres 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)
@@ -7406,7 +5585,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 "Enviar unha mensaxe só con destinatarios _Bcc definidos"
@@ -7414,68 +5592,59 @@ msgstr "Enviar unha mensaxe só con destinatarios _Bcc definidos"
 #: C/mail-composer-several-recipients.page:28(p)
 msgid ""
 "To send a message to more than one person, enter the addresses in the "
-"composer by seperating them with commas or semicolons."
+"composer by separating them with commas or semicolons."
 msgstr ""
 
-#: C/mail-composer-several-recipients.page:31(title)
-#, fuzzy
+#: C/mail-composer-several-recipients.page:30(p)
+msgid ""
+"If you frequently write email to the same groups of people, you can create "
+"<link xref=\"contacts-using-contact-lists\">contact lists</link> to send "
+"them mail as though they have a single address."
+msgstr ""
+
+#: C/mail-composer-several-recipients.page:33(title)
 msgid "Recipient types"
-msgstr "Destinatarios"
+msgstr "Tipos de destinatarios"
 
-#: C/mail-composer-several-recipients.page:32(p)
+#: C/mail-composer-several-recipients.page:34(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 "_Cco:"
-
-#: C/mail-composer-several-recipients.page:34(gui)
-#, fuzzy
-msgid "Bcc Field"
-msgstr "Campo _Cco"
-
-#: C/mail-composer-several-recipients.page:34(p)
+#: C/mail-composer-several-recipients.page:36(p)
 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 ""
 
-#: C/mail-composer-several-recipients.page:39(p)
+#: C/mail-composer-several-recipients.page:40(title)
+msgid "Autocompletion"
+msgstr "Completado automático"
+
+#: C/mail-composer-several-recipients.page:41(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)
-#, fuzzy
+#: C/mail-composer-several-recipients.page:45(title)
 msgid "Using the buttons"
-msgstr "Mostrar os botóns do selector"
+msgstr "Usar os botóns"
 
-#: C/mail-composer-several-recipients.page:45(p)
+#: C/mail-composer-several-recipients.page:47(p)
 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:)."
-msgstr ""
-
-#: C/mail-composer-several-recipients.page:48(p)
-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."
+"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 ""
 
 #: C/mail-composer-search.page:5(desc)
@@ -7489,38 +5658,29 @@ msgstr ""
 
 #: C/mail-composer-search.page:23(p)
 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 ""
 
-#: C/mail-composer-search.page:26(gui)
-#, fuzzy
-msgid "Find"
-msgstr "_Buscar agora"
-
-#: 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 ""
 
-#: C/mail-composer-search.page:30(gui)
-#, fuzzy
-msgid "Find Again"
-msgstr "Tentar outra vez"
+#: C/mail-composer-search.page:30(p)
+msgid "<gui>Find Again</gui>:"
+msgstr "<gui>Buscar de novo</gui>:"
 
 #: C/mail-composer-search.page:31(p)
 msgid "Select this item to repeat the last search you performed."
 msgstr ""
 
-#: C/mail-composer-search.page:34(gui)
-#, fuzzy
-msgid "Replace"
-msgstr "Respostas"
+#: 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."
@@ -7533,21 +5693,16 @@ msgid ""
 "whether the search is to be case sensitive in determining a match"
 msgstr ""
 
-#: C/mail-composer-search.page:40(link)
-#, fuzzy
-msgid "Regular expressions"
-msgstr "Expresión"
-
 #: 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)
-#, fuzzy
 msgid "Answering a received email."
-msgstr "Enviar e recibir correo"
+msgstr "Responder un correo recibido."
 
 #: C/mail-composer-reply.page:23(title)
 msgid "Replying to a message"
@@ -7561,30 +5716,19 @@ msgstr ""
 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 ""
 
-#: 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)
 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 ""
 
@@ -7596,21 +5740,17 @@ msgstr ""
 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."
-msgstr ""
-
-#: C/mail-composer-reply.page:34(gui)
-msgid "Reply to List"
+"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 ""
 
 #: C/mail-composer-reply.page:34(p)
 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 ""
 
 #: C/mail-composer-reply.page:38(title)
@@ -7618,9 +5758,8 @@ msgid "Keyboard shortcuts"
 msgstr ""
 
 #: C/mail-composer-reply.page:41(p)
-#, fuzzy
 msgid "Action"
-msgstr "_Accións"
+msgstr "Acción"
 
 #: C/mail-composer-reply.page:41(p)
 #, fuzzy
@@ -7631,6 +5770,11 @@ msgstr "Mostrar as teclas dos atallos do Evolution"
 msgid "Reply to Sender"
 msgstr ""
 
+#: 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"
@@ -7640,30 +5784,29 @@ msgstr "R"
 msgid "Reply to Mailing List"
 msgstr "Responder á _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:53(title) C/mail-composer-forward.page:26(link)
-#: C/mail-composer-forward.page:40(title)
-#, fuzzy
-msgid "Default settings"
-msgstr "Axustes da conta de Google:"
+#: C/mail-composer-reply.page:47(p)
+msgid "Reply to All"
+msgstr "Responder a todos"
 
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
-msgid "Replies and Forwards"
-msgstr "Respostas e reencamiñamentos"
+#: C/mail-composer-reply.page:47(key)
+msgid "Shift"
+msgstr ""
 
-#: C/mail-composer-reply.page:54(gui) C/mail-composer-forward.page:41(gui)
+#: C/mail-composer-reply.page:53(title) C/mail-composer-forward.page:40(title)
 #, fuzzy
-msgid "Forward style"
-msgstr "Estilo do _reencamiñamento:"
+msgid "Default settings"
+msgstr "Axustes da conta de Google:"
 
 #: 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)
@@ -7671,32 +5814,14 @@ msgid "Setting a priority for messages to be sent."
 msgstr ""
 
 #: C/mail-composer-priority.page:23(title)
-#, fuzzy
 msgid "Prioritizing outgoing messages"
-msgstr "_Priorizar a mensaxe"
-
-#: 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 "_Inserir"
-
-#: C/mail-composer-priority.page:25(gui)
-#, fuzzy
-msgid "Prioritize Message"
-msgstr "_Priorizar a mensaxe"
+msgstr "Priorizar mensaxes saíntes"
 
 #: C/mail-composer-priority.page:25(p)
 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 ""
 
 #: C/mail-composer-priority.page:27(p)
@@ -7711,9 +5836,8 @@ msgid "Message templates to reuse in the composer."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:23(title)
-#, fuzzy
 msgid "Message Templates"
-msgstr "Filtros de mensaxe"
+msgstr "Modelos de mensaxe"
 
 #: C/mail-composer-message-templates.page:24(p)
 msgid ""
@@ -7721,18 +5845,10 @@ msgid ""
 "send mail with the same pattern."
 msgstr ""
 
-#: 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 "Modelos"
-
 #: 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)
@@ -7743,23 +5859,15 @@ msgstr ""
 msgid "Select the message."
 msgstr ""
 
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Move to folder"
-msgstr "Mover ao cartafol"
-
-#: C/mail-composer-message-templates.page:34(gui)
-#, fuzzy
-msgid "Copy to folder"
-msgstr "Copiar ao cartafol"
-
 #: C/mail-composer-message-templates.page:34(p)
 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 ""
 
 #: 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)
@@ -7767,17 +5875,17 @@ msgid "You can also edit an existing message and save it as a template:"
 msgstr ""
 
 #: C/mail-composer-message-templates.page:39(p)
-msgid "Open the message and click <placeholder-1/>."
+msgid "Open the message and click <gui>Reply</gui>."
 msgstr ""
 
 #: C/mail-composer-message-templates.page:40(p)
 msgid "Edit the message body or the addresses according to your requirements."
 msgstr ""
 
-#: C/mail-composer-message-templates.page:41(gui)
-#: C/mail-composer-message-templates.page:52(gui)
-msgid "Save as Template"
-msgstr "Gardar como un modelo"
+#: 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"
@@ -7785,8 +5893,8 @@ msgstr ""
 
 #: 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)
@@ -7795,13 +5903,14 @@ msgstr ""
 
 #: C/mail-composer-message-templates.page:61(p)
 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 ""
 
 #: 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 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado."
 
 #: C/mail-composer-message-templates.page:65(p)
@@ -7810,6 +5919,10 @@ msgid ""
 "email composer window that will open."
 msgstr ""
 
+#: C/mail-composer-message-templates.page:68(p)
+msgid "Click <gui>Send</gui>."
+msgstr ""
+
 #: C/mail-composer-message-templates.page:69(p)
 msgid ""
 "When you select a message template for replying, the subject of the reply is "
@@ -7820,6 +5933,22 @@ msgstr ""
 msgid "Configuring Message Templates"
 msgstr ""
 
+#: 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)
+msgid "Click the <gui>Configuration</gui> tab."
+msgstr ""
+
 #: C/mail-composer-message-templates.page:80(p)
 msgid ""
 "You can add, edit or remove the key-value pairs. You can specify any number "
@@ -7882,35 +6011,13 @@ msgstr ""
 msgid "Default account signature"
 msgstr "Conta de repetición predefinida"
 
-#: C/mail-composer-mail-signatures-per-account.page:34(link)
-msgid "signature"
-msgstr ""
-
-#: 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 "Identidade"
-
-#: 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)
@@ -7930,26 +6037,18 @@ msgstr ""
 msgid "Working with email signatures"
 msgstr "Sinatura dixital"
 
-#: 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)
@@ -7957,35 +6056,21 @@ msgid "Add, change, edit or delete email signatures."
 msgstr ""
 
 #: C/mail-composer-mail-signatures-manage.page:20(title)
-#, fuzzy
 msgid "Managing signatures"
-msgstr "A sinatura é incorrecta"
-
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-#, fuzzy
-msgid "Composer preferences"
-msgstr "Preferencias do editor"
-
-#: C/mail-composer-mail-signatures-manage.page:22(gui)
-msgid "Signatures"
-msgstr "Sinaturas"
+msgstr "Xestionar sinaturas"
 
 #: 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 "Axustes da conta 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)
@@ -7993,16 +6078,15 @@ msgid "Format Text in the mail composer."
 msgstr ""
 
 #: C/mail-composer-html-text.page:21(title)
-#, fuzzy
 msgid "Formatting Text in HTML"
-msgstr "Formatar as mensaxes en _HTML"
+msgstr "Formatar texto en HTML"
 
 #. TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere.
 #: C/mail-composer-html-text.page:25(p)
 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 ""
 
 #: C/mail-composer-html-text.page:26(p)
@@ -8016,45 +6100,21 @@ msgstr ""
 msgid "Headers and Lists:"
 msgstr ""
 
-#: 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 "Cabeceira"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Header 6"
-msgstr "Cabeceira"
-
-#: C/mail-composer-html-text.page:30(gui)
-#, fuzzy
-msgid "Preformat"
-msgstr "Formato horario:"
-
 #: C/mail-composer-html-text.page:30(p)
 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 ""
 
-#: C/mail-composer-html-text.page:31(gui)
-#, fuzzy
-msgid "Bulleted List"
-msgstr "_Eliminar a lista de notas"
-
 #: C/mail-composer-html-text.page:31(p)
 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 ""
 
 #: C/mail-composer-html-text.page:35(title)
@@ -8095,8 +6155,6 @@ msgid "Button"
 msgstr ""
 
 #: 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 "Descricións"
 
@@ -8144,14 +6202,6 @@ msgstr ""
 msgid "Color Selection:"
 msgstr ""
 
-#: C/mail-composer-html-text.page:78(gui)
-msgid "Style"
-msgstr ""
-
-#: C/mail-composer-html-text.page:78(gui)
-msgid "Page Style"
-msgstr ""
-
 #: C/mail-composer-html-text.page:78(p)
 msgid ""
 "At the left in the lower tool bar is the color section tool, where a box "
@@ -8159,8 +6209,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 ""
 
 #: C/mail-composer-html-table.page:5(desc)
@@ -8177,14 +6227,9 @@ msgid ""
 "cursor):"
 msgstr ""
 
-#: C/mail-composer-html-table.page:25(gui)
-#, fuzzy
-msgid "Table..."
-msgstr "Táboa"
-
-#: 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)
@@ -8213,22 +6258,18 @@ msgid ""
 "the cursor) to help divide two sections:"
 msgstr ""
 
-#: C/mail-composer-html-rule.page:25(gui)
-#, fuzzy
-msgid "Rule..."
-msgstr "_Nome 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)
 msgid "Select width, size, and alignment."
 msgstr ""
 
-#: 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)
@@ -8254,35 +6295,22 @@ msgid ""
 "this, Evolution sends plain text unless you explicitly ask for HTML."
 msgstr ""
 
-#: C/mail-composer-html.page:27(gui)
-msgid "HTML"
-msgstr ""
-
 #: C/mail-composer-html.page:27(p)
 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 ""
 
-#: C/mail-composer-html.page:28(gui)
-msgid "Default Behavior"
-msgstr "Comportamento predeterminado:"
-
-#: C/mail-composer-html.page:28(gui)
-#, fuzzy
-msgid "Format messages in HTML"
-msgstr "Formatar as mensaxes en _HTML"
-
 #: 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)
-#, fuzzy
 msgid "HTML Formatting Options"
-msgstr "Opción de publicar por enriba"
+msgstr "Opción de formatado HTML"
 
 #: C/mail-composer-html-link.page:5(desc)
 msgid "Insert a link to a website in the mail composer."
@@ -8301,24 +6329,16 @@ msgstr ""
 msgid "Select the text that you want to turn into a link."
 msgstr "Seleccionar o tipo de ficheiro que desexa importar desde a lista."
 
-#: C/mail-composer-html-link.page:27(gui)
-msgid "Link..."
-msgstr ""
-
-#: C/mail-composer-html-link.page:27(gui)
-#, fuzzy
-msgid "Insert Link"
-msgstr "_Inserir"
-
 #: 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 o seu enderezo de correo electrónico no campo Enderezo de correo "
 "electrónico."
@@ -8343,16 +6363,20 @@ msgid ""
 "cursor):"
 msgstr ""
 
-#: C/mail-composer-html-image.page:25(gui)
-#, fuzzy
-msgid "Image..."
-msgstr "Imaxe"
+#: 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)
 msgid "Browse to and select the file."
 msgstr ""
 
-#: C/mail-composer-html-image.page:30(note)
+#: C/mail-composer-html-image.page:27(p)
+msgid "Click <gui>Open</gui>."
+msgstr ""
+
+#: C/mail-composer-html-image.page:30(p)
 msgid ""
 "Alternately, you can also drag an image into the text area of the message "
 "composer."
@@ -8364,9 +6388,8 @@ msgid "Forwarding a received email to somebody."
 msgstr "Reencamiñar a mensaxe seleccionada"
 
 #: C/mail-composer-forward.page:23(title)
-#, fuzzy
 msgid "Forwarding a message"
-msgstr "Reencamiñar a mensaxe."
+msgstr "Reencamiñar unha mensaxe"
 
 #: C/mail-composer-forward.page:25(p)
 msgid ""
@@ -8377,9 +6400,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)
@@ -8394,27 +6417,14 @@ msgstr ""
 msgid "To forward a message that you are reading:"
 msgstr ""
 
-#: C/mail-composer-forward.page:31(gui)
-msgid "Forward"
-msgstr "Reencamiñar"
-
-#: C/mail-composer-forward.page:31(key)
-msgid "F"
-msgstr "F"
-
-#: C/mail-composer-forward.page:31(gui)
-#, fuzzy
-msgid "Forward as"
-msgstr "Reencamiñar c_omo…"
-
 #: 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)
@@ -8429,8 +6439,8 @@ msgstr ""
 
 #: 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)
@@ -8450,28 +6460,18 @@ msgstr "Mensaxes con anexos"
 msgid "Forwarding a message with its attachments"
 msgstr "Mensaxes con anexos"
 
-#: C/mail-composer-forward-as-attachment.page:23(gui)
-#, fuzzy
-msgid "Forward as..."
-msgstr "_Reencamiñar o 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 do _reencamiñamento:"
-
 #: 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)
@@ -8480,9 +6480,8 @@ msgid "Using custom fields in the header of composed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
 #: C/mail-composer-custom-header-lines.page:23(title)
-#, fuzzy
 msgid "Custom Header Lines"
-msgstr "Cabeceiras personalizadas"
+msgstr "Liñas de cabeceira personalizadas"
 
 #: C/mail-composer-custom-header-lines.page:25(p)
 #, fuzzy
@@ -8497,16 +6496,10 @@ msgstr ""
 msgid "To set up the Custom Header plugin:"
 msgstr ""
 
-#: C/mail-composer-custom-header-lines.page:32(gui)
-#: C/mail-composer-custom-header-lines.page:42(gui)
-msgid "Custom Header"
-msgstr "Cabeceira 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 "Active <gui>Cabeceira personalizada</gui>."
 
 #: C/mail-composer-custom-header-lines.page:34(p)
 msgid ""
@@ -8523,19 +6516,19 @@ msgstr "Engadir cabeceiras personalizadas ás mensaxes de correo saíntes."
 
 #: 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 "Cabeceira personalizada de correo electrónico"
+#: 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)
 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 ""
 
 #: C/mail-composer-custom-header-lines.page:44(p)
@@ -8552,40 +6545,34 @@ 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)
-#, fuzzy
 msgid "Changing the date and time format in the message list."
-msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
+msgstr "Cambiar o formato de data e hora na lista de mensaxes."
 
 #: C/mail-change-time-format.page:19(title)
 msgid "Format of dates and time"
 msgstr ""
 
-#: C/mail-change-time-format.page:20(gui)
-#, fuzzy
-msgid "Date/Time format"
-msgstr "Formato da data e da 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 "
+"preferred 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)
+#: C/mail-change-time-format.page:21(p)
 #: C/calendar-layout-appointment-display.page:50(p)
-msgid "The placeholders in the format expression are strftime variables."
+msgid ""
+"The placeholders in the format expression are strftime formats. For a "
+"complete list of available strftime formats, run <code>date --help</code> in "
+"a terminal window."
 msgstr ""
 
 #: C/mail-change-columns-in-message-list.page:5(desc)
@@ -8593,39 +6580,34 @@ msgid "Editing the columns displayed in the list of messages."
 msgstr ""
 
 #: C/mail-change-columns-in-message-list.page:20(title)
-#, fuzzy
 msgid "Changing the message list columns"
-msgstr "Altura do panel da lista de mensaxes"
-
-#: C/mail-change-columns-in-message-list.page:22(gui)
-#, fuzzy
-msgid "Add a Column..."
-msgstr "Engadir unha c_olumna…"
+msgstr "Cambiando as columnas da lista de mensaxes"
 
 #: 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)
 msgid "If you received or sent an email, but you cannot find it anywhere."
 msgstr ""
 
-#: C/mail-cannot-see.page:11(name) C/index.page:9(name) C/credits.page:34(p)
+#: C/mail-cannot-see.page:11(name) C/index.page:10(name) C/credits.page:34(p)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/mail-cannot-see.page:12(email) C/index.page:10(email)
+#: C/mail-cannot-see.page:12(email) C/index.page:11(email)
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
@@ -8639,58 +6621,39 @@ msgid ""
 "These could be automatically moving your messages to another destination."
 msgstr ""
 
-#: C/mail-cannot-see.page:27(gui)
-msgid "Read Messages"
-msgstr "Mensaxes lidas"
-
 #: 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 a _previsualización da mensaxe"
-
 #: 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 "Mensaxes enviadas"
-
 #: 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)
-#, fuzzy
-msgid "Email Accounts"
-msgstr "Contas de correo"
-
 #: 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 than the folder you thought of."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:5(desc)
@@ -8709,16 +6672,10 @@ msgid ""
 "invitation card is sent as an attachment in iCal format."
 msgstr ""
 
-#: C/mail-calendar-sending-invitations.page:25(gui)
-#: C/calendar-meetings-sending-invitation.page:26(gui)
-#, fuzzy
-msgid "Forward as iCalendar"
-msgstr "Reemcamiña_r como iCalendar…"
-
 #: C/mail-calendar-sending-invitations.page:25(p)
 msgid ""
 "To send an invitation, right-click on the entry in the calendar and choose "
-"<placeholder-1/>."
+"<gui>Forward as iCalendar</gui>."
 msgstr ""
 
 #: C/mail-calendar-sending-invitations.page:27(p)
@@ -8784,15 +6741,11 @@ msgstr "Anexar un ficheiro"
 msgid "To attach a file to your email in the composer:"
 msgstr ""
 
-#: C/mail-attachments-sending.page:30(gui)
-#, fuzzy
-msgid "Add Attachment..."
-msgstr "Eng_adir anexo…"
-
 #: 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)
@@ -8810,7 +6763,6 @@ msgid ""
 msgstr ""
 
 #: C/mail-attachments-sending.page:40(title)
-#: C/mail-attachments-sending.page:47(gui)
 msgid "Attachment Reminder"
 msgstr "Aviso de anexos"
 
@@ -8825,10 +6777,16 @@ msgstr ""
 msgid "To enable the Attachment Reminder:"
 msgstr ""
 
+#: C/mail-attachments-sending.page:47(p)
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "Enable <gui>Attachment Reminder</gui>."
+msgstr "Aviso de anexos"
+
 #: 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)
@@ -8847,31 +6805,22 @@ msgstr ""
 msgid "Handling attachments in received mail"
 msgstr "Reproducir os anexos de son directamente nas mensaxes de correo."
 
-#: C/mail-attachments-received.page:26(gui)
-#, fuzzy
-msgid "Save All"
-msgstr "G_ardar 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 "Gardar _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)
@@ -8880,21 +6829,12 @@ msgid ""
 "the attachment icon and choose one of the available applications."
 msgstr ""
 
-#: C/mail-attachments-received.page:32(gui)
-#, fuzzy
-msgid "Image Viewer"
-msgstr "Ficheiros de imaxe"
-
-#: C/mail-attachments-received.page:32(gui)
-msgid "GIMP"
-msgstr ""
-
 #: C/mail-attachments-received.page:32(p)
 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 ""
 
 #: C/mail-attachments.page:5(desc)
@@ -8915,21 +6855,21 @@ msgstr ""
 msgid "Usenet news account settings"
 msgstr "Axustes da conta 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 do asistente para a primeira execució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-microsoft-exchange-evo-ews.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 contas"
 
 #: C/mail-account-manage-usenet-news.page:24(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:24(p)
@@ -8938,16 +6878,18 @@ msgstr "Uso do asistente para a primeira execución"
 #: C/mail-account-manage-novell-groupwise.page:25(p)
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:25(p)
 #: C/mail-account-manage-mh-format-directories.page:24(p)
 #: C/mail-account-manage-maildir-format-directories.page:24(p)
 #: C/mail-account-manage-local-delivery.page:24(p)
 #: 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)
@@ -8957,17 +6899,33 @@ msgstr ""
 #: C/mail-account-manage-novell-groupwise.page:26(p)
 #: 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-microsoft-exchange-evo-ews.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-microsoft-exchange-evo-ews.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 "Identidade"
+
 #. 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)
@@ -8976,6 +6934,7 @@ msgstr ""
 #: C/mail-account-manage-novell-groupwise.page:31(p)
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:31(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:31(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:31(p)
 #: C/mail-account-manage-mh-format-directories.page:30(p)
 #: C/mail-account-manage-maildir-format-directories.page:30(p)
 #: C/mail-account-manage-local-delivery.page:30(p)
@@ -8992,6 +6951,7 @@ msgstr "Introduza o seu enderezo de correo electrónico:"
 #: C/mail-account-manage-novell-groupwise.page:32(p)
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:32(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:32(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:32(p)
 #: C/mail-account-manage-mh-format-directories.page:31(p)
 #: C/mail-account-manage-maildir-format-directories.page:31(p)
 #: C/mail-account-manage-local-delivery.page:31(p)
@@ -9012,6 +6972,7 @@ msgstr ""
 #: C/mail-account-manage-novell-groupwise.page:36(title)
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:36(title)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:36(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:36(title)
 #: C/mail-account-manage-mh-format-directories.page:35(title)
 #: C/mail-account-manage-maildir-format-directories.page:35(title)
 #: C/mail-account-manage-local-delivery.page:35(title)
@@ -9033,13 +6994,39 @@ msgstr "Opcións 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-microsoft-exchange-evo-ews.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 "Predefinicións"
+
+#: 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-microsoft-exchange-evo-ews.page:44(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 "Seguranza"
+
 #: 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)
-#: C/mail-account-manage-pop.page:53(title)
-#: C/mail-account-manage-mh-format-directories.page:53(title)
-#: C/mail-account-manage-maildir-format-directories.page:53(title)
-#: C/mail-account-manage-local-delivery.page:53(title)
 #: C/mail-account-manage-imap-plus.page:55(title)
 #: C/mail-account-manage-imap.page:57(title)
 #, fuzzy
@@ -9047,16 +7034,11 @@ msgid "Other settings"
 msgstr "Axustes da proxy"
 
 #: C/mail-account-manage-usenet-news.page:54(p)
-#: C/mail-account-manage-unix-mbox-spool-file.page:54(p)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:54(p)
-#: C/mail-account-manage-pop.page:54(p)
-#: C/mail-account-manage-mh-format-directories.page:54(p)
-#: C/mail-account-manage-maildir-format-directories.page:54(p)
-#: C/mail-account-manage-local-delivery.page:54(p)
 #: 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)
@@ -9115,15 +7097,11 @@ msgstr ""
 msgid "Microsoft Exchange account settings"
 msgstr "Axustes da conta de Google:"
 
-#: 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)
@@ -9168,13 +7146,6 @@ msgstr ""
 msgid "Exchange Web Services account settings"
 msgstr "Axustes da conta de Google:"
 
-#. TODO: Write once evo-ews is stable. Copy structure from other Exchange account types if applicable.
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:23(p)
-msgid ""
-"This documentation section will be added once the currently developed "
-"evolution-ews has become stable and mature."
-msgstr ""
-
 #: C/mail-account-manage-mh-format-directories.page:5(desc)
 msgid "Add and edit a MH Format Mail Directories account in Evolution."
 msgstr ""
@@ -9216,6 +7187,13 @@ msgstr "Cartafoles de correo en formato Maildir:"
 msgid "Maildir Format Mail Directories account settings"
 msgstr "Cartafoles 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 ""
@@ -9239,7 +7217,6 @@ msgid "Add and edit an IMAP mail account in Evolution."
 msgstr ""
 
 #: C/mail-account-manage-imap.page:20(title)
-#: C/mail-access-gmail-imap-account.page:26(link)
 #, fuzzy
 msgid "IMAP mail account settings"
 msgstr "Axustes da conta de Yahoo:"
@@ -9261,14 +7238,10 @@ msgstr ""
 msgid "Log in to your gmail account."
 msgstr "Configurar as contas de correo"
 
-#: C/mail-access-gmail-pop-account.page:30(gui)
-msgid "Forwarding and POP/IMAP"
-msgstr ""
-
 #: 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)
@@ -9289,30 +7262,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 configuración"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-msgid "Other"
-msgstr "Outros"
-
-#: C/mail-access-gmail-pop-account.page:38(gui)
-#, fuzzy
-msgid "Standard Instructions"
-msgstr "Tipo de letra es_tá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)
@@ -9330,18 +7289,87 @@ 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 do 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:37(None)
+msgid ""
+"@@image: './figures/window-overview-layers.png'; "
+"md5=3156497ff1c51756838f9ddfbce9baee"
+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:44(None) C/intro-main-window.page:93(None)
+#: C/intro-main-window.page:139(None)
+msgid ""
+"@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+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:47(None) C/intro-main-window.page:96(None)
+#: C/intro-main-window.page:142(None)
+msgid ""
+"@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+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:50(None) C/intro-main-window.page:99(None)
+#: C/intro-main-window.page:145(None)
+msgid ""
+"@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+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:51(None) C/intro-main-window.page:100(None)
+#: C/intro-main-window.page:146(None)
+msgid ""
+"@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+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:54(None) C/intro-main-window.page:103(None)
+#: C/intro-main-window.page:149(None)
+msgid ""
+"@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+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:57(None) C/intro-main-window.page:111(None)
+#: C/intro-main-window.page:152(None)
+msgid ""
+"@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
+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:58(None) C/intro-main-window.page:153(None)
+msgid ""
+"@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+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:61(None) C/intro-main-window.page:114(None)
+#: C/intro-main-window.page:156(None)
+msgid ""
+"@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
 msgstr ""
 
 #: C/intro-main-window.page:5(desc)
@@ -9356,205 +7384,221 @@ msgstr "Barbara M. Tobias"
 msgid "The <em>Evolution</em> main window"
 msgstr ""
 
-#: C/intro-main-window.page:32(title)
-#, fuzzy
+#. This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028
+#: C/intro-main-window.page:32(p)
+msgid ""
+"Evolution provides functionality for E-Mail, Calendar, Contacts, Tasks, and "
+"Memos. You can switch to another functionality by using the \"Switcher\" "
+"buttons in the lower left corner. Depending on the displayed functionality "
+"also the displayed elements in the window differ."
+msgstr ""
+
+#: C/intro-main-window.page:35(title)
 msgid "E-Mail"
-msgstr "Correo"
+msgstr "Correo electrónico"
 
-#: C/intro-main-window.page:35(p)
+#: C/intro-main-window.page:38(p)
 #, fuzzy
 msgid "The Evolution mail main window"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: C/intro-main-window.page:38(p)
+#: C/intro-main-window.page:41(p)
 msgid "Corresponding elements in the mail main window:"
 msgstr ""
 
-#: C/intro-main-window.page:41(p) C/intro-main-window.page:90(p)
-#: C/intro-main-window.page:136(p)
+#: C/intro-main-window.page:44(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
-"bar"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png\" "
+"width=\"10\"/> Menu bar"
 msgstr ""
 
-#: C/intro-main-window.page:44(p) C/intro-main-window.page:93(p)
-#: C/intro-main-window.page:139(p)
+#: C/intro-main-window.page:47(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
-"bar"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png\" "
+"width=\"10\"/> Tool bar"
 msgstr ""
 
-#: C/intro-main-window.page:47(p) C/intro-main-window.page:96(p)
-#: C/intro-main-window.page:142(p)
+#: C/intro-main-window.page:50(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-"Folder list"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png\" "
+"width=\"10\"/> Folder list"
 msgstr ""
 
-#: C/intro-main-window.page:48(p) C/intro-main-window.page:97(p)
-#: C/intro-main-window.page:143(p)
+#: C/intro-main-window.page:51(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
-"Search bar"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png\" "
+"width=\"10\"/> Search bar"
 msgstr ""
 
-#: C/intro-main-window.page:51(p)
+#: C/intro-main-window.page:54(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-"Message list"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png\" "
+"width=\"10\"/> Message list"
 msgstr ""
 
-#: C/intro-main-window.page:54(p) C/intro-main-window.page:108(p)
-#: C/intro-main-window.page:149(p)
+#: C/intro-main-window.page:57(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
-"Switcher"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png\" "
+"width=\"10\"/> Switcher"
 msgstr ""
 
-#: C/intro-main-window.page:55(p)
+#: C/intro-main-window.page:58(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
-"Preview pane"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png\" "
+"width=\"10\"/> Preview pane"
 msgstr ""
 
-#: C/intro-main-window.page:58(p) C/intro-main-window.page:111(p)
-#: C/intro-main-window.page:153(p)
+#: C/intro-main-window.page:61(p)
 msgid ""
-"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
-"Status bar"
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png\" "
+"width=\"10\"/> Status bar"
 msgstr ""
 
-#: C/intro-main-window.page:64(title)
-#, fuzzy
+#: C/intro-main-window.page:67(title)
 msgid "Folder list"
-msgstr "Cartafol «%s»"
+msgstr "Lista de cartafoles"
 
-#: C/intro-main-window.page:65(p)
+#: C/intro-main-window.page:68(p)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and its contents are "
 "displayed in the message list."
 msgstr ""
 
-#: 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:69(p)
+msgid ""
+"For more information see <link xref=\"mail-folders\">Using Folders</link>."
 msgstr ""
 
-#: C/intro-main-window.page:69(title)
-#, fuzzy
+#: C/intro-main-window.page:72(title)
 msgid "Message List"
-msgstr "A mensaxe é un correo lixo"
+msgstr "Lista de mensaxes"
 
-#: C/intro-main-window.page:70(p)
+#: C/intro-main-window.page:73(p)
 msgid ""
 "The message list displays all the read and unread messages that you have in "
 "the chosen folder. To view an email in the preview pane, click the message "
 "in the message list."
 msgstr ""
 
-#: C/intro-main-window.page:73(title)
-#, fuzzy
+#: C/intro-main-window.page:76(title)
 msgid "Switcher"
-msgstr "_Cambiar ao cartafol"
+msgstr "Trocador"
 
-#: C/intro-main-window.page:74(p)
+#: C/intro-main-window.page:77(p)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
 "Evolution tools: Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 
-#: C/intro-main-window.page:74(link)
-#: C/change-switcher-appearance.page:19(title)
-#, fuzzy
-msgid "Changing the Switcher appearance"
-msgstr "Aparencia do _selector"
-
-#: C/intro-main-window.page:75(gui)
-#, fuzzy
-msgid "Layout"
-msgstr "Estilo da disposición"
-
-#: C/intro-main-window.page:75(gui)
-#, fuzzy
-msgid "Show Side Bar"
-msgstr "Mostrar a _barra lateral"
+#: C/intro-main-window.page:77(p)
+msgid ""
+"For more information see <link xref=\"change-switcher-appearance\">Changing "
+"the Switcher appearance</link>."
+msgstr ""
 
-#: C/intro-main-window.page:75(p)
+#: C/intro-main-window.page:78(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)
-#, fuzzy
+#: C/intro-main-window.page:81(title)
 msgid "Preview Pane"
-msgstr "Previsualización"
+msgstr "Panel de previsualización"
 
-#: C/intro-main-window.page:79(p)
+#: C/intro-main-window.page:82(p)
 msgid ""
 "The preview pane displays the message that is currently chosen in the "
 "message list."
 msgstr ""
 
-#: C/intro-main-window.page:80(p)
+#: C/intro-main-window.page:83(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/intro-main-window.page:89(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"
 
-#: C/intro-main-window.page:87(p) C/intro-main-window.page:133(p)
+#: C/intro-main-window.page:90(p)
 #, fuzzy
 msgid "Elements in the calendar main window:"
 msgstr "O elemento do calendario non é válido"
 
-#: C/intro-main-window.page:100(p)
+#: C/intro-main-window.page:93(p) C/intro-main-window.page:139(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
+"bar"
+msgstr ""
+
+#: C/intro-main-window.page:96(p) C/intro-main-window.page:142(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
+"bar"
+msgstr ""
+
+#: C/intro-main-window.page:99(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Calendar list"
+msgstr ""
+
+#: C/intro-main-window.page:100(p) C/intro-main-window.page:146(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Search bar"
+msgstr ""
+
+#: C/intro-main-window.page:103(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Appointment list"
 msgstr ""
 
-#: C/intro-main-window.page:101(p)
-#, fuzzy
+#: C/intro-main-window.page:104(p)
 msgid "Task list"
 msgstr "Lista de tarefas"
 
-#: C/intro-main-window.page:104(p)
-#, fuzzy
+#: C/intro-main-window.page:107(p)
 msgid "Month pane"
-msgstr "Visualización mensual"
+msgstr "Panel de mes"
 
-#: C/intro-main-window.page:105(p)
-#, fuzzy
+#: C/intro-main-window.page:108(p)
 msgid "Memo list"
-msgstr "Lista de notas"
+msgstr "Lista de recordatorios"
 
-#: C/intro-main-window.page:116(title)
-#, fuzzy
+#: C/intro-main-window.page:111(p) C/intro-main-window.page:152(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
+"Switcher"
+msgstr ""
+
+#: C/intro-main-window.page:114(p) C/intro-main-window.page:156(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Status bar"
+msgstr ""
+
+#: C/intro-main-window.page:119(title)
 msgid "Appointment List"
-msgstr "Citas"
+msgstr "Lista de citas"
 
-#: C/intro-main-window.page:117(p)
+#: C/intro-main-window.page:120(p)
 msgid ""
 "The appointment list displays all your scheduled appointments in the time "
 "frame selected."
 msgstr ""
 
-#: C/intro-main-window.page:120(title)
+#: C/intro-main-window.page:123(title)
 #, fuzzy
 msgid "Month Pane"
 msgstr "Visualización mensual"
 
-#: C/intro-main-window.page:121(p)
+#: C/intro-main-window.page:124(p)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -9562,38 +7606,49 @@ msgid ""
 "list."
 msgstr ""
 
-#: C/intro-main-window.page:124(title)
+#: C/intro-main-window.page:127(title)
 #, fuzzy
 msgid "Task list and Memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: C/intro-main-window.page:125(p)
+#: C/intro-main-window.page:128(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:146(p)
+#: C/intro-main-window.page:135(title)
+#: C/import-supported-file-formats.page:60(title)
+msgid "Contacts"
+msgstr "Contactos"
+
+#: C/intro-main-window.page:136(p)
+#, fuzzy
+msgid "Elements in the contacts main window:"
+msgstr "O elemento do calendario non é válido"
+
+#: C/intro-main-window.page:145(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Address book list"
+msgstr ""
+
+#: C/intro-main-window.page:149(p)
 msgid ""
 "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
 "Contacts list"
 msgstr ""
 
-#: C/intro-main-window.page:150(p)
+#: C/intro-main-window.page:153(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 "_Previsualización do contacto"
-
-#: C/intro-main-window.page:156(p)
+#: C/intro-main-window.page:159(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)
@@ -9606,16 +7661,23 @@ msgstr "Inicio de Evolution por primeira vez"
 msgid "Starting <em>Evolution</em> for the first time"
 msgstr "Inicio de Evolution por primeira vez"
 
-#: C/intro-first-run.page:22(link)
-#, fuzzy
-msgid "import data from other applications."
-msgstr "Importar os datos doutros 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 ""
+"A primeira vez que execute Evolution, este crea un cartafol chamado "
+"<emphasis>.evolution</emphasis> no seu cartafol persoal, onde almacena toda "
+"a súa información local. Despois abrirase un asistente, só a primeira vez, "
+"co fin de axudarlle a configurar as súas contas de correo, así como para "
+"importar datos de outros aplicativos."
 
 #: C/intro-first-run.page:31(title)
 msgid "Restore from backup"
@@ -9624,17 +7686,13 @@ msgstr "Restabelecer desde unha copia de seguranza"
 #: 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:37(p)
-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 ""
 
 #: C/intro-first-run.page:38(p)
@@ -9655,14 +7713,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)
@@ -9671,16 +7723,34 @@ msgid ""
 "systems."
 msgstr ""
 
+#: 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)
 msgid ""
 "IMAP+: Keeps the mail on the server so you can access your mail from "
 "multiple systems."
 msgstr ""
 
+#: 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 ""
@@ -9690,6 +7760,12 @@ msgstr ""
 "Conecta con servidores de novas e descarga unha lista de compendios de novas "
 "dispoñíbeis."
 
+#: 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 ""
@@ -9700,14 +7776,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)
@@ -9719,15 +7798,17 @@ msgstr ""
 "Dispoñíbel só se instaou o paquete evolution-exchange. Seleccione esta "
 "opción se se conecta a servidores Microsoft Exchange 2000 ou 2003."
 
-#: 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)
@@ -9735,22 +7816,29 @@ msgstr ""
 msgid "Novell Groupwise: For connecting to a Novell GroupWise server."
 msgstr "Non foi posíbel conectar co 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 "Ficheiro spool mbox estándar de Unix:"
-
 #: C/intro-first-run.page:73(p)
 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 ""
+
+#: 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)
@@ -9765,6 +7853,12 @@ msgstr ""
 msgid "You need to provide the path to the directory you want to use."
 msgstr "Debe fornecer a ruta ao cartafol de correo que quere 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 ""
@@ -9774,6 +7868,12 @@ msgstr ""
 "Se descarga o seu correo electrónico usando Qmail ou outro 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 "
@@ -9785,19 +7885,32 @@ msgstr ""
 msgid "You need to provide the path to the mail spool file you want to use."
 msgstr "Debe fornecer a ruta ao cartafol de correo que quere usar."
 
+#: 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:81(p)
 msgid ""
 "Standard Unix mbox spool directory: For reading and storing email in the "
 "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áis tarde, se quere cambiar esta conta, ou se quere crear unha nova, prema "
 "Editar &gt; Preferencias, e despois prema Contas de correo. Seleccione a "
@@ -9820,6 +7933,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)
 msgid ""
 "Sendmail: Uses the Sendmail program to send mail from your system. It is not "
@@ -9839,112 +7958,113 @@ msgstr ""
 msgid "Importing Mail (Optional)"
 msgstr ""
 
-#: 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 "Importar os datos doutros programas"
 
-#: C/intro-first-run.page:105(p)
-#, fuzzy
-msgid "Continue with <placeholder-1/>."
-msgstr "gpg <placeholder-1/>"
+#. 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:6(None) C/index.page:24(None)
+msgid ""
+"@@image: 'figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+msgstr ""
+
+#: C/index.page:5(desc)
+msgid "Evolution"
+msgstr "Evolution"
+
+#: C/index.page:7(title)
+msgid "Evolution Mail and Calendar"
+msgstr "Correo electrónico e calendario Evolution"
 
-#: C/index.page:22(title)
+#: C/index.page:23(title)
 msgid ""
-"<media type=\"image\" src=\"./figures/evolutionlogo.png\">Evolution logo</"
+"<media type=\"image\" src=\"figures/evolutionlogo.png\"> Evolution logo </"
 "media> Evolution Mail and Calendar"
 msgstr ""
 
-#: C/index.page:26(title)
+#: C/index.page:31(title)
 msgid "Getting Started"
 msgstr "Inicio"
 
-#: C/index.page:30(title)
-#, fuzzy
+#: C/index.page:35(title)
 msgid "Mail Management"
-msgstr "Xestión da cona"
+msgstr "Xestión da correo electrónico"
 
-#: C/index.page:32(title)
-#, fuzzy
+#: C/index.page:37(title)
 msgid "Advanced Mail Management"
-msgstr "Xestión da cona"
+msgstr "Xestión avanzada de correo electrónico"
 
-#: C/index.page:34(title)
+#: C/index.page:39(title)
 msgid "IMAP"
 msgstr ""
 
-#: C/index.page:40(title)
-#, fuzzy
+#: C/index.page:45(title)
 msgid "Mail Composing"
-msgstr "Correo de %s"
+msgstr "Composición de correo electrónico"
 
-#: C/index.page:42(title)
-#, fuzzy
+#: C/index.page:47(title)
 msgid "Advanced Mail Composing"
-msgstr "Opcións de envío avanzadas"
+msgstr "Composción avanzada de correo electrónico"
 
-#: C/index.page:47(title)
-#, fuzzy
+#: C/index.page:52(title)
 msgid "Calendar Management"
-msgstr "Mensaxe do calendario"
+msgstr "Xestión de calendarios"
 
-#: C/index.page:49(title)
-#, fuzzy
+#: C/index.page:54(title)
 msgid "Advanced Calendar Management"
-msgstr "Nome do calendario de Yahoo:"
+msgstr "Xestión de contactos avanzada"
 
-#: C/index.page:54(title)
-#, fuzzy
+#: C/index.page:59(title)
 msgid "Contacts Management"
-msgstr "Xestión da cona"
+msgstr "Xestión da contactos"
 
-#: C/index.page:58(title)
+#: C/index.page:63(title)
 msgid "Memos and Tasks Management"
 msgstr ""
 
-#: C/index.page:62(title)
+#: C/index.page:67(title)
 msgid "Data Migration and Synchronization"
 msgstr ""
 
-#: C/index.page:66(title)
+#: C/index.page:71(title)
 msgid "Corporate Environments"
 msgstr ""
 
-#: C/index.page:68(title)
-#, fuzzy
+#: C/index.page:73(title)
 msgid "Microsoft Exchange"
-msgstr "Microsoft Exchange:"
+msgstr "Microsoft Exchange"
 
-#: C/index.page:71(title)
-#, fuzzy
+#: C/index.page:76(title)
 msgid "Novell Groupwise"
-msgstr "Novell GroupWise:"
+msgstr "Novell GroupWise"
 
-#: C/index.page:76(title)
+#: C/index.page:81(title)
 msgid "Tracking down Problems"
 msgstr ""
 
-#: C/index.page:80(title)
+#: C/index.page:85(title)
 msgid "Common Mail Questions and Problems"
 msgstr ""
 
-#: C/index.page:84(title)
+#: C/index.page:89(title)
 msgid "Common Other Questions and Problems"
 msgstr ""
 
-#: C/index.page:88(title)
-#, fuzzy
+#: C/index.page:93(title)
 msgid "Further reading"
-msgstr "Encadeamento de asunto"
+msgstr "Lectura complementaria"
 
 #: C/import-supported-file-formats.page:5(desc)
 msgid "Supported file formats for importing data."
 msgstr ""
 
 #: C/import-supported-file-formats.page:23(title)
-#, fuzzy
 msgid "Supported file formats"
-msgstr "O formato da sinatura non é compatíbel"
+msgstr "Formatos de ficheiro compatíbeis"
 
 #: C/import-supported-file-formats.page:25(p)
 msgid "Evolution can import the following types of files:"
@@ -9969,16 +8089,12 @@ msgstr ""
 msgid "Maildir (no extension):"
 msgstr ""
 
-#: C/import-supported-file-formats.page:36(link)
-#, fuzzy
-msgid "configure a Maildir account"
-msgstr "Configurar as contas de correo"
-
 #: 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)
@@ -9993,9 +8109,8 @@ msgid ""
 msgstr ""
 
 #: C/import-supported-file-formats.page:48(p)
-#, fuzzy
 msgid "vCalendar (.vcs):"
-msgstr "iCalendar (.ics)"
+msgstr "iCalendar (.ics):"
 
 #: C/import-supported-file-formats.page:50(p)
 msgid ""
@@ -10014,9 +8129,8 @@ msgid ""
 msgstr ""
 
 #: C/import-supported-file-formats.page:62(p)
-#, fuzzy
 msgid "LDAP Data Interchange Format (.ldif):"
-msgstr "Formato de intercambio de datos LDAP (.ldif)"
+msgstr "Formato de intercambio de datos LDAP (.ldif):"
 
 #: C/import-supported-file-formats.page:64(p)
 msgid "A standard data format for contact cards."
@@ -10034,9 +8148,8 @@ msgid ""
 msgstr ""
 
 #: C/import-supported-file-formats.page:74(title)
-#, fuzzy
-msgid "Miscelleanous"
-msgstr "Varios"
+msgid "Miscellaneous"
+msgstr "Misceláneo"
 
 #: C/import-supported-file-formats.page:76(p)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
@@ -10065,42 +8178,35 @@ msgid "Importing single files."
 msgstr "Importar un úni_co ficheiro"
 
 #: C/import-single-files.page:20(title)
-#, fuzzy
 msgid "Importing single files"
-msgstr "Importar un úni_co ficheiro"
+msgstr ""
 
 #: C/import-single-files.page:22(p)
 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 úni_co ficheiro"
+#: C/import-single-files.page:24(p) C/import-apps-outlook.page:60(p)
+#: C/import-apps-mozilla.page:24(p)
+msgid "Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>."
+msgstr ""
 
-#: C/import-single-files.page:25(p) C/import-apps-outlook.page:60(p)
+#: C/import-single-files.page:25(p) C/import-apps-outlook.page:61(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)
-#, fuzzy
 msgid "Choose the file."
-msgstr "Seleccionar un ficheiro"
+msgstr "Seleccione un ficheiro."
 
-#: C/import-single-files.page:26(p) C/import-apps-outlook.page:61(p)
+#: C/import-single-files.page:26(p) C/import-apps-outlook.page:62(p)
 #: C/import-apps-mozilla.page:26(p)
 #, fuzzy
 msgid "The file type will be automatically determined."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: C/import-single-files.page:27(p) C/import-apps-outlook.page:63(p)
+#: C/import-single-files.page:27(p) C/import-apps-outlook.page:65(p)
 #: C/import-apps-mozilla.page:27(p)
 #, fuzzy
 msgid ""
@@ -10114,14 +8220,16 @@ msgid ""
 msgstr ""
 
 #: C/import-data.page:5(desc)
-#, fuzzy
 msgid "Importing data from another application."
-msgstr "Importar os datos doutros programas"
+msgstr "Importar os datos doutros aplicativos."
 
-#: C/import-data.page:23(title) C/default-browser.page:24(gui)
-#, fuzzy
+#: C/import-data.page:20(title)
+msgid "Importing data from another application"
+msgstr "Importar os datos doutros aplicativos."
+
+#: C/import-data.page:23(title)
 msgid "Applications"
-msgstr "Localizacións"
+msgstr "Aplicativos"
 
 #: C/import-apps-outlook.page:5(desc)
 #, fuzzy
@@ -10149,18 +8257,10 @@ msgstr ""
 msgid "First, while using Microsoft Windows, prepare your messages for import:"
 msgstr ""
 
-#: 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)
@@ -10168,11 +8268,10 @@ msgid "Windows 7, Windows Vista"
 msgstr ""
 
 #: C/import-apps-outlook.page:35(p)
-#, fuzzy
 msgid "Windows XP"
-msgstr "_Xanela"
+msgstr "Windows XP"
 
-#: C/import-apps-outlook.page:38(td)
+#: C/import-apps-outlook.page:38(p)
 msgid "Outlook 2010"
 msgstr ""
 
@@ -10184,10 +8283,9 @@ msgstr ""
 msgid "C:\\Documents and Settings\\username\\My Documents\\Outlook Files"
 msgstr ""
 
-#: C/import-apps-outlook.page:41(td)
-#, fuzzy
+#: C/import-apps-outlook.page:41(p)
 msgid "Outlook 2007 and earlier"
-msgstr "Outlook CSV e importador Tab"
+msgstr "Outlook 2007 e superior"
 
 #: C/import-apps-outlook.page:41(file)
 msgid "C:\\Users\\username\\AppData\\Local\\Microsoft\\Outlook"
@@ -10215,94 +8313,73 @@ msgid ""
 "simpler to copy the mail folders to a USB drive or to burn a CD."
 msgstr ""
 
-#: C/import-apps-outlook.page:49(p)
-msgid "Mount your Windows drive or the disk where you saved the mail files."
+#: C/import-apps-outlook.page:53(title)
+msgid "Importing into Evolution"
+msgstr "Importar en Evolution"
+
+#: C/import-apps-outlook.page:55(p)
+msgid ""
+"Depending on your last step, either plug in the disk or USB drive with the "
+"data and wait until the file manager window opens, or mount your Windows "
+"drive."
 msgstr ""
 
-#: C/import-apps-outlook.page:50(p)
+#: C/import-apps-outlook.page:56(p)
 msgid ""
 "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 
-#: C/import-apps-outlook.page:51(p)
+#: C/import-apps-outlook.page:57(p)
 msgid "Start Evolution."
 msgstr ""
 
-#: C/import-apps-outlook.page:52(gui)
-#, fuzzy
-msgid "Mail Folder"
-msgstr "Carta_fol de correo"
-
-#: C/import-apps-outlook.page:52(link)
-#, fuzzy
-msgid "folders"
-msgstr "Cartafoles específicos"
-
-#: C/import-apps-outlook.page:52(p)
+#: C/import-apps-outlook.page:58(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)
-#, fuzzy
-msgid "Importing into Evolution"
-msgstr "Reiniciando o Evolution"
-
-#: C/import-apps-outlook.page:61(p)
+#: C/import-apps-outlook.page:62(p)
 #, fuzzy
 msgid ""
 "Choose the Outlook personal folders (.pst) file that you would like to "
 "import."
 msgstr "Seleccione a información que desexa importar:"
 
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "Import single file"
-msgstr "Importar un úni_co ficheiro"
-
-#: C/import-apps-outlook.page:62(gui)
-#, fuzzy
-msgid "File type"
-msgstr "_Tipo de ficheiro:"
-
-#: C/import-apps-outlook.page:62(p)
+#: C/import-apps-outlook.page:63(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)
+#: C/import-apps-outlook.page:66(p) C/import-apps-mozilla.page:28(p)
 msgid "Repeat the import steps until you have imported all your data."
 msgstr ""
 
 #: C/import-apps-mozilla.page:5(desc)
-#, fuzzy
 msgid "Importing data from Mozilla Thunderbird."
-msgstr "Importar os datos doutros programas"
+msgstr "Importar datos de Mozilla Thunderbird."
 
 #: C/import-apps-mozilla.page:20(title)
 msgid "Mozilla"
 msgstr ""
 
 #: C/import-apps-mozilla.page:26(p)
-#, fuzzy
 msgid "Choose the Thunderbird files that you would like to import."
-msgstr "Seleccione a información que desexa importar:"
+msgstr "Seleccione os ficheiros de Thunderbird que desexa importar."
 
 #: C/groupwise-placeholder.page:5(desc) C/groupwise-placeholder.page:20(title)
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-#: C/groupwise-placeholder.page:22(link) C/exchange-placeholder.page:22(link)
-#, fuzzy
-msgid "old Evolution manual"
-msgstr "Calendario do 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)
@@ -10327,19 +8404,21 @@ 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/express-mode.page:25(p)
+msgid ""
+"You can also explicitly open Evolution in a specific component. For the "
+"calendar, use <code>evolution --express --component=calendar</code>."
 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)
@@ -10347,28 +8426,19 @@ 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)
-#, fuzzy
 msgid "Exporting mail data"
-msgstr "Importando datos Elm"
-
-#: C/exporting-data-mail.page:22(link)
-msgid "mbox"
-msgstr ""
-
-#: C/exporting-data-mail.page:22(gui)
-#, fuzzy
-msgid "Save as mbox..."
-msgstr "Gardar como mbox…"
+msgstr "Exportar datos do correo electrónico"
 
 #: 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)
@@ -10378,87 +8448,73 @@ 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)
-#, fuzzy
 msgid "Exporting contacts data"
-msgstr "Importando datos do Pine"
+msgstr "Exportar datos dos contactos"
 
 #: C/exporting-data-contacts.page:25(p)
 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_ardar a axenda de enderezos 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 "Gardar os contactos seleccionados como unha VCard"
-
-#: C/exporting-data-contacts.page:27(gui)
-msgid "Save as vCard"
-msgstr "Gardar 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 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)
-#, fuzzy
 msgid "Exporting calendar data"
-msgstr "Abrindo o calendario en %s"
-
-#: C/exporting-data-calendar.page:22(gui)
-#, fuzzy
-msgid "Save as"
-msgstr "Gardar como…"
+msgstr "Exportar datos do calendario"
 
 #: 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 separated values (CSV), and RDF format."
 msgstr ""
 
-#: C/exporting-data-calendar.page:23(gui)
-msgid "Save as iCalendar..."
-msgstr "Gardar como vCard…"
-
 #: 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 "
@@ -10470,25 +8526,26 @@ 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."
+"For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that "
+"support 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)
 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/>"
+"For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently "
+"under development and will replace evolution-mapi in the future. It might "
+"not be available yet for your distribution. <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)
@@ -10516,35 +8573,21 @@ msgid "Deleting emails or attachments permanently"
 msgstr ""
 
 #: C/deleting-emails.page:28(title)
-#, fuzzy
 msgid "Emails"
-msgstr "Correo electrónico"
-
-#: C/deleting-emails.page:29(em)
-msgid "marking"
-msgstr ""
-
-#: C/deleting-emails.page:29(em)
-msgid "expunge"
-msgstr ""
+msgstr "Correos electrónicos"
 
 #: 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 "_Baleirar o lixo"
-
 #: 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 ""
 
@@ -10552,15 +8595,10 @@ msgstr ""
 msgid "Attachments"
 msgstr "Anexos"
 
-#: C/deleting-emails.page:36(gui)
-#, fuzzy
-msgid "Remove Attachments"
-msgstr "Eliminar os _anexos"
-
 #: 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)
@@ -10572,17 +8610,12 @@ msgstr ""
 msgid "Deleting old appointments permanently"
 msgstr "Eliminar as citas seleccionadas"
 
-#: C/deleting-appointments.page:22(gui)
-#, fuzzy
-msgid "Purge"
-msgstr "P_urgar"
-
 #: 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 ""
 
@@ -10594,52 +8627,27 @@ 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 "Axustes"
-
-#: C/default-browser.page:24(gui)
-msgid "System"
-msgstr ""
-
-#: C/default-browser.page:24(gui)
-msgid "System Info"
-msgstr ""
-
-#: C/default-browser.page:24(gui)
-#, fuzzy
-msgid "Default Applications"
-msgstr "Comportamento predeterminado:"
-
 #. 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)
 msgid ""
-"If the prefered browser is set as default application but still does not "
+"If the preferred browser is set as default application but still does not "
 "work correctly please contact your distribution via their forum or bug "
 "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)
@@ -10656,14 +8664,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)
@@ -10671,9 +8676,8 @@ msgid "The user's data files"
 msgstr ""
 
 #: C/data-storage.page:31(p)
-#, fuzzy
 msgid "$HOME/.local/share/evolution"
-msgstr ".local/share/evolution"
+msgstr "$HOME/.local/share/evolution"
 
 #: C/data-storage.page:34(title)
 #, fuzzy
@@ -10681,18 +8685,16 @@ msgid "Various configuration and state files"
 msgstr "Modo de configuración do proxy"
 
 #: C/data-storage.page:35(p)
-#, fuzzy
 msgid "$HOME/.config/evolution"
-msgstr "Configurar o Evolution"
+msgstr "$HOME/.config/evolution"
 
 #: C/data-storage.page:38(title)
 msgid "Disposable data caches"
 msgstr ""
 
 #: C/data-storage.page:39(p)
-#, fuzzy
 msgid "$HOME/.cache/evolution"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
+msgstr "$HOME/.cache/evolution"
 
 #: C/data-storage.page:42(title)
 #, fuzzy
@@ -10700,9 +8702,8 @@ msgid "Configuration settings in GConf"
 msgstr "Versión de configuración"
 
 #: C/data-storage.page:43(p)
-#, fuzzy
 msgid "$HOME/.gconf/apps/evolution"
-msgstr "$HOME/.local/share/evolution/mail/pop/"
+msgstr "$HOME/.gconf/apps/evolution"
 
 #: C/credits.page:5(desc)
 msgid "Credits and Acknowledgment."
@@ -10713,24 +8714,20 @@ msgid "Credits and Acknowledgment"
 msgstr ""
 
 #: C/credits.page:23(title)
-#, fuzzy
 msgid "Authors of the Evolution User Documentation"
-msgstr "Abrir a guía de usuario do Evolution"
+msgstr "Autores da Documentación 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
 msgid "Authors of the previous version"
-msgstr "Cambiar á lapela anterior"
+msgstr "Autores da versión anterior"
 
 #: C/credits.page:43(p)
 msgid "Aaron Weber"
@@ -10749,9 +8746,8 @@ msgid "Ettore Perazzoli"
 msgstr ""
 
 #: C/credits.page:58(p)
-#, fuzzy
 msgid "Francisco Javier F. Serrador"
-msgstr "Francisco Serrador"
+msgstr "Francisco Javier F. Serrador"
 
 #: C/credits.page:61(p)
 msgid "Jessica Prabhakar"
@@ -10783,9 +8779,8 @@ msgid "Contact information"
 msgstr "Información do contacto"
 
 #: C/credits.page:84(p)
-#, fuzzy
 msgid "The GNOME Documentation Project:"
-msgstr "Covencións do documento:"
+msgstr "O Proxecto de documentación de GNOME:"
 
 #: C/credits.page:87(link)
 msgid "Website"
@@ -10822,9 +8817,8 @@ msgid "Using contact lists for grouping contacts."
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:23(title)
-#, fuzzy
 msgid "Using Contact Lists"
-msgstr "Lista de contactos"
+msgstr "Usar unha lista de contactos"
 
 #: C/contacts-using-contact-lists.page:25(p)
 msgid ""
@@ -10844,45 +8838,26 @@ msgid ""
 msgstr ""
 
 #: C/contacts-using-contact-lists.page:30(title)
-#, fuzzy
 msgid "Creating a contact list"
-msgstr "Crear unha lista de contactos nova"
-
-#: C/contacts-using-contact-lists.page:32(gui)
-msgid "Contact List"
-msgstr "Lista de contactos"
+msgstr "Crear unha 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>."
-msgstr ""
-
-#: C/contacts-using-contact-lists.page:34(gui)
-#: C/contacts-usage-add-contact.page:24(gui)
-msgid "Where:"
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
 msgstr ""
 
 #: 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)
@@ -10895,7 +8870,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 ""
 
 #: C/contacts-using-contact-lists.page:40(p)
@@ -10907,16 +8883,12 @@ msgstr ""
 msgid "Sending messages to a contact list"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: C/contacts-using-contact-lists.page:45(gui)
-#, fuzzy
-msgid "Send Message to List"
-msgstr "Enviar unha _mensaxe á lista"
-
 #: C/contacts-using-contact-lists.page:45(p)
 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 ""
 
 #: C/contacts-usage.page:5(desc)
@@ -10925,19 +8897,16 @@ msgid "On adding, editing, and deleting contacts in address books."
 msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
 
 #: C/contacts-usage.page:20(title)
-#, fuzzy
 msgid "Add, Edit, and Delete Contacts"
-msgstr "Produciuse un fallo ao eliminar o contacto"
+msgstr "Engadir, editar e eliminar contactos"
 
 #: C/contacts-usage-edit-contact.page:5(desc)
-#, fuzzy
 msgid "Editing a contact in your address book."
-msgstr "Contactos do Evolution: a axenda de enderezos"
+msgstr "Editar un contacto na axenda de enderezos"
 
 #: C/contacts-usage-edit-contact.page:20(title)
-#, fuzzy
 msgid "Editing a Contact"
-msgstr "Contacto orixinal:"
+msgstr "Editar un contacto"
 
 #: C/contacts-usage-edit-contact.page:22(p)
 msgid ""
@@ -10945,64 +8914,47 @@ msgid ""
 msgstr ""
 
 #: 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 "Localizouse a cita no calendario «%s»"
 
 #: C/contacts-usage-edit-contact.page:26(p)
-#, fuzzy
 msgid "Edit the contact information."
-msgstr "Información do contacto"
+msgstr "Editar a información dun contacto."
 
 #: C/contacts-usage-delete-contact.page:5(desc)
-#, fuzzy
 msgid "Deleting a contact from your address book."
-msgstr "Copiar os contactos seleccionados a outra axenda de enderezos"
+msgstr "Eliminar un contacto desde a axenda de enderezos."
 
 #: C/contacts-usage-delete-contact.page:20(title)
-#, fuzzy
 msgid "Deleting a Contact"
-msgstr "E_liminar o contacto"
-
-#: C/contacts-usage-delete-contact.page:22(gui)
-#, fuzzy
-msgid "Delete Contact"
-msgstr "E_liminar o contacto"
+msgstr "Eliminar un 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 contact 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)
-#, fuzzy
 msgid "Adding a contact to your address book."
-msgstr "Copiar os contactos seleccionados a outra axenda de enderezos"
+msgstr "Engadir un contacto á súa axenda de enderezos."
 
 #: C/contacts-usage-add-contact.page:20(title)
-#, fuzzy
 msgid "Adding a Contact"
-msgstr "Produciuse un erro ao engadir o 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"
+msgstr "Engadir un contacto"
 
 #: 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)
@@ -11012,14 +8964,10 @@ msgstr ""
 "O correo electrónico, calendario e información do contactos almacénanse no "
 "servidor."
 
-#: C/contacts-usage-add-contact.page:26(gui)
-msgid "Full Name"
-msgstr "Nome 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)
@@ -11036,43 +8984,24 @@ msgstr ""
 msgid "Right-click on the email address in the message header."
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: C/contacts-usage-add-contact.page:36(gui)
-#, fuzzy
-msgid "Add to Address Book..."
-msgstr "Eng_adir á axenda de enderezos…"
-
-#: C/contacts-usage-add-contact.page:37(gui)
-#, fuzzy
-msgid "Edit Full"
-msgstr "_Editar completo"
-
-#: 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:36(p)
+msgid "Select <gui>Add to Address Book...</gui>."
+msgstr "Seleccione <gui>Engadir á axenda de enderezos…</gui>."
 
 #: 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)
-#, fuzzy
 msgid "Searching contacts."
-msgstr ""
-"\n"
-"\n"
-"Buscando os contactos…"
+msgstr "Buscar contactos."
 
 #: C/contacts-searching.page:28(title)
-#, fuzzy
 msgid "Searching Contacts"
-msgstr ""
-"\n"
-"\n"
-"Buscando os contactos…"
+msgstr "Buscar contactos"
 
 #: C/contacts-searching.page:31(p)
 msgid ""
@@ -11081,12 +9010,8 @@ msgid ""
 msgstr ""
 
 #: C/contacts-searching.page:32(p)
-#, fuzzy
 msgid "Searching by contact's info:"
-msgstr ""
-"\n"
-"\n"
-"Buscando os contactos…"
+msgstr "Buscar información de contactos:"
 
 #: C/contacts-organizing.page:5(desc)
 msgid "On address books, searching, contact lists, and categories."
@@ -11104,24 +9029,23 @@ msgid ""
 msgstr ""
 
 #: C/contacts-local.page:5(desc)
-#, fuzzy
 msgid "Adding another local address book."
-msgstr "Engadir o remitente á axenda de enderezos"
+msgstr "Engadir outra axenda de enderezos local."
 
 #: C/contacts-local.page:20(title)
-#, fuzzy
 msgid "Adding another local address book"
-msgstr "Engadir o remitente á axenda de enderezos"
+msgstr "Engadir outra axenda de enderezos local"
 
 #: C/contacts-local.page:22(p) C/calendar-local.page:22(p)
 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 "Axenda de enderezos"
+#: 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 ""
@@ -11145,16 +9069,12 @@ msgid ""
 msgstr ""
 
 #: C/contacts-ldap.page:28(title)
-#, fuzzy
 msgid "Adding an LDAP address book"
-msgstr "Engadir o remitente á axenda de enderezos"
-
-#: C/contacts-ldap.page:32(gui)
-msgid "On LDAP Servers"
-msgstr "En servidores LDAP"
+msgstr "Engadir unha axenda de enderezos 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)
@@ -11167,12 +9087,8 @@ msgstr ""
 msgid "Define the login method and your user name."
 msgstr ""
 
-#: C/contacts-ldap.page:37(gui)
-msgid "Details"
-msgstr "Información"
-
 #: 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)
@@ -11201,37 +9117,27 @@ msgid ""
 "For example:"
 msgstr ""
 
-#: 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."
+#| msgid "Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))"
+msgid ""
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: "
+"Retrieves the User and Contact List objects."
 msgstr ""
-
-#: C/contacts-ldap.page:51(code)
-msgid "(&amp;(mail=*)(ObjectClass=*))"
-msgstr "(&amp;(mail=*)(ObjectClass=*))"
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Obtén "
+"os obxectos User e Contact List"
 
 #: 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)
@@ -11252,9 +9158,8 @@ msgid "If you are unsure about some settings, ask your system administrator."
 msgstr ""
 
 #: C/contacts-ldap.page:65(title)
-#, fuzzy
 msgid "Differences to local address books"
-msgstr "Listar os cartafoles de axendas de enderezos locais"
+msgstr "Diferenzas ás axendas de enderezos locais"
 
 #: C/contacts-ldap.page:67(p)
 msgid ""
@@ -11296,34 +9201,31 @@ msgid "Use the online address book of your Google account."
 msgstr ""
 
 #: C/contacts-google.page:21(title)
-#, fuzzy
 msgid "Using a Google addressbook"
-msgstr "Non é posíbel abrir a axenda de enderezos"
+msgstr "Usar unha axenda de enderezos de Google"
 
 #: C/contacts-google.page:23(p)
-msgid "To add such an adress book to Evolution, perform the following steps:"
+msgid "To add such an address 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)
+msgid "Select the type <gui>Google</gui>."
+msgstr "Seleccione o tipo <gui>Google</gui>."
 
 #: C/contacts-google.page:29(p) C/calendar-google.page:33(p)
-#, fuzzy
 msgid "Enter your Google username."
-msgstr "Introduza o seu nome completo."
+msgstr "Escriba o seu nome de usuario de Google."
 
 #: C/contacts-autocompletion.page:5(desc)
-#, fuzzy
 msgid ""
 "Autocompletion of names and email addresses entered in the mail composer."
 msgstr ""
-"Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
+"Autocompletado para os nomes e correos electrónicos escritos no compositor "
+"de correo."
 
 #: C/contacts-autocompletion.page:27(title)
-#, fuzzy
 msgid "Autocompletion of mail recipients"
-msgstr "Lonxitude do completado automático"
+msgstr "Autocompletado para os receptores do correo"
 
 #: C/contacts-autocompletion.page:29(p)
 msgid ""
@@ -11334,23 +9236,24 @@ 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)
 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 ""
 
 #: C/contacts-autocompletion.page:34(p)
 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 ""
 
 #: C/contacts-add-automatically.page:5(desc)
@@ -11362,28 +9265,19 @@ 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 _as entradas da axenda de enderezos ao enviar as mensaxes"
-
 #: 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>Contacts</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
-#: C/contacts-add-automatically.page:29(p)
+#: C/contacts-add-automatically.page:28(p)
 msgid ""
 "From now on, contacts will be automatically created for senders of received "
 "mail when you reply to that mail."
@@ -11393,46 +9287,39 @@ msgstr ""
 msgid "Changing the display of the window buttons in the lower left corner."
 msgstr ""
 
-#: C/change-switcher-appearance.page:21(gui)
-#, fuzzy
-msgid "Switcher Appearance"
-msgstr "Aparencia do _selector"
+#: C/change-switcher-appearance.page:19(title)
+msgid "Changing the Switcher appearance"
+msgstr "Cambiar a aparencia do trocador"
 
 #: 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)
-#, fuzzy
 msgid "The available options are:"
-msgstr "Xestionar as categorías dispoñíbeis"
+msgstr "As opcións dispoñíbeis son:"
 
 #: C/change-switcher-appearance.page:24(p)
-#, fuzzy
 msgid "Icons and Text"
-msgstr "Icon_as e texto"
+msgstr "Iconas e texto"
 
 #: C/change-switcher-appearance.page:27(p)
-#, fuzzy
 msgid "Icons Only"
-msgstr "Só _iconas"
+msgstr "Só iconas"
 
 #: C/change-switcher-appearance.page:30(p)
-#, fuzzy
 msgid "Text Only"
-msgstr "Só _texto"
+msgstr "Só texto"
 
 #: C/change-switcher-appearance.page:33(p)
-#, fuzzy
 msgid "Toolbar Style"
-msgstr "Estilo da _barra de ferramentas"
+msgstr "Estilo da barra de ferramentas"
 
 #: C/change-switcher-appearance.page:36(p)
-#, fuzzy
 msgid "Show Buttons"
 msgstr "Mostrar os botóns"
 
@@ -11441,9 +9328,8 @@ msgid "Using an online Webcal/WebDAV calendar."
 msgstr ""
 
 #: C/calendar-webdav.page:20(title)
-#, fuzzy
 msgid "Using a WebDAV calendar"
-msgstr "Buscar un calendario CalDAV"
+msgstr "Usar un calendario WebDAV"
 
 #: C/calendar-webdav.page:22(p) C/calendar-weather.page:22(p)
 msgid "Calendars of this type are read-only."
@@ -11454,41 +9340,50 @@ msgstr ""
 msgid "To add such a calendar to Evolution, perform the following steps:"
 msgstr ""
 
-#: C/calendar-webdav.page:31(p) C/calendar-caldav.page:32(p)
-msgid "Enter the address of the calendar in the <placeholder-1/> field."
+#: 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 ""
 
+#: C/calendar-webdav.page:31(p) C/calendar-caldav.page:32(p)
+msgid "Enter the address of the calendar in the <gui>URL</gui> field."
+msgstr "Escriba o enderezo dun calendario no campo <gui>URL</gui>."
+
+#: C/calendar-webdav.page:37(p) C/calendar-weather.page:37(p)
+#: C/calendar-local.page:31(p) C/calendar-google.page:38(p)
+#: C/calendar-caldav.page:38(p)
+msgid "The calendar will be added to the list of calendars in Evolution."
+msgstr "O calendario poden ser engadido á lista de calendarios en Evolution."
+
 #: C/calendar-weather.page:5(desc)
-#, fuzzy
 msgid "Display the weather in the calendar."
-msgstr "Mostrar a seguinte conversa"
+msgstr "Mostrar o tempo nun calendario."
 
 #: C/calendar-weather.page:20(title)
-#, fuzzy
 msgid "Using a weather calendar"
-msgstr "Calendarios meteorolóxicos"
+msgstr "Usar un calendario de tempo"
 
-#: C/calendar-weather.page:27(gui)
-msgid "Weather"
-msgstr "O tempo"
+#: C/calendar-weather.page:27(p)
+msgid "Select the type <gui>Weather</gui>."
+msgstr "Seleccionar o tipo de <gui>Tempo</gui>."
 
 #: C/calendar-weather.page:31(p)
 msgid "Choose a location by selecting continent, country and city."
 msgstr ""
 
 #: C/calendar-weather.page:33(p)
-#, fuzzy
 msgid "Choose the temperature unit."
-msgstr "Seleccionar o tipo de importador que se executará:"
+msgstr "Seleccionar a unidade de temperatura."
 
 #: C/calendar-using-several-calendars.page:5(desc)
 msgid "Adding and using more than one calendar and different types."
 msgstr ""
 
 #: C/calendar-using-several-calendars.page:23(title)
-#, fuzzy
 msgid "Using several calendars"
-msgstr "Calendarios do usuario"
+msgstr "Usar varios calendarios"
 
 #: C/calendar-using-several-calendars.page:25(p)
 msgid ""
@@ -11511,15 +9406,12 @@ 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)
 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 ""
 
 #: C/calendar-usage.page:5(desc)
@@ -11527,19 +9419,16 @@ msgid "On adding, editing, and deleting appointments."
 msgstr ""
 
 #: C/calendar-usage.page:21(title)
-#, fuzzy
 msgid "Add, Edit, and Delete Appointments"
-msgstr "_Eliminar esta cita"
+msgstr "Engadir, editar e eliminar citas"
 
 #: C/calendar-usage-edit-appointment.page:5(desc)
-#, fuzzy
 msgid "Editing in appointment in your calendar."
-msgstr "Localizouse a cita no calendario «%s»"
+msgstr "Editar unha cita no seu calendario."
 
 #: C/calendar-usage-edit-appointment.page:20(title)
-#, fuzzy
 msgid "Editing an Appointment"
-msgstr "Editar a cita"
+msgstr "Editar unha cita"
 
 #: C/calendar-usage-edit-appointment.page:22(p)
 msgid ""
@@ -11547,64 +9436,45 @@ msgid ""
 msgstr ""
 
 #: C/calendar-usage-edit-appointment.page:25(p)
-#, fuzzy
 msgid "Double-click on the appointment that you want to edit in the calendar."
-msgstr "Localizouse a cita no calendario «%s»"
-
-#: C/calendar-usage-edit-appointment.page:26(link)
-#: C/calendar-usage-add-appointment.page:20(title)
-#, fuzzy
-msgid "Adding an Appointment"
-msgstr "Editar a cita"
+msgstr "Prema dúas veces sobre a cita que quere editar no calendario."
 
 #: 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)
-#, fuzzy
 msgid "Deleting in appointment in your calendar."
-msgstr "Localizouse a cita no calendario «%s»"
+msgstr "Eliminar unha cita nun dos seus calendarios."
 
 #: C/calendar-usage-delete-appointment.page:20(title)
-#, fuzzy
 msgid "Deleting an Appointment"
-msgstr "_Eliminar esta cita"
-
-#: C/calendar-usage-delete-appointment.page:22(gui)
-#, fuzzy
-msgid "Delete Appointment"
-msgstr "_Eliminar esta cita"
-
-#: C/calendar-usage-delete-appointment.page:22(link)
-msgid "list view"
-msgstr ""
+msgstr "Eliminar unha cita"
 
 #: 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)
-#, fuzzy
 msgid "Adding an appointment."
-msgstr "fin da cita"
+msgstr "Engadir unha cita."
 
-#: C/calendar-usage-add-appointment.page:23(gui)
-msgid "Appointment"
-msgstr "Cita"
+#: C/calendar-usage-add-appointment.page:20(title)
+msgid "Adding an Appointment"
+msgstr "Engadir unha cita."
 
 #: C/calendar-usage-add-appointment.page:23(p)
 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 "
@@ -11617,38 +9487,25 @@ msgstr ""
 
 #: C/calendar-usage-add-appointment.page:25(p)
 #: C/calendar-meetings-sending-invitation.page:33(p)
-msgid "Select a calendar in the <placeholder-1/> drop-down list."
-msgstr ""
-
-#: C/calendar-usage-add-appointment.page:26(gui)
-#: C/calendar-meetings-sending-invitation.page:36(gui)
-msgid "Summary"
-msgstr "Resumo"
+msgid "Select a calendar in the <gui>Calendar</gui> drop-down list."
+msgstr "Seleccione un calendario na lista despregábel <gui>Calendario</gui>."
 
 #: C/calendar-usage-add-appointment.page:26(p)
 #: C/calendar-meetings-sending-invitation.page:36(p)
-msgid "Enter a brief summary in the <placeholder-1/> field."
+msgid "Enter a brief summary in the <gui>Summary</gui> field."
 msgstr ""
 
 #: 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."
-msgstr ""
-"(Opcional) Escriba o enderezo á que quere que lle respondan no campo "
-"«Responder a»."
-
-#: C/calendar-usage-add-appointment.page:28(gui)
-#: C/calendar-meetings-sending-invitation.page:38(gui)
-msgid "All Day Event"
-msgstr ""
+msgid "(Optional) Type a location in the <gui>Location</gui> field."
+msgstr "(Opcional) Escriba unha localización no campo <gui>Localización</gui>."
 
 #: C/calendar-usage-add-appointment.page:28(p)
 #: C/calendar-meetings-sending-invitation.page:38(p)
 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 event 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 ""
 
 #: C/calendar-usage-add-appointment.page:29(p)
@@ -11656,78 +9513,42 @@ msgstr ""
 msgid "Select the date and time."
 msgstr ""
 
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "For"
-msgstr "ou"
-
-#: C/calendar-usage-add-appointment.page:30(gui)
-#: C/calendar-meetings-sending-invitation.page:40(gui)
-#, fuzzy
-msgid "Until"
-msgstr "_Até"
-
 #: 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."
-msgstr ""
-"(Opcional) Escriba o enderezo á que quere que lle respondan no campo "
-"«Responder a»."
-
-#: 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 a hora como oc_upada"
+msgid "(Optional) Enter a description in the <gui>Description</gui> field."
+msgstr "(Opcional) Escriba unha descrición no campo <gui>Descrición</gui>."
 
 #: 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 "Aviso"
-
-#: 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)
-#, fuzzy
 msgid "Using time zones in the calendar."
-msgstr "Localizouse a cita no calendario «%s»"
+msgstr "Usar fusos horarios no calendario."
 
 #: C/calendar-timezones.page:23(title)
-#, fuzzy
 msgid "Using time zones"
-msgstr "Empregar o fuso horario do s_istema"
+msgstr "Usar fusos horarios"
 
 #: C/calendar-timezones.page:25(p)
 msgid "Evolution supports using multiple time zones."
@@ -11737,55 +9558,35 @@ msgstr ""
 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 "Fuso horario:"
-
 #: 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 "Fuso se_cundario:"
-
 #: 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)
-#, fuzzy
 msgid "Setting a timezone for an appointment"
-msgstr "Converte unha reunión nunha cita"
-
-#: C/calendar-timezones.page:38(link)
-#, fuzzy
-msgid "add a new or edit an existing appointment"
-msgstr "Converte unha reunión nunha cita"
+msgstr "Seleccoine un fuso horario para a cita"
 
 #: C/calendar-timezones.page:38(p)
 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 ""
 
 #: C/calendar-sharing-information.page:5(desc)
@@ -11794,14 +9595,12 @@ msgid ""
 msgstr ""
 
 #: C/calendar-sharing-information.page:20(title)
-#, fuzzy
 msgid "Sharing your calendar information"
-msgstr "Información de iCalendar"
+msgstr "Compartir a información dos seus calendarios"
 
 #: C/calendar-searching.page:5(desc)
-#, fuzzy
 msgid "Searching appointments and meetings."
-msgstr "Purgar as citas e reunións antigas"
+msgstr "Buscando citas e reunións."
 
 #: C/calendar-searching.page:28(title)
 msgid "Searching for Calendar Items"
@@ -11814,77 +9613,61 @@ msgid ""
 msgstr ""
 
 #: C/calendar-recurrence.page:5(desc)
-#, fuzzy
 msgid "Repeating appointments."
-msgstr "_Abrir unha cita"
+msgstr "Citas repetidas."
 
 #: C/calendar-recurrence.page:23(title)
-#, fuzzy
 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 "Cita"
-
-#: C/calendar-recurrence.page:25(gui)
-msgid "Exceptions"
-msgstr "Excepcións"
+msgstr "Usar recurrencia"
 
 #: C/calendar-recurrence.page:25(p)
 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.\""
+"If you have an appointment that takes place regularly, you can define its "
+"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 ""
 
 #: C/calendar-publishing.page:5(desc)
 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 "Publicación de calendarios"
 
 #: 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>Publishing "
+"Information</gui><gui>Locations</gui><gui style=\"button\">Add</gui></"
+"guiseq>."
 msgstr ""
 
-#: C/calendar-publishing.page:26(p)
+#. This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655666
+#: C/calendar-publishing.page:27(p)
 msgid ""
 "You can specify the online location, the frequency of publishing, which "
 "calendar(s) to publish, and authentication information for uploading."
 msgstr ""
 
-#: C/calendar-publishing.page:28(p) C/calendar-free-busy.page:44(p)
+#: C/calendar-publishing.page:29(p) C/calendar-free-busy.page:42(p)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV server, FTP "
 "server, a remote machine through SSH or to any other web server with HTTP "
 "PUT support."
 msgstr ""
 
-#: C/calendar-publishing.page:30(gui)
-#, fuzzy
-msgid "Publish Calendar Information"
-msgstr "_Publicar a información do calendario"
-
-#: C/calendar-publishing.page:30(p)
+#: C/calendar-publishing.page:31(p)
 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 ""
 
 #: C/calendar-organizing.page:5(desc)
@@ -11892,14 +9675,12 @@ msgid "On using several calendars, searching, and categories."
 msgstr ""
 
 #: C/calendar-organizing.page:21(title)
-#, fuzzy
 msgid "Sorting and organizing calendars"
-msgstr "Cargando os calendarios"
+msgstr "Ordenando e organizando os calendarios"
 
 #: C/calendar-meetings-sending-invitation.page:5(desc)
-#, fuzzy
 msgid "Sending a Meeting Invitation."
-msgstr "O servidor ma_nexa as invitacións á reunión"
+msgstr "Enviar un convite de reunión."
 
 #: C/calendar-meetings-sending-invitation.page:23(title)
 msgid "Sending a Meeting Invitation"
@@ -11917,77 +9698,50 @@ 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 ""
 
 #: C/calendar-meetings-sending-invitation.page:28(p)
 msgid "To schedule a meeting:"
 msgstr ""
 
-#: C/calendar-meetings-sending-invitation.page:31(gui)
-#: C/calendar-free-busy.page:33(gui)
-msgid "Meeting"
+#: C/calendar-meetings-sending-invitation.page:31(p)
+#: C/calendar-free-busy.page:31(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>."
 msgstr ""
 
-#: C/calendar-meetings-sending-invitation.page:32(gui)
-msgid "Organizer"
-msgstr "Organizador"
-
 #: C/calendar-meetings-sending-invitation.page:32(p)
 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 ""
 
 #: C/calendar-meetings-sending-invitation.page:34(p)
-#: C/calendar-free-busy.page:34(p)
+#: C/calendar-free-busy.page:32(p)
 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 ""
 
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Type"
-msgstr "Tipo"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "Role"
-msgstr "Función"
-
-#: C/calendar-meetings-sending-invitation.page:35(gui)
-msgid "RSVP"
-msgstr "RSVP"
-
 #: C/calendar-meetings-sending-invitation.page:35(p)
 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 "Dispoñibilidade"
-
-#: C/calendar-meetings-sending-invitation.page:42(gui)
-#: C/calendar-free-busy.page:35(gui)
-msgid "Free/Busy"
-msgstr "Dispoñibilidade"
-
 #: C/calendar-meetings-sending-invitation.page:42(p)
 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 ""
 
 #: C/calendar-meetings-sending-invitation.page:43(p)
-#, fuzzy
-msgid "Click <placeholder-1/> to save the meeting."
-msgstr "Prema aquí para gardar a xanela actual"
+msgid "Click <gui>Save</gui> to save the meeting."
+msgstr "Prema <gui>Gardar</gui> para gardar unha reunión."
 
 #: C/calendar-meetings-sending-invitation.page:46(p)
 msgid ""
@@ -12006,69 +9760,62 @@ msgid ""
 msgstr ""
 
 #: C/calendar-meetings-replying-to-invitation.page:5(desc)
-#, fuzzy
 msgid "Accepting and replying to a meeting invitation."
-msgstr "O servidor ma_nexa as invitacións á reunión"
+msgstr "Aceptar e responder a un convite de reunión."
 
-#: C/calendar-meetings-replying-to-invitation.page:25(title)
-#, fuzzy
+#: C/calendar-meetings-replying-to-invitation.page:23(title)
 msgid "Replying to a Meeting Request"
-msgstr "%s respondeu a unha solicitude de reunión."
-
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Accept"
-msgstr "Aceptar"
+msgstr "Responder unha solicitude de reunión"
 
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Tentatively Accept"
+#: C/calendar-meetings-replying-to-invitation.page:24(p)
+msgid ""
+"Meeting requests are sent as attachments and displayed as the body of an "
+"email. All the details about the event are shown, including time and dates."
 msgstr ""
 
-#: C/calendar-meetings-replying-to-invitation.page:26(gui)
-msgid "Decline"
-msgstr "Rexeitar"
-
-#: C/calendar-meetings-replying-to-invitation.page:26(p)
+#: C/calendar-meetings-replying-to-invitation.page:25(p)
 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/>."
+"You can choose whether and how to reply to the invitation and add a personal "
+"comment to your reply. Available options are to <gui>Decline</gui>, "
+"Tentatively Accept (<gui>Tentative</gui>), or <gui>Accept</gui>. You can "
+"also decide whether the time of the meeting will still be shown as free in "
+"your calendar."
 msgstr ""
 
-#: C/calendar-meetings-replying-to-invitation.page:28(p)
+#: C/calendar-meetings-replying-to-invitation.page:27(p)
 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."
+"If the meeting request already includes a <link xref=\"calendar-alarms-and-"
+"reminders\">reminder</link> you can import the reminder to your calendar by "
+"enabling <gui>Inherit reminder</gui>."
 msgstr ""
 
 #: C/calendar-meetings-replying-to-invitation.page:29(p)
 msgid ""
+"If you click <gui>Accept</gui> the event is added automatically to the "
+"calendar that you have chosen."
+msgstr ""
+
+#: C/calendar-meetings-replying-to-invitation.page:30(p)
+msgid ""
 "After you have added the meeting to your calendar, you can make changes to "
 "the meeting, but if the original organizer sends out an update, your changes "
 "might be overwritten."
 msgstr ""
 
-#: C/calendar-meetings-replying-to-invitation.page:31(gui)
-msgid "Conflict Search"
-msgstr "Busca de conflitos"
-
-#: C/calendar-meetings-replying-to-invitation.page:31(p)
+#: C/calendar-meetings-replying-to-invitation.page:32(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>Calendar and Tasks</"
+"gui><gui>Meeting Invitations</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)
-#, fuzzy
 msgid "Using meetings in the calendar."
-msgstr "Non é posíbel atopar esta reunión en ningún calendario"
+msgstr "Usar reunións no calendario."
 
 #: C/calendar-meetings.page:20(title)
-#, fuzzy
 msgid "Meetings"
-msgstr "Reunión"
+msgstr "Reunións"
 
 #: C/calendar-meetings-delegating.page:5(desc)
 msgid "Ask somebody else to run the meeting."
@@ -12086,10 +9833,9 @@ msgstr ""
 msgid "Right-click on the meeting that you want to delegate."
 msgstr ""
 
-#: C/calendar-meetings-delegating.page:32(gui)
-#, fuzzy
-msgid "Delegate Meeting"
-msgstr "_Delegar a reunión…"
+#: C/calendar-meetings-delegating.page:32(p)
+msgid "Click <gui>Delegate Meeting</gui>."
+msgstr "Prema <gui>Delegar reunión</gui>."
 
 #: C/calendar-meetings-delegating.page:35(p)
 msgid "Select the contacts you want to delegate the meeting to."
@@ -12100,10 +9846,8 @@ msgid "Each contact receives a copy of the meeting invitation."
 msgstr ""
 
 #: C/calendar-marcus-bains-line.page:5(desc)
-#, fuzzy
 msgid "The red \"Marcus Bains\" line displays the current time."
-msgstr ""
-"Indica se se debuxa a liña Marcus Bains (liña na hora actual) no calendario."
+msgstr "A liña vermella «Marcus Bains» móstrase na liña actual."
 
 #: C/calendar-marcus-bains-line.page:19(title)
 msgid "Time display in the Day view"
@@ -12116,9 +9860,8 @@ msgid ""
 msgstr ""
 
 #: C/calendar-local.page:5(desc)
-#, fuzzy
 msgid "Adding another local calendar."
-msgstr "Engadir calendarios locais ao Evolution."
+msgstr "Engadir outro calendario local."
 
 #: C/calendar-local.page:20(title)
 msgid "Adding another local calendar"
@@ -12129,47 +9872,37 @@ msgid "Using date ranges (day, week, month) to look at the calendar."
 msgstr ""
 
 #: C/calendar-layout-views.page:23(title)
-#, fuzzy
 msgid "Available views"
-msgstr "Campos dispoñíbeis"
+msgstr "Vistas dispoñíbeis"
 
 #: C/calendar-layout-views.page:25(p)
 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)
-#, fuzzy
-msgid "Current View"
-msgstr "Visualización act_ual"
-
 #: 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)
@@ -12178,26 +9911,18 @@ msgid ""
 "side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 
-#: C/calendar-layout-views.page:38(gui)
-msgid "Select today"
-msgstr "Seleccionar o día de hoxe"
-
 #: C/calendar-layout-views.page:38(p)
 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 ""
 
-#: C/calendar-layout-views.page:40(gui)
-msgid "Select a specific date"
-msgstr "Seleccionar unha data determinada"
-
 #: C/calendar-layout-views.page:40(p)
 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 ""
 
 #: C/calendar-layout.page:5(desc)
@@ -12205,25 +9930,28 @@ msgid "Adjusting the display and views of the calendar."
 msgstr ""
 
 #: C/calendar-layout.page:20(title)
-#, fuzzy
 msgid "Changing the calendar layout"
-msgstr "Abrindo o calendario. Agarde…"
+msgstr "Cambiar a disposición do calendario"
 
 #: C/calendar-layout-general-formatting.page:5(desc)
 msgid "General formatting options for the calendar."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:25(title)
-#, fuzzy
 msgid "General formatting options"
-msgstr "Opcións _xerais"
+msgstr "Opcións xerais de formatado"
 
 #: 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 horario:"
@@ -12233,9 +9961,8 @@ msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr ""
 
 #: 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)
 msgid "The city you are located in, and optionally a second city."
@@ -12246,9 +9973,8 @@ msgid "Work Week"
 msgstr "Semana laboral"
 
 #: C/calendar-layout-general-formatting.page:41(p)
-#, fuzzy
 msgid "Week starts on:"
-msgstr "A _semana comeza en:"
+msgstr "A semana comeza en:"
 
 #: C/calendar-layout-general-formatting.page:42(p)
 msgid "Select the day to display as the first in each week."
@@ -12263,18 +9989,16 @@ msgid "Define which week days are work days."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:45(p)
-#, fuzzy
 msgid "Day begins:"
-msgstr "A _xornada comeza ás:"
+msgstr "A xornada comeza ás:"
 
 #: C/calendar-layout-general-formatting.page:46(p)
 msgid "Define at which time your work day begins."
 msgstr ""
 
 #: C/calendar-layout-general-formatting.page:47(p)
-#, fuzzy
 msgid "Day ends:"
-msgstr "A xornada _finaliza ás:"
+msgstr "A xornada finaliza ás:"
 
 #: C/calendar-layout-general-formatting.page:48(p)
 msgid "Define at which time your work day ends."
@@ -12291,23 +10015,25 @@ msgid ""
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:5(desc)
-#, fuzzy
 msgid "Define the displaying of appointments in the calendar."
-msgstr "Localizouse a cita no calendario «%s»"
+msgstr "Define a mostra das citas no calendario."
 
 #: C/calendar-layout-appointment-display.page:23(title)
-#, fuzzy
 msgid "Appearance of Appointments"
-msgstr "fin da cita"
+msgstr "Aparencia das citas"
 
-#. TODO:ANDREKLAPPER: File bug report similar to #655666 once checked in 3.1 about General & Display tabs. This is a huge mess, e.g. time settings are split onto two tabs.
+#. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=657233 is fixed, as the current UI is a huge mess.
 #: 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 "Xeral"
+
 #: C/calendar-layout-appointment-display.page:34(p)
 msgid "Time Divisions:"
 msgstr ""
@@ -12347,11 +10073,9 @@ msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 
 #: C/calendar-layout-appointment-display.page:42(p)
-#, fuzzy
 msgid "Show recurring events in italic in bottom left calendar"
 msgstr ""
-"Mostrar en cursiva as actividades con _repeticións no calendario inferior "
-"esquerdo"
+"Mostrar en cursiva as actividades recurrentes no calendario inferior esquerdo"
 
 #: C/calendar-layout-appointment-display.page:43(p)
 msgid "Scroll Month View by a week"
@@ -12361,10 +10085,10 @@ msgstr "Desprazar a visualización mensual unha semana"
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: C/calendar-layout-appointment-display.page:50(p)
+#: C/calendar-layout-appointment-display.page:49(p)
 msgid ""
-"You can change the format of the <placeholder-1/> column by setting your "
-"prefered format."
+"You can change the format of the <gui>Date</gui> column by setting your "
+"preferred format."
 msgstr ""
 
 #: C/calendar-google.page:5(desc)
@@ -12372,9 +10096,8 @@ msgid "Using the online calendar of your Google account."
 msgstr ""
 
 #: C/calendar-google.page:24(title)
-#, fuzzy
 msgid "Using a Google calendar"
-msgstr "Calendarios de Google"
+msgstr "Usar un calendario de Google"
 
 #: C/calendar-google.page:34(p)
 msgid "If you have more than one Google calendar, define which of them to use."
@@ -12394,13 +10117,7 @@ msgid ""
 "of invitees."
 msgstr ""
 
-#: C/calendar-free-busy.page:29(link)
-#, fuzzy
-msgid "meeting invitations"
-msgstr "O servidor ma_nexa as invitacións á reunión"
-
-#. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed
-#: C/calendar-free-busy.page:29(p)
+#: C/calendar-free-busy.page:27(p)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -12408,47 +10125,43 @@ 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 ""
 
-#: C/calendar-free-busy.page:31(p)
+#: C/calendar-free-busy.page:29(p)
 msgid "To access the free/busy view:"
 msgstr ""
 
-#: C/calendar-free-busy.page:35(p)
+#: C/calendar-free-busy.page:33(p)
 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 "Seleccionar _automaticamente"
-
-#: C/calendar-free-busy.page:36(p)
+#: C/calendar-free-busy.page:34(p)
 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 ""
 
-#: C/calendar-free-busy.page:40(p)
+#: C/calendar-free-busy.page:38(p)
 msgid "Attendee List:"
 msgstr ""
 
-#: C/calendar-free-busy.page:40(p)
+#: C/calendar-free-busy.page:38(p)
 msgid ""
 "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 
-#: C/calendar-free-busy.page:41(p)
+#: C/calendar-free-busy.page:39(p)
 msgid "Schedule Grid:"
 msgstr ""
 
-#: C/calendar-free-busy.page:41(p)
+#: C/calendar-free-busy.page:39(p)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -12459,23 +10172,23 @@ msgid ""
 "that URL into their contact cards using the contact editor."
 msgstr ""
 
+#: C/calendar-free-busy.page:43(p)
+msgid ""
+"The default server can be defined under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
+"Information</gui><gui>Default Free/Busy Server</gui></guiseq>."
+msgstr ""
+
 #: C/calendar-free-busy.page:47(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr ""
 
-#: C/calendar-free-busy.page:49(gui)
-msgid "Personal Information"
-msgstr "Datos persoais"
-
-#: C/calendar-free-busy.page:49(gui)
-msgid "Web Addresses"
-msgstr "Enderezos web"
-
 #: C/calendar-free-busy.page:49(p)
 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 ""
 
@@ -12484,9 +10197,8 @@ msgid "Classifying appointments and tasks on groupware servers."
 msgstr ""
 
 #: C/calendar-classifications.page:23(title)
-#, fuzzy
 msgid "Using Classifications"
-msgstr "Clasificación"
+msgstr "Usar clasificacións"
 
 #: C/calendar-classifications.page:25(p)
 msgid ""
@@ -12494,30 +10206,14 @@ msgid ""
 "server, you can select a classification to determine who can view it."
 msgstr ""
 
-#: C/calendar-classifications.page:26(gui)
-msgid "Classifications"
-msgstr ""
-
-#: 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)
@@ -12527,53 +10223,42 @@ msgid ""
 msgstr ""
 
 #: C/calendar-caldav.page:5(desc)
-#, fuzzy
 msgid "Using an online CalDAV calendar."
-msgstr "Buscar un calendario CalDAV"
+msgstr "Buscar un calendario CalDAV en liña."
 
 #: C/calendar-caldav.page:23(title)
-#, fuzzy
 msgid "Using a CalDAV calendar"
-msgstr "Buscar un calendario CalDAV"
+msgstr "Usar un calendario CalDAV"
 
-#: C/calendar-caldav.page:28(gui)
-msgid "CalDAV"
-msgstr "CalDAV"
+#: C/calendar-caldav.page:28(p)
+msgid "Select the type <gui>CalDAV</gui>."
+msgstr "Seleccione un tipo de <gui>CalDAV</gui>."
 
 #: C/calendar-alarms-and-reminders.page:5(desc)
-#, fuzzy
 msgid "Setting up reminder notifications for appointments."
-msgstr "Indica se se estabelece un aviso predeterminado para as citas."
+msgstr "Configurar notificacións de avisos para citas."
 
 #: C/calendar-alarms-and-reminders.page:23(title)
-#, fuzzy
 msgid "Reminders for appointments"
-msgstr "fin da cita"
+msgstr "Avisos de citas"
 
 #: C/calendar-alarms-and-reminders.page:26(title)
-#, fuzzy
 msgid "General Settings"
-msgstr "Opcións _xerais"
-
-#: C/calendar-alarms-and-reminders.page:28(gui)
-#: C/calendar-alarms-and-reminders.page:37(gui)
-msgid "Reminders"
-msgstr ""
+msgstr "Opcións xerais"
 
 #: 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)
-#, fuzzy
 msgid "Manual Reminders"
-msgstr "Aviso"
+msgstr "Avisos manuais"
 
 #: C/calendar-alarms-and-reminders.page:35(p)
 msgid ""
@@ -12583,25 +10268,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)
+#: C/calendar-alarms-and-reminders.page:40(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)
@@ -12611,9 +10292,8 @@ msgstr ""
 "Evolution."
 
 #: C/backup-restore.page:21(title)
-#, fuzzy
 msgid "Back up and restore"
-msgstr "Facer unha copia de seguranza e restabelecer"
+msgstr "Facer copias de seguranza e restabelecelas"
 
 #: C/backup-restore.page:23(p)
 msgid ""
@@ -12626,57 +10306,49 @@ msgstr ""
 msgid "Backing up"
 msgstr ""
 
-#: C/backup-restore.page:28(gui)
-#, fuzzy
-msgid "Back up Evolution Settings..."
-msgstr "_Respaldar axustes de Evolution…"
+#: C/backup-restore.page:28(p)
+msgid ""
+"Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</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 "Si"
-
 #: 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)
-#, fuzzy
 msgid "Restoring"
-msgstr "Repetición"
+msgstr "Restaurando"
 
-#: C/backup-restore.page:37(gui)
-#, fuzzy
-msgid "Restore Evolution Settings..."
-msgstr "R_estabelecer axustes de Evolution…"
+#: C/backup-restore.page:37(p)
+msgid ""
+"Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
+msgstr ""
 
 #: C/backup-restore.page:38(p)
-msgid "Choose the file, and click <placeholder-1/>."
+msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr ""
 
-#: C/backup-restore.page:41(link)
-#, fuzzy
-msgid "first-run assistant"
-msgstr "Uso do asistente para a primeira execució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 restabelecer o Evolution desde a copia de seguranza "
-"seleccionada?"
+"No <link xref=\"intro-first-run\">asistente de primeira execución</link>, "
+"pode restaurar datos de Evolution desde un ficheiro de copia de seguranza."
 
 #. 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 ""
-"Fran Diéguez <frandieguez@ubuntu.com>, 2009, 2010.\n"
+"Fran Diéguez <frandieguez@ubuntu.com>, 2009, 2010, 2011.\n"
 "Antón Méixome <meixome@certima.net>, 2010.\n"
 "Antón Méixome <meixome@mancomun.org>, 2009.\n"
 "Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun."
@@ -12687,6 +10359,1405 @@ msgstr ""
 "Jesús Bravo Álvarez <jba@pobox.com>, 2000.\"\n"
 "Marcos Lans <marcoslansgarza@gmail.com>,2010."
 
+#, fuzzy
+#~ msgid "Categories..."
+#~ msgstr "Ca_tegorías…"
+
+#, fuzzy
+#~ msgid "View"
+#~ msgstr "_Ver"
+
+#~ msgid "Categories"
+#~ msgstr "Categorías"
+
+#, fuzzy
+#~ msgid "Edit"
+#~ msgstr "_Editar"
+
+#, fuzzy
+#~ msgid "Available Categories"
+#~ msgstr "Cate_gorias dispoñíbeis"
+
+#~ 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 "Buscando"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "_Ficheiro"
+
+#~ msgid "New"
+#~ msgstr "Novo"
+
+#~ msgid "Task List"
+#~ msgstr "Lista de tarefas"
+
+#~ msgid "Memo List"
+#~ msgstr "Lista de notas"
+
+#, fuzzy
+#~ msgid "On the Web"
+#~ msgstr "no futuro"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Use secure connection"
+#~ msgstr "_Usar unha conexión segura:"
+
+#, fuzzy
+#~ msgid "Open Task"
+#~ msgstr "_Abrir unha tarefa"
+
+#, fuzzy
+#~ msgid "Save"
+#~ msgstr "_Gardar"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Delete Task"
+#~ msgstr "Eliminar a tarefa"
+
+#~ msgid "Task"
+#~ msgstr "Tarefa"
+
+#~ msgid "T"
+#~ msgstr "T"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#, fuzzy
+#~ msgid "time zone"
+#~ msgstr "Fuso horario:"
+
+#, fuzzy
+#~ msgid "category"
+#~ msgstr "Categoría"
+
+#, fuzzy
+#~ msgid "classification"
+#~ msgstr "Clasificación"
+
+#, fuzzy
+#~ msgid "meetings"
+#~ msgstr "Reunión - %s"
+
+#, fuzzy
+#~ msgid "This is similar to <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Assigned Task"
+#~ msgstr "Tarefa asigna_da"
+
+#, fuzzy
+#~ msgid "Show"
+#~ msgstr "Mostrar mapas"
+
+#, fuzzy
+#~ msgid "Search"
+#~ msgstr "_Buscar"
+
+#, fuzzy
+#~ msgid "Add Condition"
+#~ msgstr "Enga_dir unha condición"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Limpa_r"
+
+#~ msgid "Q"
+#~ msgstr "Q"
+
+#~ msgid "Save Search"
+#~ msgstr "Gardar a busca"
+
+#, fuzzy
+#~ msgid "Edit Saved Searches"
+#~ msgstr "_Editar as buscas gardadas…"
+
+#, fuzzy
+#~ msgid "<placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Edit Rule"
+#~ msgstr "Editar a  regra"
+
+#~ msgid "On This Computer"
+#~ msgstr "Neste computador"
+
+#, fuzzy
+#~ msgid "Preferences"
+#~ msgstr "Preferencias de correo"
+
+#~ msgid "Calendar and Tasks"
+#~ msgstr "Calendario e tarefas"
+
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#, fuzzy
+#~ msgid "SyncEvolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "SyncML"
+#~ msgstr "HotSync"
+
+#~ 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"
+
+#~ msgid "EAddress"
+#~ msgstr "EAddress"
+
+#~ msgid "ECalendar"
+#~ msgstr "ECalendar"
+
+#~ msgid "ETodo"
+#~ msgstr "ETodo"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "Activado"
+
+#~ msgid "Settings"
+#~ msgstr "Axustes"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "_Desactivar"
+
+#, fuzzy
+#~ msgid "Synchronize"
+#~ msgstr "_Sincronizar"
+
+#, fuzzy
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar o cartafol a"
+
+#~ 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 "Sitio web do Evolution"
+
+#, fuzzy
+#~ msgid "notification area"
+#~ msgstr "Mostrar a icona na área de _notificación"
+
+#, fuzzy
+#~ msgid "Open Memo"
+#~ msgstr "_Abrir a nota"
+
+#~ msgid "Delete Memo"
+#~ msgstr "Eliminar a nota"
+
+#~ msgid "Memo"
+#~ msgstr "Nota"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#, fuzzy
+#~ msgid "Shared Memo"
+#~ msgstr "Nota _compartida"
+
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "Message Fonts"
+#~ msgstr "A mensaxe contén"
+
+#, fuzzy
+#~ msgid "Use the same fonts as other applications"
+#~ msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "_Propiedades"
+
+#, fuzzy
+#~ msgid "Work Offline"
+#~ msgstr "_Traballar sen conexión"
+
+#, fuzzy
+#~ msgid "Download Messages for Offline Usage"
+#~ msgstr "_Descargar as mensaxes para o uso sen conexión"
+
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "Formato:"
+
+#, fuzzy
+#~ msgid "Preformatted"
+#~ msgstr "Visualizar sen _formato"
+
+#~ msgid "Preview"
+#~ msgstr "Previsualización"
+
+#, fuzzy
+#~ msgid "Vertical View"
+#~ msgstr "Visualización _vertical"
+
+#, fuzzy
+#~ msgid "Classical View"
+#~ msgstr "Visualización _clásica"
+
+#~ msgid "Folder"
+#~ msgstr "Cartafol"
+
+#, fuzzy
+#~ msgid "Subscriptions"
+#~ msgstr "_Subscricións…"
+
+#~ msgid "Trash"
+#~ msgstr "Lixo"
+
+#, fuzzy
+#~ msgid "Search folder"
+#~ msgstr "Cartafoles de busca"
+
+#~ msgid "Junk"
+#~ msgstr "Correo lixo"
+
+#, fuzzy
+#~ msgid "Plugins"
+#~ msgstr "_Engadidos"
+
+#, fuzzy
+#~ msgid "Close"
+#~ msgstr "_Pechar"
+
+#~ msgid "S"
+#~ msgstr "S"
+
+#, fuzzy
+#~ msgid "Select <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Mail Accounts"
+#~ msgstr "Contas de correo"
+
+#, fuzzy
+#~ msgid "Mark as Not Junk"
+#~ msgstr "Desmarcar como correo lixo"
+
+#~ msgid "J"
+#~ msgstr "J"
+
+#, fuzzy
+#~ msgid "Not Junk"
+#~ msgstr "_Non é correo lixo"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "Elimina_r"
+
+#~ msgid "Email"
+#~ msgstr "Correo electrónico"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Eng_adir"
+
+#, fuzzy
+#~ msgid "All Message Headers"
+#~ msgstr "Todas as ca_beceiras da mensaxe"
+
+#, fuzzy
+#~ msgid "Message Source"
+#~ msgstr "Fonte da _mensaxe"
+
+#~ msgid "U"
+#~ msgstr "U"
+
+#, fuzzy
+#~ msgid "Group By Threads"
+#~ msgstr "A_grupar por conversas"
+
+#, fuzzy
+#~ msgid "Remove This Column"
+#~ msgstr "Eliminar esta _columna"
+
+#~ msgid "Add a Column"
+#~ msgstr "Engadir unha columna"
+
+#, fuzzy
+#~ msgid "creating folders"
+#~ msgstr "Creando o cartafol «%s»"
+
+#, fuzzy
+#~ msgid "creating filters"
+#~ msgstr "Creando o cartafol «%s»"
+
+#, fuzzy
+#~ msgid "Message Filters..."
+#~ msgstr "Filtros de mensaxe"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#, fuzzy
+#~ msgid "Check for Supported Types"
+#~ msgstr "Comprobar os tipos compatíb_eis"
+
+#, fuzzy
+#~ msgid "here"
+#~ msgstr "_Onde:"
+
+#, fuzzy
+#~ msgid "Composing mail"
+#~ msgstr "Importando a caixa de correo"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar / Recibir"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#, fuzzy
+#~ msgid "Check for new messages every ... minutes"
+#~ msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Actualizar"
+
+#, fuzzy
+#~ msgid "filters"
+#~ msgstr "filters.xml"
+
+#, fuzzy
+#~ msgid "folder"
+#~ msgstr "Seleccionar un cartafol"
+
+#~ msgid "Unmatched"
+#~ msgstr "Sen coincidencias"
+
+#, fuzzy
+#~ msgid "custom ones"
+#~ msgstr "Usar tipos de letra personalizados"
+
+#, fuzzy
+#~ msgid "Any header including <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "labels"
+#~ msgstr "Etiquetas"
+
+#, fuzzy
+#~ msgid "flagged for follow-up"
+#~ msgstr "Marcar as mensaxes seleccionadas para o seguimento"
+
+#, fuzzy
+#~ msgid "Checks whether the message is <placeholder-1/>."
+#~ msgstr "Alterna a visualización do fuso horario"
+
+#~ msgid "Search Folders"
+#~ msgstr "Cartafoles de busca"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensaxe"
+
+#, fuzzy
+#~ msgid "Create Rule"
+#~ msgstr "Crear unha r_egra"
+
+#, fuzzy
+#~ msgid "Create Search Folder From Search..."
+#~ msgstr "C_rear un cartafol de busca a partir da busca…"
+
+#, fuzzy
+#~ msgid "Rule name"
+#~ msgstr "Nome da r_egra:"
+
+#, fuzzy
+#~ msgid "Available Search Folder conditions"
+#~ msgstr "Activar cartafoles de _busca"
+
+#, fuzzy
+#~ msgid "Find items"
+#~ msgstr "_Buscar os elementos:"
+
+#~ msgid "Search Folder Sources"
+#~ msgstr "Fontes do cartafol de busca"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#, fuzzy
+#~ msgid "Thread-*"
+#~ msgstr "Seguin_te conversa"
+
+#, fuzzy
+#~ msgid "subscriptions window"
+#~ msgstr "Largura da xanela «Subscricións de cartafoles»"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "_Ruta:"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#, fuzzy
+#~ msgid "Filters"
+#~ msgstr "Regras de _filtro"
+
+#, fuzzy
+#~ msgid "Apply filters to new messages in INBOX"
+#~ msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
+
+#~ msgid "Other..."
+#~ msgstr "Outro…"
+
+#, fuzzy
+#~ msgid "Leave messages on server"
+#~ msgstr "Comprobar se hai mensaxes novas ao iniciar"
+
+#, fuzzy
+#~ msgid "subscribed folders"
+#~ msgstr "Eliminando a subscrición do cartafol «%s»"
+
+#, fuzzy
+#~ msgid "Authenticate"
+#~ msgstr "Autenticación"
+
+#, fuzzy
+#~ msgid "contact lists"
+#~ msgstr "Lista de contactos: "
+
+#~ msgid "Mail Notification"
+#~ msgstr "Notificación de correo"
+
+#~ msgid "Options"
+#~ msgstr "Opcións"
+
+#, fuzzy
+#~ msgid "Request Read Receipt"
+#~ msgstr "_Solicitar a confirmación de lectura"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Confirmacións de lectura das mensaxes"
+
+#, fuzzy
+#~ msgid "Backspace"
+#~ msgstr "_Copia de seguranza"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "&gt;"
+#~ msgstr "&gt;"
+
+#~ msgid "&lt;"
+#~ msgstr "&lt;"
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid "["
+#~ msgstr "["
+
+#, fuzzy
+#~ msgid "Page Down"
+#~ msgstr "Páxina %d"
+
+#, fuzzy
+#~ msgid "Send and Receive"
+#~ msgstr "Enviar / Recibir"
+
+#, fuzzy
+#~ msgid "Work online"
+#~ msgstr "_Traballar conectado"
+
+#, fuzzy
+#~ msgid "deleting emails"
+#~ msgstr "Recepción de correo"
+
+#, fuzzy
+#~ msgid "search folders"
+#~ msgstr "Cartafoles de busca"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#, fuzzy
+#~ msgid "New Label"
+#~ msgstr "Etiqueta _nova"
+
+#~ msgid "IMAP Features"
+#~ msgstr "Características IMAP"
+
+#, fuzzy
+#~ msgid "Basic Headers"
+#~ msgstr "Cabeceiras"
+
+#~ msgid "Custom Headers"
+#~ msgstr "Cabeceiras personalizadas"
+
+#, fuzzy
+#~ msgid "Click <placeholder-1/>"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Mark as"
+#~ msgstr "Marcar como correo l_ixo"
+
+#, fuzzy
+#~ msgid "Follow Up..."
+#~ msgstr "Seguimento…"
+
+#~ msgid "G"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Flag Completed"
+#~ msgstr "_Marcar como completado"
+
+#, fuzzy
+#~ msgid "Clear Flag"
+#~ msgstr "E_liminar a marca"
+
+#, fuzzy
+#~ msgid "add a Flag Status column"
+#~ msgstr "Estado das marcas"
+
+#, fuzzy
+#~ msgid "Mark as Important"
+#~ msgstr "Marcar como _importante"
+
+#~ msgid "Important"
+#~ msgstr "Importante"
+
+#, fuzzy
+#~ msgid "New Folder"
+#~ msgstr "Cartafol _novo…"
+
+#, fuzzy
+#~ msgid "Create"
+#~ msgstr "Creado"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover ao cartafol"
+
+#~ msgid "V"
+#~ msgstr "V"
+
+#, fuzzy
+#~ msgid "Apply Filters"
+#~ msgstr "_Aplicar os filtros"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "Select All"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "Message Filters"
+#~ msgstr "Filtros de mensaxe"
+
+#~ msgid "Then"
+#~ msgstr "Entón"
+
+#, fuzzy
+#~ msgid "Add Action"
+#~ msgstr "Engadir unha a_cción"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Deter o procesamento"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "_Accións"
+
+#~ msgid "filters.xml"
+#~ msgstr "filters.xml"
+
+#~ msgid "~/.evolution/mail/local/"
+#~ msgstr "~/.evolution/mail/local/"
+
+#~ msgid "~/.local/share/evolution/mail/local/"
+#~ msgstr "~/.local/share/evolution/mail/local/"
+
+#, fuzzy
+#~ msgid "Go"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Location..."
+#~ msgstr "Localización"
+
+#, fuzzy
+#~ msgid "Folder for sent messages"
+#~ msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
+
+#, fuzzy
+#~ msgid "added your certificate"
+#~ msgstr "Produciuse un fallo ao importar o certificado"
+
+#, fuzzy
+#~ msgid "S/MIME Sign"
+#~ msgstr "Asi_nar con S/MIME"
+
+#, fuzzy
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "_Cifrar 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 si_natura:"
+
+#, fuzzy
+#~ msgid "Encryption Certificate"
+#~ msgstr "Certificado de ci_frado:"
+
+#~ msgid "Certificates"
+#~ msgstr "Certificados"
+
+#~ msgid "Your Certificates"
+#~ msgstr "Os seus certificados"
+
+#, fuzzy
+#~ msgid "Import"
+#~ msgstr "I_mportar"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Contact Certificates"
+#~ msgstr "Certificados de contactos"
+
+#~ msgid "Authorities"
+#~ msgstr "Autoridades"
+
+#, fuzzy
+#~ msgid "PGP Sign"
+#~ msgstr "A_sinar con PGP"
+
+#, fuzzy
+#~ msgid "PGP Encrypt"
+#~ msgstr "C_ifrar con PGP"
+
+#, fuzzy
+#~ msgid "PGP/GPG Key ID"
+#~ msgstr "ID da _chave PGP/GPG:"
+
+#~ 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 seguranza"
+
+#~ msgid "gpg --gen-key"
+#~ msgstr "gpg --gen-key"
+
+#~ 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 "Eliminar as mensaxes du_plicadas"
+
+#~ msgid "$HOME/.local/share/evolution/mail/pop/"
+#~ msgstr "$HOME/.local/share/evolution/mail/pop/"
+
+#~ msgid "Headers"
+#~ msgstr "Cabeceiras"
+
+#, fuzzy
+#~ msgid "Show the photograph of sender in the message preview"
+#~ msgstr "_Mostrar a fotografía do remitente na previsualización das mensaxes"
+
+#, fuzzy
+#~ msgid "Search for sender photograph only in local address books"
+#~ msgstr ""
+#~ "B_uscar a fotografía do remitente só nas axendas de enderezos locais"
+
+#, fuzzy
+#~ msgid "Load Images"
+#~ msgstr "_Cargar as imaxes"
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "HTML Messages"
+#~ msgstr "Mensaxes HTML"
+
+#~ msgid "Loading Images"
+#~ msgstr "Cargando as imaxes"
+
+#, fuzzy
+#~ msgid "Load images only in messages from contacts"
+#~ msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
+
+#, fuzzy
+#~ msgid "Always show address of the autocompleted contact"
+#~ msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
+
+#, 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 "Visualización das mensaxes"
+
+#, fuzzy
+#~ msgid "Default character encoding"
+#~ msgstr "Codificació_n de caracteres predeterminada:"
+
+#, fuzzy
+#~ msgid "Show Deleted Messages"
+#~ msgstr "Mostrar as mensaxes _eliminadas"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Expurgar"
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#, fuzzy
+#~ msgid "Undelete message"
+#~ msgstr "_Recuperar a mensaxe"
+
+#, fuzzy
+#~ msgid "Mail Message"
+#~ msgstr "_Mensaxe de correo"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "_Enviar"
+
+#, fuzzy
+#~ msgid "Return"
+#~ msgstr "retorna"
+
+#~ msgid "Composer Preferences"
+#~ msgstr "Preferencias do editor"
+
+#~ msgid "Spell Checking"
+#~ msgstr "Comprobación ortográfica"
+
+#, fuzzy
+#~ msgid "Languages"
+#~ msgstr "I_diomas"
+
+#, fuzzy
+#~ msgid "Checking spelling while I type"
+#~ msgstr "Comprobar a ortografía men_tres escribe"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#, fuzzy
+#~ msgid "Bcc:"
+#~ msgstr "_Cco:"
+
+#, fuzzy
+#~ msgid "Bcc Field"
+#~ msgstr "Campo _Cco"
+
+#, fuzzy
+#~ msgid "Find"
+#~ msgstr "_Buscar agora"
+
+#, fuzzy
+#~ msgid "<placeholder-1/>:"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Respostas"
+
+#, fuzzy
+#~ msgid "Regular expressions"
+#~ msgstr "Expresión"
+
+#~ msgid "Reply"
+#~ msgstr "Responder"
+
+#~ msgid "Replies and Forwards"
+#~ msgstr "Respostas e reencamiñamentos"
+
+#, fuzzy
+#~ msgid "Forward style"
+#~ msgstr "Estilo do _reencamiñamento:"
+
+#, fuzzy
+#~ msgid "Insert"
+#~ msgstr "_Inserir"
+
+#, fuzzy
+#~ msgid "Prioritize Message"
+#~ msgstr "_Priorizar a mensaxe"
+
+#~ msgid "Templates"
+#~ msgstr "Modelos"
+
+#, fuzzy
+#~ msgid "Move to folder"
+#~ msgstr "Mover ao cartafol"
+
+#, fuzzy
+#~ msgid "Copy to folder"
+#~ msgstr "Copiar ao cartafol"
+
+#~ msgid "Save as Template"
+#~ msgstr "Gardar como un modelo"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#, fuzzy
+#~ msgid "encryption"
+#~ msgstr "Cifrado"
+
+#, fuzzy
+#~ msgid "Composer preferences"
+#~ msgstr "Preferencias do editor"
+
+#~ msgid "Signatures"
+#~ msgstr "Sinaturas"
+
+#, fuzzy
+#~ msgid "account settings"
+#~ msgstr "Axustes da conta de Yahoo:"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#, fuzzy
+#~ msgid "Header 1"
+#~ msgstr "Cabeceira"
+
+#, fuzzy
+#~ msgid "Header 6"
+#~ msgstr "Cabeceira"
+
+#, fuzzy
+#~ msgid "Preformat"
+#~ msgstr "Formato horario:"
+
+#, fuzzy
+#~ msgid "Bulleted List"
+#~ msgstr "_Eliminar a lista de notas"
+
+#, fuzzy
+#~ msgid "Table..."
+#~ msgstr "Táboa"
+
+#, fuzzy
+#~ msgid "Rule..."
+#~ msgstr "_Nome completo…"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Comportamento predeterminado:"
+
+#, fuzzy
+#~ msgid "Format messages in HTML"
+#~ msgstr "Formatar as mensaxes en _HTML"
+
+#, fuzzy
+#~ msgid "Insert Link"
+#~ msgstr "_Inserir"
+
+#, fuzzy
+#~ msgid "Image..."
+#~ msgstr "Imaxe"
+
+#~ msgid "Forward"
+#~ msgstr "Reencamiñar"
+
+#~ msgid "F"
+#~ msgstr "F"
+
+#, fuzzy
+#~ msgid "Forward as"
+#~ msgstr "Reencamiñar c_omo…"
+
+#, fuzzy
+#~ msgid "Forward as..."
+#~ msgstr "_Reencamiñar o contacto…"
+
+#, fuzzy
+#~ msgid "Forward Style"
+#~ msgstr "Estilo do _reencamiñamento:"
+
+#~ msgid "Custom Header"
+#~ msgstr "Cabeceira 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 da data e da hora"
+
+#, fuzzy
+#~ msgid "Add a Column..."
+#~ msgstr "Engadir unha c_olumna…"
+
+#~ msgid "Read Messages"
+#~ msgstr "Mensaxes lidas"
+
+#, fuzzy
+#~ msgid "Show Message Preview"
+#~ msgstr "Mostrar a _previsualización da mensaxe"
+
+#, fuzzy
+#~ msgid "Show Hidden Messages"
+#~ msgstr "Mensaxes enviadas"
+
+#, fuzzy
+#~ msgid "Email Accounts"
+#~ msgstr "Contas de correo"
+
+#, fuzzy
+#~ msgid "Forward as iCalendar"
+#~ msgstr "Reemcamiña_r como iCalendar…"
+
+#, fuzzy
+#~ msgid "Add Attachment..."
+#~ msgstr "Eng_adir anexo…"
+
+#, fuzzy
+#~ msgid "Save All"
+#~ msgstr "G_ardar todo"
+
+#, fuzzy
+#~ msgid "Save As"
+#~ msgstr "Gardar _como…"
+
+#, fuzzy
+#~ msgid "Image Viewer"
+#~ msgstr "Ficheiros de imaxe"
+
+#, fuzzy
+#~ msgid "First-Run Assistant"
+#~ msgstr "Uso do asistente para a primeira execución"
+
+#, fuzzy
+#~ msgid "Configuration instructions"
+#~ msgstr "Versión de configuración"
+
+#~ msgid "Other"
+#~ msgstr "Outros"
+
+#, fuzzy
+#~ msgid "Standard Instructions"
+#~ msgstr "Tipo de letra es_tándar:"
+
+#, fuzzy
+#~ msgid "GMail Help"
+#~ msgstr "Destinatario do correo"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Estilo da disposición"
+
+#, fuzzy
+#~ msgid "Show Side Bar"
+#~ msgstr "Mostrar a _barra lateral"
+
+#, fuzzy
+#~ msgid "Contact Preview"
+#~ msgstr "_Previsualización do contacto"
+
+#, fuzzy
+#~ msgid "Server Type"
+#~ msgstr "_Tipo de servidor:"
+
+#, fuzzy
+#~ msgid "Standard Unix Mbox Spool"
+#~ msgstr "Ficheiro spool mbox estándar de Unix:"
+
+#, fuzzy
+#~ msgid "Continue with <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "configure a Maildir account"
+#~ msgstr "Configurar as contas de correo"
+
+#~ msgid "Importer Type"
+#~ msgstr "Tipo de importador"
+
+#, fuzzy
+#~ msgid "Import a single file"
+#~ msgstr "Importar un úni_co ficheiro"
+
+#, fuzzy
+#~ msgid "Mail Folder"
+#~ msgstr "Carta_fol de correo"
+
+#, fuzzy
+#~ msgid "folders"
+#~ msgstr "Cartafoles específicos"
+
+#, fuzzy
+#~ msgid "Import single file"
+#~ msgstr "Importar un úni_co ficheiro"
+
+#, fuzzy
+#~ msgid "File type"
+#~ msgstr "_Tipo de ficheiro:"
+
+#, fuzzy
+#~ msgid "old Evolution manual"
+#~ msgstr "Calendario do Evolution"
+
+#~ msgid "evolution --express"
+#~ msgstr "evolution --express"
+
+#, fuzzy
+#~ msgid "Save as mbox..."
+#~ msgstr "Gardar como mbox…"
+
+#, fuzzy
+#~ msgid "Save Address Book As vCard"
+#~ msgstr "G_ardar a axenda de enderezos como VCard"
+
+#, fuzzy
+#~ msgid "Save Contact as VCard"
+#~ msgstr "Gardar os contactos seleccionados como unha VCard"
+
+#~ msgid "Save as vCard"
+#~ msgstr "Gardar como vCard"
+
+#, fuzzy
+#~ msgid "Save as"
+#~ msgstr "Gardar como…"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Gardar como vCard…"
+
+#, fuzzy
+#~ msgid "Empty Trash"
+#~ msgstr "_Baleirar o lixo"
+
+#, fuzzy
+#~ msgid "Remove Attachments"
+#~ msgstr "Eliminar os _anexos"
+
+#, fuzzy
+#~ msgid "Purge"
+#~ msgstr "P_urgar"
+
+#, fuzzy
+#~ msgid "Activities"
+#~ msgstr "Autoridades"
+
+#, fuzzy
+#~ msgid "System Settings"
+#~ msgstr "Axustes"
+
+#, fuzzy
+#~ msgid "Default Applications"
+#~ msgstr "Comportamento predeterminado:"
+
+#~ msgid "$HOME/.local/share/applications/mimeapps.list"
+#~ msgstr "$HOME/.local/share/applications/mimeapps.list"
+
+#~ msgid "Contact List"
+#~ msgstr "Lista de contactos"
+
+#~ msgid "Select..."
+#~ msgstr "Seleccionar…"
+
+#, fuzzy
+#~ msgid "Send Message to List"
+#~ msgstr "Enviar unha _mensaxe á lista"
+
+#, fuzzy
+#~ msgid "Delete Contact"
+#~ msgstr "E_liminar o contacto"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Full Name"
+#~ msgstr "Nome completo"
+
+#, fuzzy
+#~ msgid "Edit Full"
+#~ msgstr "_Editar completo"
+
+#~ msgid "Contact Editor"
+#~ msgstr "Editor de contactos"
+
+#~ msgid "Address Book"
+#~ msgstr "Axenda de enderezos"
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "En servidores LDAP"
+
+#~ msgid "Details"
+#~ msgstr "Información"
+
+#~ 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 _as entradas da axenda de enderezos ao enviar as mensaxes"
+
+#, fuzzy
+#~ msgid "Switcher Appearance"
+#~ msgstr "Aparencia do _selector"
+
+#~ msgid "Weather"
+#~ msgstr "O tempo"
+
+#, fuzzy
+#~ msgid "Delete Appointment"
+#~ msgstr "_Eliminar esta cita"
+
+#~ msgid "Appointment"
+#~ msgstr "Cita"
+
+#~ msgid "Summary"
+#~ msgstr "Resumo"
+
+#, fuzzy
+#~ msgid "For"
+#~ msgstr "ou"
+
+#, fuzzy
+#~ msgid "Until"
+#~ msgstr "_Até"
+
+#, fuzzy
+#~ msgid "Show Time as Busy"
+#~ msgstr "Mostrar a hora como oc_upada"
+
+#, fuzzy
+#~ msgid "reminder"
+#~ msgstr "Aviso"
+
+#, fuzzy
+#~ msgid "recurrence"
+#~ msgstr "Repetición"
+
+#, fuzzy
+#~ msgid "Time zone"
+#~ msgstr "Fuso horario:"
+
+#, fuzzy
+#~ msgid "Second zone"
+#~ msgstr "Fuso se_cundario:"
+
+#, fuzzy
+#~ msgid "add a new or edit an existing appointment"
+#~ msgstr "Converte unha reunión nunha cita"
+
+#~ msgid "Recurrence"
+#~ msgstr "Repetición"
+
+#, fuzzy
+#~ msgid "Appointment Editor"
+#~ msgstr "Cita"
+
+#~ msgid "Exceptions"
+#~ msgstr "Excepcións"
+
+#, fuzzy
+#~ msgid "Publish Calendar Information"
+#~ msgstr "_Publicar a información do calendario"
+
+#~ msgid "Organizer"
+#~ msgstr "Organizador"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Role"
+#~ msgstr "Función"
+
+#~ msgid "RSVP"
+#~ msgstr "RSVP"
+
+#, fuzzy
+#~ msgid "free/busy"
+#~ msgstr "Dispoñibilidade"
+
+#~ msgid "Free/Busy"
+#~ msgstr "Dispoñibilidade"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Decline"
+#~ msgstr "Rexeitar"
+
+#~ msgid "Conflict Search"
+#~ msgstr "Busca de conflitos"
+
+#~ msgid "K"
+#~ msgstr "K"
+
+#, fuzzy
+#~ msgid "Current View"
+#~ msgstr "Visualización act_ual"
+
+#~ msgid "Select today"
+#~ msgstr "Seleccionar o día de hoxe"
+
+#~ msgid "Select a specific date"
+#~ msgstr "Seleccionar unha data determinada"
+
+#, fuzzy
+#~ msgid "<placeholder-1/> and Second zone:"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "meeting invitations"
+#~ msgstr "O servidor ma_nexa as invitacións á reunión"
+
+#, fuzzy
+#~ msgid "Autopick"
+#~ msgstr "Seleccionar _automaticamente"
+
+#~ msgid "Personal Information"
+#~ msgstr "Datos persoais"
+
+#~ msgid "Web Addresses"
+#~ msgstr "Enderezos web"
+
+#~ msgid "Public"
+#~ msgstr "Público"
+
+#~ msgid "Private"
+#~ msgstr "Privado"
+
+#~ msgid "Confidential"
+#~ msgstr "Confidencial"
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#, fuzzy
+#~ msgid "Back up Evolution Settings..."
+#~ msgstr "_Respaldar axustes de Evolution…"
+
+#~ msgid "Yes"
+#~ msgstr "Si"
+
+#, fuzzy
+#~ msgid "Restore Evolution Settings..."
+#~ msgstr "R_estabelecer axustes de Evolution…"
+
+#, fuzzy
+#~ msgid "first-run assistant"
+#~ msgstr "Uso do asistente para a primeira execución"
+
 #~ msgid "2002-2009"
 #~ msgstr "2002-2009"
 
@@ -12841,18 +11912,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 ""
-#~ "A primeira vez que execute Evolution, este crea un cartafol chamado "
-#~ "<emphasis>.evolution</emphasis> no seu cartafol persoal, onde almacena "
-#~ "toda a súa información local. Despois abrirase un asistente, só a "
-#~ "primeira vez, co fin de axudarlle a configurar as súas contas de correo, "
-#~ "así como para importar datos de outros aplicativos."
-
 #~ msgid "Using the first-run assistant takes two to five minutes."
 #~ msgstr ""
 #~ "O asistente de primeiro inicio require entre dous e cinco minutos do seu "