[evolution] Update Spanish translation



commit 7e985ce35d6178f023a14cfdffb2f15fa3d2a6ee
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Dec 15 09:08:51 2016 +0000

    Update Spanish translation

 po/es.po | 1988 +++++++++++++++++++++-----------------------------------------
 1 files changed, 678 insertions(+), 1310 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 5d9f05a..394df4e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-11-25 09:28+0000\n"
-"PO-Revision-Date: 2016-12-12 16:31+0100\n"
+"POT-Creation-Date: 2016-12-12 21:25+0000\n"
+"PO-Revision-Date: 2016-12-15 10:01+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: es <gnome-es-list gnome org>\n"
 "Language: es\n"
@@ -49,12 +49,6 @@ msgstr ""
 "funcionalidades de correo, calendario y libreta de direcciones."
 
 #: ../evolution.appdata.xml.in.h:4
-#| msgid ""
-#| "Evolution supports a wide range of industry standard data formats and "
-#| "network protocols for information exchange, with an emphasis on standards "
-#| "compliance and security. Evolution can also integrate smoothly with "
-#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
-#| "extension."
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -193,11 +187,6 @@ msgid "Contact layout style"
 msgstr "Estilo de distribución de los contactos"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the contact list. \"0\" (Classic View) places the preview pane below "
-#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
-#| "the contact list."
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. “0” (Classic View) places the preview pane below the "
@@ -242,9 +231,6 @@ msgid "Primary address book"
 msgstr "Libreta de direcciones primaria"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#| msgid ""
-#| "The UID of the selected (or \"primary\") address book in the sidebar of "
-#| "the \"Contacts\" view"
 msgid ""
 "The UID of the selected (or “primary”) address book in the sidebar of the "
 "“Contacts” view"
@@ -358,9 +344,6 @@ msgid "Birthday and anniversary reminder units"
 msgstr "Unidades del recordatorio de cumpleaños y aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#| msgid ""
-#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-#| "\"days\""
 msgid ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
@@ -528,9 +511,6 @@ msgid "The second timezone for a Day View"
 msgstr "La segunda zona horaria para una Vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#| msgid ""
-#| "Shows the second time zone in a Day View, if set. Value is similar to one "
-#| "used in a 'timezone' key"
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a “timezone” key"
@@ -552,9 +532,6 @@ msgid "Maximum number of recently used timezones to remember"
 msgstr "Número máximo de zonas horarias usadas recientemente para recordar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#| msgid ""
-#| "Maximum number of recently used timezones to remember in a 'day-second-"
-#| "zones' list"
 msgid ""
 "Maximum number of recently used timezones to remember in a “day-second-"
 "zones” list"
@@ -575,7 +552,6 @@ msgid "Default reminder units"
 msgstr "Unidades predeterminadas del recordatorio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgid "Units for a default reminder, “minutes”, “hours” or “days”"
 msgstr ""
 "Unidades para el recordatorio predeterminado, «minutes», «hours» o «days»"
@@ -672,9 +648,6 @@ msgid "Hide task units"
 msgstr "Ocultar Lista de tareas nueva"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#| msgid ""
-#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
-#| "\""
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, «minutes», «hours» o «days»"
@@ -708,7 +681,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "La hora en que el último recordatorio sonó, en time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#| msgid "Marcus Bains Line Color - Day View"
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Color de la línea de Marcus Bains: vista de día"
 
@@ -717,7 +689,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Color para dibujar la línea de Marcus Bains en la vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#| msgid "Marcus Bains Line Color - Time bar"
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Color de la línea de Marcus Bains: barra de tiempo"
 
@@ -753,11 +724,6 @@ msgid "Memo layout style"
 msgstr "Estilo de la distribución de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the memo list. \"0\" (Classic View) places the preview pane below the "
-#| "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
-#| "list"
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. “0” (Classic View) places the preview pane below the memo "
@@ -843,9 +809,6 @@ msgid "Primary calendar"
 msgstr "Calendario primario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-#| msgid ""
-#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
-#| "\"Calendar\" view"
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
@@ -858,9 +821,6 @@ msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#| msgid ""
-#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
-#| "\"Memos\" view"
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
@@ -873,9 +833,6 @@ msgid "Primary task list"
 msgstr "Lista de tareas primaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#| msgid ""
-#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
-#| "\"Tasks\" view"
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
@@ -946,7 +903,6 @@ msgid "Show the memo preview pane"
 msgstr "Mostrar el panel de vista previa de las notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#| msgid "If \"true\", show the memo preview pane in the main window"
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr ""
 "Si es cierto mostrará el panel de vista previa de notas en la ventana "
@@ -957,7 +913,6 @@ msgid "Show the task preview pane"
 msgstr "Mostrar el panel de vista previa de las tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#| msgid "If \"true\", show the task preview pane in the main window"
 msgid "If “true”, show the task preview pane in the main window"
 msgstr ""
 "Si es cierto mostrará el panel de vista previa de tareas en la ventana "
@@ -995,9 +950,6 @@ msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#| msgid ""
-#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-#| "together with task-due-today-highlight"
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
@@ -1014,11 +966,6 @@ msgid "Task layout style"
 msgstr "Estilo de distribución de las tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the task list. \"0\" (Classic View) places the preview pane below the "
-#| "task list. \"1\" (Vertical View) places the preview pane next to the task "
-#| "list"
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. “0” (Classic View) places the preview pane below the task "
@@ -1067,9 +1014,6 @@ msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
-#| msgid ""
-#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-#| "together with task-overdue-highlight."
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -1092,9 +1036,6 @@ msgid "Timezone"
 msgstr "Zona horaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
-#| msgid ""
-#| "The default timezone to use for dates and times in the calendar, as an "
-#| "untranslated Olson timezone database location like \"America/New York\""
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -1184,9 +1125,6 @@ msgstr ""
 "(Obsoleto) Primer día de la semana, desde el domingo (0) hasta el sábado (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"week-start-day-name\" instead."
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -1199,10 +1137,6 @@ msgid "(Deprecated) Work days"
 msgstr "(Obsoleto) Días laborables"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
-#| msgid ""
-#| "Days on which the start and end of work hours should be indicated. (This "
-#| "key was deprecated in version 3.10 and should no longer be used. Use the "
-#| "\"work-day-monday\", \"work-day-tuesday\", etc. keys instead.)"
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the “work-"
@@ -1218,10 +1152,6 @@ msgid "Previous Evolution version"
 msgstr "Versión anterior de Evolution"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#| msgid ""
-#| "The most recently used version of Evolution, expressed as \"major.minor."
-#| "micro\". This is used for data and settings migration from older to newer "
-#| "versions."
 msgid ""
 "The most recently used version of Evolution, expressed as “major.minor."
 "micro”. This is used for data and settings migration from older to newer "
@@ -1240,22 +1170,18 @@ msgid "The list of disabled plugins in Evolution"
 msgstr "La lista de complementos desactivados de Evolution"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#| msgid "The window's X coordinate"
 msgid "The window’s X coordinate"
 msgstr "La coordenada X de la ventana"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
-#| msgid "The window's Y coordinate"
 msgid "The window’s Y coordinate"
 msgstr "La coordenada Y de la ventana"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#| msgid "The window's width in pixels"
 msgid "The window’s width in pixels"
 msgstr "La anchura de la ventana en píxeles"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#| msgid "The window's height in pixels"
 msgid "The window’s height in pixels"
 msgstr "La altura de la ventana en píxeles"
 
@@ -1264,22 +1190,26 @@ msgid "Whether the window is maximized"
 msgstr "Indica si la ventana está maximizada"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-#| msgid "Gnome Calendar's calendar import done"
-msgid "Gnome Calendar’s calendar import done"
+#| msgid "Gnome Calendar’s calendar import done"
+msgid "GNOME Calendar’s calendar import done"
 msgstr "Importación del calendario de GNOME terminada"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Whether calendar from Gnome Calendar has been imported or not"
-msgstr "Indica si el calendario de GNOME se ha importado o no"
+#| msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgid "Whether calendar from GNOME Calendar has been imported or not"
+msgstr ""
+"Indica si el calendario se ha importado desde el calendario de GNOME o no"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-#| msgid "Gnome Calendar's tasks import done"
-msgid "Gnome Calendar’s tasks import done"
+#| msgid "Gnome Calendar’s tasks import done"
+msgid "GNOME Calendar’s tasks import done"
 msgstr "Importación de las tareas del calendario de GNOME terminada"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-msgid "Whether tasks from Gnome Calendar have been imported or not"
-msgstr "Indica si las tareas del calendario de GNOME se han importado o no"
+#| msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgid "Whether tasks from GNOME Calendar have been imported or not"
+msgstr ""
+"Indica si las tareas se han importado desde el calendario de GNOME o no"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -1307,9 +1237,6 @@ msgid "Name of the editor to prefer in the message composer"
 msgstr "Nombre del editor preferido para redactar mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#| msgid ""
-#| "If the name doesn't correspond to any known editor, then the built-in "
-#| "WebKit editor is used."
 msgid ""
 "If the name doesn’t correspond to any known editor, then the built-in WebKit "
 "editor is used."
@@ -1322,10 +1249,6 @@ msgid "Path where picture gallery should search for its content"
 msgstr "Ruta donde la galería de imágenes debería buscar su contenido"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#| msgid ""
-#| "This value can be an empty string, which means it'll use the system "
-#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
-#| "when the set path is not pointing to the existent folder"
 msgid ""
 "This value can be an empty string, which means it’ll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -1414,11 +1337,6 @@ msgid "Group Reply replies to list"
 msgstr "Responder al grupo responde a la lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#| msgid ""
-#| "Instead of the normal \"Reply to All\" behaviour, this option will make "
-#| "the 'Group Reply' toolbar button try to reply only to the mailing list "
-#| "through which you happened to receive the copy of the message to which "
-#| "you're replying."
 msgid ""
 "Instead of the normal “Reply to All” behaviour, this option will make the "
 "“Group Reply” toolbar button try to reply only to the mailing list through "
@@ -1472,14 +1390,10 @@ msgstr ""
 "Lista de los códigos de diccionario usados para la corrección ortográfica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#| msgid "Show \"Bcc\" field when sending a mail message"
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "Mostrar el campo «Cco» al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#| msgid ""
-#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Bcc” field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -1488,14 +1402,10 @@ msgstr ""
 "desde el menú Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show “Cc” field when sending a mail message"
 msgstr "Mostrar el campo «Cc» al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Cc” field when sending a mail message. This is controlled from the "
 "View menu when a mail account is chosen."
@@ -1504,14 +1414,10 @@ msgstr ""
 "el menú Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#| msgid "Show \"From\" override field when sending a mail message"
 msgid "Show “From” override field when sending a mail message"
 msgstr "Mostrar el campo «De» al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#| msgid ""
-#| "Show the \"From\" override field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
 msgid ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -1520,14 +1426,10 @@ msgstr ""
 "el menú Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#| msgid "Show \"Reply To\" field when sending a mail message"
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "Mostrar el campo «Responder a» al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#| msgid ""
-#| "Show the \"Reply To\" field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -1536,14 +1438,10 @@ msgstr ""
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#| msgid "Show \"From\" field when posting to a newsgroup"
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "Mostrar el campo «De» al publicar en un grupo de noticias"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#| msgid ""
-#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
-#| "from the View menu when a news account is chosen."
 msgid ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -1552,14 +1450,10 @@ msgstr ""
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#| msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "Mostrar el campo «Responder a» al publicar en un grupo de noticias"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#| msgid ""
-#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
-#| "controlled from the View menu when a news account is chosen."
 msgid ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -1639,14 +1533,6 @@ msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para listas:"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#| msgid ""
-#| "Some mailing lists set a Reply-To: header to trick users into sending "
-#| "replies to the list, even when they ask Evolution to make a private "
-#| "reply. Setting this option to TRUE will attempt to ignore such Reply-To: "
-#| "headers, so that Evolution will do as you ask it. If you use the private "
-#| "reply action, it will reply privately, while if you use the 'Reply to "
-#| "List' action it will do that. It works by comparing the Reply-To: header "
-#| "with a List-Post: header, if there is one."
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -1666,15 +1552,10 @@ msgstr ""
 "Post:», si existe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#| msgid "List of localized 'Re'"
 msgid "List of localized “Re”"
 msgstr "Lista de «Re» traducidas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#| msgid ""
-#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-#| "text when replying to a message, as an addition to the standard \"Re\" "
-#| "prefix. An example is 'SV,AV'."
 msgid ""
 "Comma-separated list of localized “Re” abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard “Re” prefix. "
@@ -1685,42 +1566,55 @@ msgstr ""
 "estándar. Por ejemplo, «SV,AV»"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#| msgid "List of localized “Re”"
+msgid "List of localized “Re” separators"
+msgstr "Lista de separadores de «Re» traducidos"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#| msgid ""
+#| "Comma-separated list of localized “Re” abbreviations to skip in a subject "
+#| "text when replying to a message, as an addition to the standard “Re” "
+#| "prefix. An example is “SV,AV”."
+msgid ""
+"A list of localized “Re” separators, used to skip in a subject text when "
+"replying to a message, as an addition to the standard “:” and the Unicode "
+"“︰” separators."
+msgstr ""
+"Lista de separadores «Re» traducidas, usada para omitir en el texto del "
+"asunto al responder a un mensaje, añadidas a los separadores «:» y «︰» "
+"estándar de Unicode."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Number of characters for wrapping"
 msgstr "Número de caracteres al ajustar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
 "Las líneas se ajustarán automáticamente después del número de caracteres "
 "dados."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#| msgid ""
-#| "Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid ""
 "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr ""
 "Número de destinatarios Para y Cc desde el que preguntar en 'prompt-on-many-"
 "to-cc-recips'"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
 "Cuándo preguntar, cuándo el número de destinatarios Para y Cc alcanza este "
 "valor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr ""
 "Indica si deben mostrar siempre los botones Firmar y Cifrar en la barra de "
 "herramientas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#| msgid ""
-#| "If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME "
-#| "are always shown in the composer's toolbar. Otherwise they are shown only "
-#| "when being used."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
 "always shown in the composer’s toolbar. Otherwise they are shown only when "
@@ -1730,24 +1624,20 @@ msgstr ""
 "herramientas del editor, tanto para PGP como para S/MIME. De otro modo, sólo "
 "se muestran cuando se usan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Wrap quoted text in replies"
 msgstr "Ajustar el texto citado en las respuestas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#| msgid "If set to 'true' quoted text in replies will be wrapped."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "Si es cierto, el texto citado se ajustará en las respuestas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr ""
 "Indica si se debe obedecer la cabecera del mensaje Content-Disposition:inline"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#| msgid ""
-#| "Set to 'false' to block automatic display of attachments with Content-"
-#| "Disposition: inline."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
@@ -1755,20 +1645,19 @@ msgstr ""
 "Establecer a 'false' para bloquear automáticamente el visualizar adjunto con "
 "Content-Disposition: inline."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Save file format for drag-and-drop operation"
 msgstr "Guardar el formato de archivo para la operación de arrastrar y soltar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#| msgid "Can be either 'mbox' or 'pdf'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Puede ser «mbox» o «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show image animations"
 msgstr "Mostrar imágenes animadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1776,11 +1665,11 @@ msgstr ""
 "Activar imágenes animadas en correos HTML. Muchos usuarios consideran "
 "molestas las imágenes animadas y prefieren ver una imagen estática."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable or disable type ahead search feature"
 msgstr "Activa o desactiva la característica de búsqueda al teclear"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1788,11 +1677,11 @@ msgstr ""
 "Activar la característica barra de búsqueda lateral para permitir búsquedas "
 "interactivas de nombres de carpetas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1800,61 +1689,59 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#| msgid "Mark citations in the message \"Preview\""
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark citations in the message “Preview”"
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#| msgid "Mark citations in the message \"Preview\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark citations in the message “Preview”."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Cargar imágenes automáticamente para mensajes HTML sobre HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show notification about missing remote content"
 msgstr "Mostrar una notificación de que falta contenido remoto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -1865,27 +1752,27 @@ msgstr ""
 "o el sitio, mostrar una notificación acerca de esto en la parte superior del "
 "panel de vista previa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Show animated images as animations."
 msgstr "Mostrar las imágenes animadas como animaciones."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show all message headers"
 msgstr "Mostrar todas las cabeceras del mensaje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas las cabeceras al ver mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "List of headers to show when viewing a message."
 msgstr "Lista de cabeceras que mostrar al ver un mensaje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -1896,35 +1783,35 @@ msgstr ""
 "desactivadas no se muestran al ver un mensaje, pero se siguen listando en "
 "las Preferencias."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Buscar en gravatar.com la foto del remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "Permitir buscar en gravatar.com la foto del remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Mark as Seen always after specified timeout"
 msgstr "Marcar siempre como visto después del tiempo especificado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -1932,19 +1819,19 @@ msgstr ""
 "Si es cierto, el mensaje seleccionado se marcará como no leído después de un "
 "tiempo y después del cambio de carpeta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Timeout for marking messages as seen"
 msgstr "Tiempo para marcar mensajes como vistos"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Tiempo en milisegundos para marcar mensajes como vistos."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Show Attachment Bar"
 msgstr "Mostrar la barra de adjuntos"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
@@ -1952,11 +1839,11 @@ msgstr ""
 "Mostrar la barra de adjuntos debajo del panel de vista del mensaje cuanto "
 "este tiene adjunto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -1964,27 +1851,27 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes eliminados en la lista de mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar los mensajes eliminados (tachados) en la lista de mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show junk messages in the message-list"
 msgstr "Mostrar el correo basura en la lista de mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Mostrar el corre basura (tachado en rojo) en la lista de mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Enable Unmatched search folder"
 msgstr "Activar la carpeta de búsqueda no coincidente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -1992,14 +1879,11 @@ msgstr ""
 "Activar la carpeta de búsqueda no coincidente en las carpetas de búsqueda. "
 "Si las carpetas de búsqueda están desactivadas, no hace nada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selección"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#| msgid ""
-#| "This key is read only once and reset to \"false\" after read. This "
-#| "unselects the mail in the list and removes the preview for that folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "This key is read only once and reset to “false” after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -2008,38 +1892,33 @@ msgstr ""
 "«false». Esto deselecciona el correo en la lista y elimina la vista previa "
 "para esa carpeta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 "Indica si las cabeceras del mensaje están contraídas en la interfaz de "
 "usuario"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Layout style"
 msgstr "Estilo de la distribución"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the message list. \"0\" (Classic View) places the preview pane below "
-#| "the message list. \"1\" (Vertical View) places the preview pane next to "
-#| "the message list."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. “0” (Classic View) places the preview pane below the "
@@ -2051,35 +1930,35 @@ msgstr ""
 "vista previa debajo de la lista de correos. «1» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de correos."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "The variable width font for mail display."
 msgstr "La tipografía de anchura variable para mostrar el correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "The terminal font for mail display."
 msgstr "La tipografía de terminal para mostrar el correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografía personalizada para mostrar el correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir la visualización de direcciones en A/CC/CCO"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -2087,14 +1966,11 @@ msgstr ""
 "Comprime la visualización de direcciones en A/CC/CCO al número especificado "
 "en address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#| msgid ""
-#| "This sets the number of addresses to show in default message list view, "
-#| "beyond which a '...' is shown."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -2102,11 +1978,11 @@ msgstr ""
 "Esto establece el número de direcciones que mostrar en la vista de lista de "
 "mensajes predeterminada, más allá de los cuales se muestra un «…»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -2114,11 +1990,11 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras «In-Reply-To» o «References»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -2127,17 +2003,13 @@ msgstr ""
 "deberían estar en estado expandido o contraído. Evolution necesita "
 "reiniciarse para aplicarlo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica si ordenar las conversaciones basándose en el último mensaje de esa "
 "conversación"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#| msgid ""
-#| "This setting specifies whether the threads should be sorted based on "
-#| "latest message in each thread, rather than by message's date. Evolution "
-#| "requires a restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message’s date. Evolution requires a "
@@ -2147,11 +2019,11 @@ msgstr ""
 "último mensaje de cada conversación, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Whether sort thread children always ascending"
 msgstr "Indica si los hijos se deben ordenar siempre en orden ascendente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -2160,11 +2032,11 @@ msgstr ""
 "siempre ascendentemente, en lugar de usando la misma ordenación que en la "
 "raíz de las conversaciones."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenar cuentas alfabéticamente en un árbol de carpetas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -2176,31 +2048,27 @@ msgstr ""
 "alfabéticamente, con la excepción de En este equipo y Carpetas de búsqueda, "
 "de lo contrario las carpetas se ordenan por el orden dado por el usuario"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Flush Outbox after filtering"
 msgstr "Limpiar la bandeja de salida después de filtrar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#| msgid ""
-#| "Whether to flush Outbox after filtering is done. Outbox flush will happen "
-#| "only when there was used any 'Forward to' filter action and approximately "
-#| "one minute after the last action invocation."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any “Forward to” filter action and approximately "
@@ -2211,19 +2079,19 @@ msgstr ""
 "algún filtro de acción «Reenviar a» y, aproximadamente, un minuto después de "
 "la última invocación a una acción."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Preguntar al enviar usando un acelerador del teclado (Ctrl+Intro)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -2231,38 +2099,38 @@ msgstr ""
 "Preguntar al usuario cuando intente enviar un correo con un acelerador del "
 "teclado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un correo sin un asunto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when emptying the trash"
 msgstr "Preguntar al vaciar la papelera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Preguntar al usuario cuando intente vaciar la papelera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente purgar una carpeta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a los destinatarios no introducidos como "
 "direcciones de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -2271,31 +2139,31 @@ msgstr ""
 "que está enviando un mensaje a destinatarios no introducidos como una "
 "dirección de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2303,19 +2171,19 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios correos"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al eliminar correos en carpetas de búsqueda"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -2325,18 +2193,13 @@ msgstr ""
 "correos de una carpeta de búsqueda elimina permanentemente el correo, no "
 "sólo los elimina de los resultados de la búsqueda."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pregunta si se deben copiar carpetas arrastrando y soltando en el árbol de "
 "carpetas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#| msgid ""
-#| "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
-#| "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of "
 "folders in folder tree, “always” — allow copy with drag &amp; drop of "
@@ -2348,18 +2211,13 @@ msgstr ""
 "permitir mover carpetas arrastrando y soltando en el árbol de carpetas o "
 "«ask» (preguntar) o cualquier otro valor, para preguntar al usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pregunta si se deben mover carpetas arrastrando y soltando en el árbol de "
 "carpetas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#| msgid ""
-#| "Possible values are: 'never' - do not allow move with drag &amp; drop of "
-#| "folders in folder tree, 'always' - allow move with drag &amp; drop of "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of "
 "folders in folder tree, “always” — allow move with drag &amp; drop of "
@@ -2371,11 +2229,11 @@ msgstr ""
 "permitir mover carpetas arrastrando y soltando en el árbol de carpetas o "
 "«ask» (preguntar) o cualquier otro valor, para preguntar al usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when replying privately to list messages"
 msgstr "Preguntar al responder de forma privada a correos de una lista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -2384,11 +2242,11 @@ msgstr ""
 "que está enviando una respuesta privada a un correo que llegó a través de "
 "una lista de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -2399,11 +2257,11 @@ msgstr ""
 "una lista de correo, pero la lista establece una cabecera «Responder a:» que "
 "redirecciona su respuesta de nuevo a la lista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when replying to many recipients"
 msgstr "Preguntar al responder a muchos desinatarios"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -2411,31 +2269,34 @@ msgstr ""
 "Desactiva o activa los mensajes repetitivos para avisarle de que está "
 "enviando una respuesta a mucha gente."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#| msgid ""
+#| "Prompt when switching composer mode and the content needs to lose its "
+#| "formatting"
 msgid ""
-"Prompt when switching composer mode and the content needs to lose its "
+"Prompt when switching composer format and the content needs to lose its "
 "formatting"
 msgstr ""
-"Preguntar al cambiar el modo del editor y el contenido necesita perder su "
+"Preguntar al cambiar el formato del editor y el contenido necesita perder su "
 "formato"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are switching "
+#| "composer mode and the content needs to lose its formatting."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
-"composer mode and the content needs to lose its formatting."
+"composer format and the content needs to lose its formatting."
 msgstr ""
 "Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
-"que está cambiando el modo del editor y que el contenido necesita perder su "
-"formato."
+"que está cambiando el formato del editor y que el contenido necesita perder "
+"su formato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Preguntar al enviar a muchos desinatarios y CC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#| msgid ""
-#| "Enable or disable the prompt when sending to many To and CC recipients. "
-#| "The 'composer-many-to-cc-recips-num' defines the threshold."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2443,7 +2304,7 @@ msgstr ""
 "Activar o desactivar el preguntar al enviar a varios destinatarios Para y "
 "Cc. El valor 'composer-many-to-cc-recips-num' define el umbral."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -2451,46 +2312,43 @@ msgstr ""
 "Política para cerrar automáticamente la ventana del examinador de mensajes "
 "al reenviar o responder el mensaje mostrado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Last time Empty Trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La última vez que se vació la papelera, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#| msgid ""
-#| "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-#| "debug messages."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2498,16 +2356,11 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
 "«2» para mensajes de depuración."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#| msgid "Show original \"Date\" header value."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Show original “Date” header value."
 msgstr "Mostrar el valor original de la cabecera «Fecha»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#| msgid ""
-#| "Show the original \"Date\" header (with a local time only if the time "
-#| "zone differs). Otherwise always show \"Date\" header value in a user "
-#| "preferred format and local time zone."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone "
 "differs). Otherwise always show “Date” header value in a user preferred "
@@ -2518,11 +2371,11 @@ msgstr ""
 "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -2531,50 +2384,46 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Last time Empty Junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La última vez que se vació el SPAM, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
-#| msgid ""
-#| "This is the default junk plugin, even though there are multiple plugins "
-#| "enabled. If the default listed plugin is disabled, then it won't fall "
-#| "back to the other available plugins."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
@@ -2584,18 +2433,13 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado está "
 "desactivado, entonces no usará los otros complementos disponibles."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
-#| msgid ""
-#| "Determines whether to lookup the sender email in address book. If found, "
-#| "it shouldn't be a spam. It looks up in the books marked for "
-#| "autocompletion. It can be slow, if remote address books (like LDAP) are "
-#| "marked for autocompletion."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
@@ -2607,7 +2451,7 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2615,7 +2459,7 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -2626,12 +2470,12 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -2641,14 +2485,11 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
-#| msgid ""
-#| "Custom headers to use while checking for junk. The list elements are "
-#| "string in the format \"headername=value\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2656,31 +2497,31 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Save directory"
 msgstr "Carpeta donde guardar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Directory for saving mail component files."
 msgstr "Carpeta para guardar archivos enviados por correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Composer load/attach directory"
 msgstr "Carpeta de carga/adjuntos del editor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Directory for loading/attaching files to composer."
 msgstr "Carpeta para cargar/adjuntar archivos en el editor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Check for new messages on start"
 msgstr "Comprobar si hay mensajes nuevos al inicio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -2688,16 +2529,11 @@ msgstr ""
 "Indica si se debe comprobar si hay mensajes nuevos al iniciar Evolution. "
 "Incluye también el envío de mensajes en la bandeja de salida."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Check for new messages in all active accounts"
 msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
-#| msgid ""
-#| "Whether to check for new messages in all active accounts regardless of "
-#| "the account \"Check for new messages every X minutes\" option when "
-#| "Evolution is started. This option is used only together with "
-#| "'send_recv_on_start' option."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account “Check for new messages every X minutes” option when Evolution is "
@@ -2708,11 +2544,11 @@ msgstr ""
 "mensajes nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se "
 "usa junto con la opción «send_recv_on_start»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización con el servidor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2720,16 +2556,11 @@ msgstr ""
 "Controla la frecuencia con la que los cambios locales se sincronizan con el "
 "servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Allow expunge in virtual folders"
 msgstr "Permitir purgar en carpetas virtuales"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
-#| msgid ""
-#| "Enables Expunge in virtual folders, which means that the Folder->Expunge "
-#| "will be callable in virtual folders, while the expunge itself will be "
-#| "done in all folders for all deleted messages within the virtual folder, "
-#| "not only for deleted messages belonging to the virtual folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will "
 "be callable in virtual folders, while the expunge itself will be done in all "
@@ -2742,12 +2573,13 @@ msgstr ""
 "virtual, no sólo para los mensajes eliminados que pertenezcan a la carpeta "
 "virtual."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 #: ../src/mail/mail-config.ui.h:9
-msgid "Inherit theme colors in HTML mode"
+#| msgid "Inherit theme colors in HTML mode"
+msgid "Inherit theme colors in HTML format"
 msgstr "Heredar el tema de color en modo HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -2755,11 +2587,11 @@ msgstr ""
 "Cuando está activada, los colores del tema para el fondo, texto y enlaces se "
 "envían en el HTML resultante del mensaje formateado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "An Archive folder for On This Computer folders."
 msgstr "Una carpeta de archivo para las carpetas de este equipo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2767,14 +2599,11 @@ msgstr ""
 "Una carpeta de archivo para usarla para mensajes/archivo... característica "
 "cuando está en una carpeta de este equipo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Default forward style"
 msgstr "(Obsoleto) Estilo de reenvío predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"forward-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2782,14 +2611,11 @@ msgstr ""
 "Esta clave se ha marcado como obsoleta en la versión 3.10 y no debería "
 "usarse. Use «forward-style-name» en su lugar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "(Deprecated) Default reply style"
 msgstr "(Obsoleto) Estilo de respuesta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"reply-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2797,14 +2623,11 @@ msgstr ""
 "Esta clave se ha marcado como obsoleta en la versión 3.10 y no debería "
 "usarse. Use «reply-style-name» en su lugar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Obsoleto) Lista de cabeceras personalizadas y si están activadas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"show-headers\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2812,14 +2635,11 @@ msgstr ""
 "Esta clave se ha marcado como obsoleta en la versión 3.10 y no debería "
 "usarse. Use «show-headers» en su lugar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Obsoleto) Cargar imágenes para mensajes HTML sobre HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"image-loading-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2827,7 +2647,7 @@ msgstr ""
 "Esta clave se ha marcado como obsoleta en la versión 3.10 y no debería "
 "usarse. Use «image-loading-policy» en su lugar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2835,10 +2655,7 @@ msgstr ""
 "(Obsoleto) Preguntar si cerrar la ventana del mensaje cuando el usuario "
 "reenvía o responde al mensaje mostrado en la ventana"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"browser-close-on-reply-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2893,8 +2710,6 @@ msgid "Enable autocontacts"
 msgstr "Activar contactos automáticos"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-#| msgid ""
-#| "Whether contacts should be automatically added to the user's address book."
 msgid ""
 "Whether contacts should be automatically added to the user’s address book."
 msgstr ""
@@ -2941,11 +2756,6 @@ msgid "List of Custom Headers"
 msgstr "Lista de cabeceras personalizadas"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#| msgid ""
-#| "The key specifies the list of custom headers that you can add to an "
-#| "outgoing message. The format for specifying a Header and Header value is: "
-#| "Name of the custom header followed by \"=\" and the values separated by "
-#| "\";\""
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -3037,10 +2847,6 @@ msgid "Enable audible notifications when new messages arrive."
 msgstr "Activar las notificaciones sonoras cuando llegan mensajes nuevos."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#| msgid ""
-#| "Whether to make a sound of any kind when new messages arrive. If \"false"
-#| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
-#| "file\" and \"notify-sound-use-theme\" keys are disregarded."
 msgid ""
 "Whether to make a sound of any kind when new messages arrive. If “false”, "
 "the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
@@ -3064,9 +2870,6 @@ msgid "Sound filename to be played."
 msgstr "Nombre del archivo de sonido que reproducir."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
-#| "file\" is \"true\"."
 msgid ""
 "Sound file to be played when new messages arrive, if “notify-sound-play-"
 "file” is “true”."
@@ -3079,9 +2882,6 @@ msgid "Whether to play a sound file."
 msgstr "Indica si se debe reproducir un archivo de sonido."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#| msgid ""
-#| "Whether to play a sound file when new messages arrive. The name of the "
-#| "sound file is given by the 'notify-sound-file' key."
 msgid ""
 "Whether to play a sound file when new messages arrive. The name of the sound "
 "file is given by the “notify-sound-file” key."
@@ -3105,12 +2905,6 @@ msgid "Mode to use when displaying mails"
 msgstr "Modo que usar al mostrar correos"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-#| msgid ""
-#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
-#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
-#| "present, \"prefer_source\" makes it use the text part, if present, "
-#| "otherwise shows HTML source, and \"only_plain\" forces Evolution to only "
-#| "show plain text"
 msgid ""
 "The mode to use for displaying mails. “normal” makes Evolution choose the "
 "best part to show, “prefer_plain” makes it use the text part, if present, "
@@ -3163,9 +2957,6 @@ msgid "Initial attachment view"
 msgstr "Vista inicial de adjunto"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#| msgid ""
-#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
-#| "List View."
 msgid ""
 "Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
 msgstr ""
@@ -3235,9 +3026,6 @@ msgstr ""
 "Lista de nombres de botones que ocultar en el intercambiador de ventanas"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#| msgid ""
-#| "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-#| "Change of this requires restart of the application."
 msgid ""
 "Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
 "Change of this requires restart of the application."
@@ -3258,10 +3046,6 @@ msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#| msgid ""
-#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
-#| "determined by the GNOME toolbar setting."
 msgid ""
 "The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
 "If “toolbar” is set, the style of the buttons is determined by the GNOME "
@@ -3490,7 +3274,6 @@ msgid "Could not remove address book."
 msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../src/addressbook/addressbook.error.xml.h:11
-#| msgid "Delete address book '{0}'?"
 msgid "Delete address book “{0}”?"
 msgstr "¿Quiere eliminar la libreta de direcciones «{0}»?"
 
@@ -3504,14 +3287,10 @@ msgid "Do _Not Delete"
 msgstr "_No eliminar"
 
 #: ../src/addressbook/addressbook.error.xml.h:14
-#| msgid "Delete remote address book &quot;{0}&quot;?"
 msgid "Delete remote address book “{0}”?"
 msgstr "¿Quiere eliminar la libreta de direcciones «{0}»?"
 
 #: ../src/addressbook/addressbook.error.xml.h:15
-#| msgid ""
-#| "This will permanently remove the address book &quot;{0}&quot; from the "
-#| "server. Are you sure you want to proceed?"
 msgid ""
 "This will permanently remove the address book “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -3529,7 +3308,6 @@ msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
 #: ../src/addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book '{0}'"
 msgid "Unable to open address book “{0}”"
 msgstr "No se puede abrir la libreta de direcciones «{0}»"
 
@@ -3538,7 +3316,6 @@ msgid "Unable to perform search."
 msgstr "No se puede efectuar la búsqueda."
 
 #: ../src/addressbook/addressbook.error.xml.h:20
-#| msgid "Failed to refresh address book '{0}'"
 msgid "Failed to refresh address book “{0}”"
 msgstr "Falló al actualizar la libreta de direcciones «{0}»"
 
@@ -3596,7 +3373,6 @@ msgid "Error saving {0} to {1}: {2}"
 msgstr "Error al guardar {0} a {1}: {2}"
 
 #: ../src/addressbook/addressbook.error.xml.h:32
-#| msgid "Address '{0}' already exists."
 msgid "Address “{0}” already exists."
 msgstr "La dirección «{0}» ya existe."
 
@@ -3617,9 +3393,9 @@ msgstr ""
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:58
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
 #: ../src/modules/mail/em-composer-prefs.c:414
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:455
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../src/plugins/templates/templates.c:463
@@ -3647,14 +3423,10 @@ msgid "Add with duplicates"
 msgstr "Añadir con duplicados"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#| msgid "List '{0}' is already in this contact list."
 msgid "List “{0}” is already in this contact list."
 msgstr "La lista «{0}» ya está en esta lista de contactos."
 
 #: ../src/addressbook/addressbook.error.xml.h:40
-#| msgid ""
-#| "A contact list named '{0}' is already in this contact list. Would you "
-#| "like to add it anyway?"
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
@@ -3678,9 +3450,6 @@ msgstr "No se puede añadir un contacto nuevo"
 
 #. For Translators: {0} is the name of the address book source
 #: ../src/addressbook/addressbook.error.xml.h:45
-#| msgid ""
-#| "'{0}' is a read-only address book and cannot be modified. Please select a "
-#| "different address book from the side bar in the Contacts view."
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3696,9 +3465,6 @@ msgstr ""
 
 #. For Translators: {0} is the name of the address book source
 #: ../src/addressbook/addressbook.error.xml.h:48
-#| msgid ""
-#| "Cannot save a contact to the address book '{0}', because it is still "
-#| "opening. Either wait till it's opened, or select a different address book."
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
@@ -3955,8 +3721,8 @@ msgstr "Añadir _X.509"
 #: ../src/e-util/e-name-selector-dialog.c:996
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:18
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:59
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:465
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
@@ -3982,7 +3748,7 @@ msgstr "_Cargar X.509"
 #: ../src/composer/e-composer-actions.c:345
 #: ../src/e-util/e-attachment-store.c:829
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-web-view.c:3860
+#: ../src/e-util/e-web-view.c:4028
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:135
 #: ../src/smime/gui/certificate-manager.c:666
@@ -4048,7 +3814,7 @@ msgstr "Opciones"
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:1
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3859
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4027
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:331
 #: ../src/mail/e-mail-label-dialog.c:194 ../src/mail/e-mail-tag-editor.c:168
@@ -4119,7 +3885,7 @@ msgstr "Mostrar certificados"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
 #: ../src/calendar/gui/e-comp-editor.c:2037
-#: ../src/e-util/e-html-editor-actions.c:897
+#: ../src/e-util/e-html-editor-actions.c:904
 msgid "_Undo"
 msgstr "Des_hacer"
 
@@ -4131,7 +3897,7 @@ msgstr "Deshacer"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
 #: ../src/calendar/gui/e-comp-editor.c:2044
-#: ../src/e-util/e-html-editor-actions.c:883
+#: ../src/e-util/e-html-editor-actions.c:890
 msgid "_Redo"
 msgstr "_Rehacer"
 
@@ -4157,7 +3923,6 @@ msgstr "Error al eliminar el contacto"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
 #, c-format
-#| msgid "Contact Editor - %s"
 msgid "Contact Editor — %s"
 msgstr "Editor de contactos: %s"
 
@@ -4245,26 +4010,22 @@ msgstr ""
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
 #, c-format
-#| msgid "'%s' has an invalid format"
 msgid "“%s” has an invalid format"
 msgstr "«%s» tiene un formato no válido"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
 #, c-format
-#| msgid "'%s' cannot be a future date"
 msgid "“%s” cannot be a future date"
 msgstr "«%s» no puede ser una fecha en el futuro"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
 #, c-format
-#| msgid "%s'%s' has an invalid format"
 msgid "%s“%s” has an invalid format"
 msgstr "%s«%s» tiene un formato no válido"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
 #, c-format
-#| msgid "%s'%s' is empty"
 msgid "%s“%s” is empty"
 msgstr "%s«%s» está vacío"
 
@@ -4503,22 +4264,22 @@ msgid "Copy _Email Address"
 msgstr "Copiar dirección de _correo-e"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:149
-#: ../src/e-util/e-web-view.c:360
+#: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar la dirección de correo-e al portapapeles"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:154
-#: ../src/e-util/e-web-view.c:372
+#: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "_Enviar un correo nuevo a…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:156
-#: ../src/e-util/e-web-view.c:374
+#: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Enviar un correo a esta dirección"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:288
-#: ../src/e-util/e-web-view.c:1243
+#: ../src/e-util/e-web-view.c:1289
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
@@ -4950,7 +4711,6 @@ msgstr[1] ""
 "¿Quiere realmente mostrar todos estos contactos?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1519
-#| msgid "_Don't Display"
 msgid "_Don’t Display"
 msgstr "_No mostrar"
 
@@ -5135,7 +4895,7 @@ msgstr "_Reducir"
 # En conflicto con _Buscar del menu principal
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:1856
+#: ../src/e-util/e-html-editor-actions.c:1863
 #: ../src/e-util/e-html-editor-find-dialog.c:250
 #: ../src/shell/e-shell-window-actions.c:899
 msgid "_Find"
@@ -5210,7 +4970,6 @@ msgid "Importing..."
 msgstr "Importando…"
 
 #: ../src/addressbook/importers/evolution-csv-importer.c:927
-#| msgid "Can't open .csv file"
 msgid "Can’t open .csv file"
 msgstr "No se puede abrir el archivo .csv"
 
@@ -5239,7 +4998,6 @@ msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Importador de CSV y Tab de contactos de Evolution"
 
 #: ../src/addressbook/importers/evolution-ldif-importer.c:717
-#| msgid "Can't open .ldif file"
 msgid "Can’t open .ldif file"
 msgstr "No se puede abrir el archivo .ldif"
 
@@ -5423,11 +5181,11 @@ msgstr "_Posponer"
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1363
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
 #: ../src/calendar/gui/e-comp-editor.c:2060
-#: ../src/e-util/e-html-editor-actions.c:906
+#: ../src/e-util/e-html-editor-actions.c:913
 #: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:17
 #: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
-#: ../src/mail/e-mail-label-manager.c:380 ../src/mail/mail-config.ui.h:63
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:460
+#: ../src/mail/e-mail-label-manager.c:380 ../src/mail/mail-config.ui.h:65
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
 #: ../src/plugins/email-custom-header/email-custom-header.c:842
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:468
@@ -5477,7 +5235,7 @@ msgstr "horas"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:527
+#: ../src/mail/e-mail-config-provider-page.c:571
 msgid "minutes"
 msgstr "minutos"
 
@@ -5664,12 +5422,10 @@ msgstr ""
 "Toda la información acerca de esta nota se eliminará y no se podrá recuperar."
 
 #: ../src/calendar/calendar.error.xml.h:15
-#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled “{0}”?"
 msgstr "¿Seguro que quiere eliminar la reunión titulada «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:16
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the appointment titled “{0}”?"
 msgstr "¿Seguro que quiere eliminar la cita titulada «{0}»?"
 
@@ -5683,12 +5439,10 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere eliminar esta cita?"
 
 #: ../src/calendar/calendar.error.xml.h:19
-#| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to delete the “{0}” task?"
 msgstr "¿Seguro que quiere eliminar la tarea «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:20
-#| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete the memo “{0}”?"
 msgstr "¿Seguro que quiere eliminar la nota «{0}»?"
 
@@ -5874,7 +5628,6 @@ msgid "Editor could not be loaded."
 msgstr "No es posible cargar el editor."
 
 #: ../src/calendar/calendar.error.xml.h:57
-#| msgid "Delete calendar '{0}'?"
 msgid "Delete calendar “{0}”?"
 msgstr "¿Quiere eliminar el calendario «{0}»?"
 
@@ -5883,7 +5636,6 @@ msgid "This calendar will be removed permanently."
 msgstr "Este calendario se eliminará permanentemente."
 
 #: ../src/calendar/calendar.error.xml.h:59
-#| msgid "Delete task list '{0}'?"
 msgid "Delete task list “{0}”?"
 msgstr "¿Quiere eliminar la lista de tareas «{0}»?"
 
@@ -5892,7 +5644,6 @@ msgid "This task list will be removed permanently."
 msgstr "Esta lista de tareas se eliminará permanentemente."
 
 #: ../src/calendar/calendar.error.xml.h:61
-#| msgid "Delete memo list '{0}'?"
 msgid "Delete memo list “{0}”?"
 msgstr "¿Quiere la lista de notas «{0}»?"
 
@@ -5901,14 +5652,10 @@ msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas se eliminará permanentemente."
 
 #: ../src/calendar/calendar.error.xml.h:63
-#| msgid "Delete remote calendar '{0}'?"
 msgid "Delete remote calendar “{0}”?"
 msgstr "¿Quiere eliminar el calendario remoto «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:64
-#| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5917,14 +5664,10 @@ msgstr ""
 "seguro de querer continuar?"
 
 #: ../src/calendar/calendar.error.xml.h:66
-#| msgid "Delete remote task list '{0}'?"
 msgid "Delete remote task list “{0}”?"
 msgstr "¿Quiere eliminar la lista de tareas remota «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:67
-#| msgid ""
-#| "This will permanently remove the task list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5933,14 +5676,10 @@ msgstr ""
 "seguro de querer continuar?"
 
 #: ../src/calendar/calendar.error.xml.h:68
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Delete remote memo list “{0}”?"
 msgstr "¿Quiere la lista de notas remota «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:69
-#| msgid ""
-#| "This will permanently remove the memo list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5978,7 +5717,6 @@ msgstr "¿Seguro que quiere guardar la nota sin un resumen?"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:76
-#| msgid "Error loading calendar '{0}'"
 msgid "Error loading calendar “{0}”"
 msgstr "Error al cargar el calendario «{0}»"
 
@@ -5992,9 +5730,6 @@ msgstr "No se puede guardar el acontecimiento"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:80
-#| msgid ""
-#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
-#| "different calendar that can accept appointments."
 msgid ""
 "“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -6008,9 +5743,6 @@ msgstr "No se puede guardar la tarea"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:83
-#| msgid ""
-#| "'{0}' does not support assigned tasks, please select a different task "
-#| "list."
 msgid ""
 "“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
@@ -6019,7 +5751,6 @@ msgstr ""
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:85
-#| msgid "Error loading task list '{0}'"
 msgid "Error loading task list “{0}”"
 msgstr "Error al cargar la lista de tareas «{0}»"
 
@@ -6029,7 +5760,6 @@ msgstr "La lista de tareas no está marcada para usarse sin conexión."
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:88
-#| msgid "Error loading memo list '{0}'"
 msgid "Error loading memo list “{0}”"
 msgstr "Error al cargar la lista de notas «{0}»"
 
@@ -6039,7 +5769,6 @@ msgstr "La lista de notas no está marcada para usarse sin conexión."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
 #: ../src/calendar/calendar.error.xml.h:91
-#| msgid "Failed to add timezone to '{0}'"
 msgid "Failed to add timezone to “{0}”"
 msgstr "Falló al añadir la zona horaria a «{0}»"
 
@@ -6050,235 +5779,196 @@ msgstr "Falló al guardar los adjuntos"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:95
-#| msgid "Failed to open calendar '{0}'"
 msgid "Failed to open calendar “{0}”"
 msgstr "Falló al abrir el calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:97
-#| msgid "Failed to open memo list '{0}'"
 msgid "Failed to open memo list “{0}”"
 msgstr "Falló al abrir la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:99
-#| msgid "Failed to open task list '{0}'"
 msgid "Failed to open task list “{0}”"
 msgstr "Falló al abrir la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:101
-#| msgid "Failed to create an event in the calendar '{0}'"
 msgid "Failed to create an event in the calendar “{0}”"
 msgstr "Falló al crear un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:103
-#| msgid "Failed to create a memo in the memo list '{0}'"
 msgid "Failed to create a memo in the memo list “{0}”"
 msgstr "Falló al crear una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:105
-#| msgid "Failed to create a task in the task list '{0}'"
 msgid "Failed to create a task in the task list “{0}”"
 msgstr "Falló al crear una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:107
-#| msgid "Failed to modify an event in the calendar '{0}'"
 msgid "Failed to modify an event in the calendar “{0}”"
 msgstr "Falló al modificar un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:109
-#| msgid "Failed to modify a memo in the memo list '{0}'"
 msgid "Failed to modify a memo in the memo list “{0}”"
 msgstr "Falló al modificar una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:111
-#| msgid "Failed to modify a task in the task list '{0}'"
 msgid "Failed to modify a task in the task list “{0}”"
 msgstr "Falló al modificar una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:113
-#| msgid "Failed to delete an event in the calendar '{0}'"
 msgid "Failed to delete an event in the calendar “{0}”"
 msgstr "Falló al eliminar un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:115
-#| msgid "Failed to delete a memo in the memo list '{0}'"
 msgid "Failed to delete a memo in the memo list “{0}”"
 msgstr "Falló al eliminar una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:117
-#| msgid "Failed to delete a task in the task list '{0}'"
 msgid "Failed to delete a task in the task list “{0}”"
 msgstr "Falló al eliminar una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:119
-#| msgid "Failed to update an event in the calendar '{0}'"
 msgid "Failed to update an event in the calendar “{0}”"
 msgstr "Falló al actualizar un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:121
-#| msgid "Failed to update a memo in the memo list '{0}'"
 msgid "Failed to update a memo in the memo list “{0}”"
 msgstr "Falló al actualizar una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:123
-#| msgid "Failed to update a task in the task list '{0}'"
 msgid "Failed to update a task in the task list “{0}”"
 msgstr "Falló al actualizar una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:125
-#| msgid "Failed to send an event to the calendar '{0}'"
 msgid "Failed to send an event to the calendar “{0}”"
 msgstr "Falló al enviar un evento al calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:127
-#| msgid "Failed to send a memo to the memo list '{0}'"
 msgid "Failed to send a memo to the memo list “{0}”"
 msgstr "Falló al enviar una nota a la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:129
-#| msgid "Failed to send a task to the task list '{0}'"
 msgid "Failed to send a task to the task list “{0}”"
 msgstr "Falló al enviar una tarea a la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:131
-#| msgid "Error creating view for the calendar '{0}'"
 msgid "Error creating view for the calendar “{0}”"
 msgstr "Error al crear la vista para el calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:133
-#| msgid "Error creating view for the task list '{0}'"
 msgid "Error creating view for the task list “{0}”"
 msgstr "Error al crear la vista para la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:135
-#| msgid "Error creating view for the memo list '{0}'"
 msgid "Error creating view for the memo list “{0}”"
 msgstr "Error al crear la vista para la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:137
-#| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to copy an event into the calendar “{0}”"
 msgstr "Falló al copiar un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:139
-#| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to copy a task into the task list “{0}”"
 msgstr "Falló al copiar una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:141
-#| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to copy a memo into the memo list “{0}”"
 msgstr "Falló al copiar una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:143
-#| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to move an event into the calendar “{0}”"
 msgstr "Falló al mover un evento en el calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:145
-#| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to move a task into the task list “{0}”"
 msgstr "Falló al mover una tarea en la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:147
-#| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to move a memo into the memo list “{0}”"
 msgstr "Falló al mover una nota en la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:149
-#| msgid "Failed to get an event from the calendar '{0}'"
 msgid "Failed to get an event from the calendar “{0}”"
 msgstr "Falló al obtener un evento del calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:151
-#| msgid "Failed to get a task from the task list '{0}'"
 msgid "Failed to get a task from the task list “{0}”"
 msgstr "Falló al obtener una tarea de la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:153
-#| msgid "Failed to get a memo from the memo list '{0}'"
 msgid "Failed to get a memo from the memo list “{0}”"
 msgstr "Falló al obtener una nota de la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:155
-#| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar “{0}”"
 msgstr "Copiando un evento al calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:157
-#| msgid "Copying a task into the task list '{0}'"
 msgid "Copying a task into the task list “{0}”"
 msgstr "Copiando una tarea a la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:159
-#| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying a memo into the memo list “{0}”"
 msgstr "Copiando una nota a la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:161
-#| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar “{0}”"
 msgstr "Moviendo un evento al calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:163
-#| msgid "Moving a task into the task list '{0}'"
 msgid "Moving a task into the task list “{0}”"
 msgstr "Moviendo una tarea a la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:165
-#| msgid "Moving a memo into the memo list '{0}'"
 msgid "Moving a memo into the memo list “{0}”"
 msgstr "Moviendo una nota a la lista de notas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:167
-#| msgid "Failed to refresh calendar '{0}'"
 msgid "Failed to refresh calendar “{0}”"
 msgstr "Falló al actualizar el calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:169
-#| msgid "Failed to refresh task list '{0}'"
 msgid "Failed to refresh task list “{0}”"
 msgstr "Falló al actualizar la lista de tareas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:171
-#| msgid "Failed to refresh memo list '{0}'"
 msgid "Failed to refresh memo list “{0}”"
 msgstr "Falló al actualizar la lista de notas «{0}»"
 
@@ -6756,7 +6446,7 @@ msgstr "Prioridad:"
 #: ../src/calendar/gui/e-cal-component-preview.c:325
 #: ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:319
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:320
 msgid "High"
 msgstr "Alta"
 
@@ -6764,14 +6454,14 @@ msgstr "Alta"
 #: ../src/calendar/gui/e-cal-model.c:1888
 #: ../src/calendar/gui/e-task-table.c:551
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:318
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:319
 msgid "Normal"
 msgstr "Normal"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:329
 #: ../src/calendar/gui/e-task-table.c:552
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:317
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:318
 msgid "Low"
 msgstr "Baja"
 
@@ -6786,19 +6476,16 @@ msgstr "Página web:"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1631
 #, c-format
-#| msgid "Creating view for calendar '%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "Creando vista para el calendario «%s»"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1635
 #, c-format
-#| msgid "Creating view for task list '%s'"
 msgid "Creating view for task list “%s”"
 msgstr "Creando vista para la lista de tareas «%s»"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1639
 #, c-format
-#| msgid "Creating view for memo list '%s'"
 msgid "Creating view for memo list “%s”"
 msgstr "Creando vista para la lista de notas «%s»"
 
@@ -6809,24 +6496,20 @@ msgstr "El destino es de sólo lectura"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:292
 #, c-format
-#| msgid "Copying events to the calendar '%s'"
 msgid "Copying events to the calendar “%s”"
 msgstr "Copiando eventos al calendario «%s»"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:298
 #, c-format
-#| msgid "Copying memos to the memo list '%s'"
 msgid "Copying memos to the memo list “%s”"
 msgstr "Copiando notas a la lista de notas «%s»"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:304
 #, c-format
-#| msgid "Copying tasks to the task list '%s'"
 msgid "Copying tasks to the task list “%s”"
 msgstr "Copiando tareas a la lista de tareas «%s»"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:523
-#| msgid "_Delete this item from all other recipient's mailboxes?"
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr "¿_Eliminar este elemento de todos los otros buzones del destinatario?"
 
@@ -6955,7 +6638,6 @@ msgid "Delete selected events"
 msgstr "Eliminar los acontecimientos seleccionados"
 
 #: ../src/calendar/gui/e-calendar-view.c:853
-#| msgid "Pasted text doesn't contain valid iCalendar data"
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "El texto pegado no contiene datos de iCalendar válidos"
 
@@ -7097,7 +6779,7 @@ msgstr "Fuente"
 #: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
 #: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
 #: ../src/modules/itip-formatter/itip-view.c:3398
-#: ../src/modules/itip-formatter/itip-view.c:5995
+#: ../src/modules/itip-formatter/itip-view.c:6008
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Desconocido"
@@ -7106,7 +6788,6 @@ msgstr "Desconocido"
 #: ../src/calendar/gui/e-cal-ops.c:1249
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:289
 #, c-format
-#| msgid "Source with UID '%s' not found"
 msgid "Source with UID “%s” not found"
 msgstr "No se encontró la fuente con el UID «%s»"
 
@@ -7153,7 +6834,7 @@ msgstr "No"
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:5983
+#: ../src/modules/itip-formatter/itip-view.c:5996
 msgid "Accepted"
 msgstr "Aceptado"
 
@@ -7161,7 +6842,7 @@ msgstr "Aceptado"
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:5989
+#: ../src/modules/itip-formatter/itip-view.c:6002
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -7177,7 +6858,7 @@ msgstr "Provisional"
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:5992
+#: ../src/modules/itip-formatter/itip-view.c:6005
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -7304,37 +6985,31 @@ msgstr "Actualizando una tarea"
 
 #: ../src/calendar/gui/e-cal-ops.c:966
 #, c-format
-#| msgid "Getting events to purge in the calendar '%s'"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Obteniendo eventos que purgar en el calendario «%s»"
 
 #: ../src/calendar/gui/e-cal-ops.c:970
 #, c-format
-#| msgid "Getting memos to purge in the memo list '%s'"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Obteniendo notas que purgar en el calendario «%s»"
 
 #: ../src/calendar/gui/e-cal-ops.c:974
 #, c-format
-#| msgid "Getting tasks to purge in the task list '%s'"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Obteniendo tareas que purgar en la lista de tareas «%s»"
 
 #: ../src/calendar/gui/e-cal-ops.c:1000
 #, c-format
-#| msgid "Purging events in the calendar '%s'"
 msgid "Purging events in the calendar “%s”"
 msgstr "Purgando eventos en el calendario «%s»"
 
 #: ../src/calendar/gui/e-cal-ops.c:1004
 #, c-format
-#| msgid "Purging memos in the memo list '%s'"
 msgid "Purging memos in the memo list “%s”"
 msgstr "Purgando notas en la lista de notas «%s»"
 
 #: ../src/calendar/gui/e-cal-ops.c:1008
 #, c-format
-#| msgid "Purging tasks in the task list '%s'"
 msgid "Purging tasks in the task list “%s”"
 msgstr "Purgando tareas en la lista de tareas «%s»"
 
@@ -7416,7 +7091,6 @@ msgstr ""
 "%s"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:99
-#| msgid "Event's time is in the past"
 msgid "Event’s time is in the past"
 msgstr "La hora del acontecimiento está en el pasado"
 
@@ -7574,13 +7248,11 @@ msgstr "Programar"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:857
 #, c-format
-#| msgid "Meeting - %s"
 msgid "Meeting — %s"
 msgstr "Reunión: %s"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:858
 #, c-format
-#| msgid "Appointment - %s"
 msgid "Appointment — %s"
 msgstr "Cita: %s"
 
@@ -7612,13 +7284,11 @@ msgstr "Fecha de ini_cio:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:221
 #, c-format
-#| msgid "Assigned Memo - %s"
 msgid "Assigned Memo — %s"
 msgstr "Nota asignada: %s"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:222
 #, c-format
-#| msgid "Memo - %s"
 msgid "Memo — %s"
 msgstr "Nota - %s"
 
@@ -7636,7 +7306,6 @@ msgstr[1] "Adjuntos"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
 #: ../src/e-util/e-attachment.c:2419
 #, c-format
-#| msgid "Could not load '%s'"
 msgid "Could not load “%s”"
 msgstr "No se pudo cargar «%s»"
 
@@ -7656,14 +7325,11 @@ msgstr ""
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
 #, c-format
-#| msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "No se puede encontrar el adjunto «%s», elimínelo de la lista"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
 #, c-format
-#| msgid ""
-#| "Attachment '%s' doesn't have valid URI, remove it from the list, please"
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr "El adjunto «%s» no tiene un URI válido, elimínelo de la lista"
 
@@ -7698,13 +7364,11 @@ msgstr "Vista de lista"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:311
 #, c-format
-#| msgid "Cannot find attendee '%s' in the list of attendees"
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "No se puede encontrar a la persona «%s» en la lista de participantes"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:318
 #, c-format
-#| msgid "Not enough rights to delete attendee '%s'"
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "No tiene permisos suficientes para eliminar al asistente «%s»"
 
@@ -8030,13 +7694,13 @@ msgstr "Excepciones"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/mail-config.ui.h:62
+#: ../src/mail/mail-config.ui.h:64
 msgid "A_dd"
 msgstr "Aña_dir"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/mail/mail-config.ui.h:66
 msgid "Re_move"
 msgstr "Quita_r"
 
@@ -8344,12 +8008,10 @@ msgid "Show time as _busy"
 msgstr "Mostrar hora como _ocupada"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:224
-#| msgid "Task's start date is in the past"
 msgid "Task’s start date is in the past"
 msgstr "La fecha de inicio de la tarea está en el pasado"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:232
-#| msgid "Task's due date is in the past"
 msgid "Task’s due date is in the past"
 msgstr "La fecha de vencimiento de la tarea está en el pasado"
 
@@ -8389,13 +8051,11 @@ msgstr "Cambia cuando se tiene un acontecimiento para todo el día"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:818
 #, c-format
-#| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Tarea asignada: %s"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:819
 #, c-format
-#| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "Tarea: %s"
 
@@ -8441,8 +8101,8 @@ msgstr "Cerrar la ventana actual"
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:1981
 #: ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:862 ../src/e-util/e-text.c:2110
-#: ../src/e-util/e-web-view.c:399 ../src/mail/e-mail-browser.c:134
+#: ../src/e-util/e-html-editor-actions.c:869 ../src/e-util/e-text.c:2110
+#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
 #: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
 msgid "_Copy"
 msgstr "_Copiar"
@@ -8450,7 +8110,7 @@ msgstr "_Copiar"
 #: ../src/calendar/gui/e-comp-editor.c:1983
 #: ../src/e-util/e-focus-tracker.c:173 ../src/e-util/e-focus-tracker.c:229
 #: ../src/e-util/e-focus-tracker.c:282 ../src/e-util/e-focus-tracker.c:774
-#: ../src/e-util/e-web-view.c:401 ../src/e-util/e-web-view.c:1809
+#: ../src/e-util/e-web-view.c:409 ../src/e-util/e-web-view.c:1906
 #: ../src/mail/e-mail-browser.c:136 ../src/shell/e-shell-window-actions.c:810
 msgid "Copy the selection"
 msgstr "Copiar la selección"
@@ -8458,7 +8118,7 @@ msgstr "Copiar la selección"
 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:1988
 #: ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:869 ../src/e-util/e-text.c:2096
+#: ../src/e-util/e-html-editor-actions.c:876 ../src/e-util/e-text.c:2096
 #: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
 msgid "Cu_t"
 msgstr "Cor_tar"
@@ -8466,7 +8126,7 @@ msgstr "Cor_tar"
 #: ../src/calendar/gui/e-comp-editor.c:1990
 #: ../src/e-util/e-focus-tracker.c:166 ../src/e-util/e-focus-tracker.c:222
 #: ../src/e-util/e-focus-tracker.c:276 ../src/e-util/e-focus-tracker.c:769
-#: ../src/e-util/e-web-view.c:1799 ../src/mail/e-mail-browser.c:143
+#: ../src/e-util/e-web-view.c:1915 ../src/mail/e-mail-browser.c:143
 #: ../src/shell/e-shell-window-actions.c:817
 msgid "Cut the selection"
 msgstr "Cortar la selección"
@@ -8485,7 +8145,7 @@ msgstr "Ver la ayuda"
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2009
 #: ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:876 ../src/e-util/e-text.c:2122
+#: ../src/e-util/e-html-editor-actions.c:883 ../src/e-util/e-text.c:2122
 #: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
 msgid "_Paste"
 msgstr "_Pegar"
@@ -8493,7 +8153,7 @@ msgstr "_Pegar"
 #: ../src/calendar/gui/e-comp-editor.c:2011
 #: ../src/e-util/e-focus-tracker.c:180 ../src/e-util/e-focus-tracker.c:236
 #: ../src/e-util/e-focus-tracker.c:288 ../src/e-util/e-focus-tracker.c:779
-#: ../src/e-util/e-web-view.c:1819 ../src/mail/e-mail-browser.c:150
+#: ../src/e-util/e-web-view.c:1924 ../src/mail/e-mail-browser.c:150
 #: ../src/shell/e-shell-window-actions.c:845
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
@@ -8515,7 +8175,7 @@ msgstr "_Vista previa…"
 
 #: ../src/calendar/gui/e-comp-editor.c:2030
 #: ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:890 ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-html-editor-actions.c:897 ../src/e-util/e-web-view.c:417
 #: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
 msgid "Select _All"
 msgstr "Seleccionar _todo"
@@ -8532,7 +8192,7 @@ msgid "_Classification"
 msgstr "_Clasificación"
 
 #: ../src/calendar/gui/e-comp-editor.c:2067
-#: ../src/e-util/e-html-editor-actions.c:913
+#: ../src/e-util/e-html-editor-actions.c:920
 #: ../src/e-util/e-mail-signature-editor.c:323
 #: ../src/mail/e-mail-browser.c:164 ../src/mail/e-mail-notes.c:945
 #: ../src/shell/e-shell-window-actions.c:957
@@ -8540,7 +8200,7 @@ msgid "_File"
 msgstr "_Archivo"
 
 #: ../src/calendar/gui/e-comp-editor.c:2081
-#: ../src/e-util/e-html-editor-actions.c:934
+#: ../src/e-util/e-html-editor-actions.c:941
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -8550,7 +8210,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../src/calendar/gui/e-comp-editor.c:2095
-#: ../src/e-util/e-html-editor-actions.c:955 ../src/mail/e-mail-browser.c:178
+#: ../src/e-util/e-html-editor-actions.c:962 ../src/mail/e-mail-browser.c:178
 #: ../src/shell/e-shell-window-actions.c:1000
 #: ../src/smime/gui/certificate-manager.c:1662
 #: ../src/smime/gui/smime-ui.ui.h:5
@@ -11341,7 +11001,7 @@ msgstr "_Publicar en:"
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../src/composer/e-composer-header-table.c:881
+#: ../src/composer/e-composer-header-table.c:883
 #: ../src/mail/e-mail-config-identity-page.c:746
 msgid "Si_gnature:"
 msgstr "_Firma:"
@@ -11382,13 +11042,10 @@ msgstr ""
 "editarse."
 
 #: ../src/composer/mail-composer.error.xml.h:1
-#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgid "You cannot attach the file “{0}” to this message."
 msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
 #: ../src/composer/mail-composer.error.xml.h:2
-#| msgid ""
-#| "The file '{0}' is not a regular file and cannot be sent in a message."
 msgid "The file “{0}” is not a regular file and cannot be sent in a message."
 msgstr ""
 "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
@@ -11399,7 +11056,6 @@ msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
 
 #: ../src/composer/mail-composer.error.xml.h:4
 #: ../src/e-util/e-system.error.xml.h:5
-#| msgid "Because \"{1}\"."
 msgid "Because “{1}”."
 msgstr "Porque «{1}»."
 
@@ -11424,19 +11080,14 @@ msgid "_Recover"
 msgstr "_Recuperar"
 
 #: ../src/composer/mail-composer.error.xml.h:9
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Could not save to autosave file “{0}”."
 msgstr "No se pudo guardar automáticamente el archivo «{0}»."
 
 #: ../src/composer/mail-composer.error.xml.h:10
-#| msgid "Error saving to autosave because &quot;{1}&quot;."
 msgid "Error saving to autosave because “{1}”."
 msgstr "Error al guardar automáticamente debido a «{1}»."
 
 #: ../src/composer/mail-composer.error.xml.h:11
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
 msgid ""
 "Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
@@ -11471,14 +11122,11 @@ msgid "Could not create message."
 msgstr "No es posible crear un mensaje."
 
 #: ../src/composer/mail-composer.error.xml.h:19
-#| msgid ""
-#| "Because &quot;{0}&quot;, you may need to select different mail options."
 msgid "Because “{0}”, you may need to select different mail options."
 msgstr ""
 "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../src/composer/mail-composer.error.xml.h:20
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Could not read signature file “{0}”."
 msgstr "No es posible leer el archivo de firma «{0}»."
 
@@ -11495,8 +11143,6 @@ msgid "An error occurred while saving to your Outbox folder."
 msgstr "Ocurrió un error al guardar en su carpeta de Bandeja de salida."
 
 #: ../src/composer/mail-composer.error.xml.h:24
-#| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgid "The reported error was “{0}”. The message has not been sent."
 msgstr "El error devuelto fue «{0}». No se ha enviado el mensaje."
 
@@ -11505,9 +11151,6 @@ msgid "An error occurred while saving to your Drafts folder."
 msgstr "Ocurrió un error al guardar en su carpeta de Borradores."
 
 #: ../src/composer/mail-composer.error.xml.h:26
-#| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has most likely not "
-#| "been saved."
 msgid ""
 "The reported error was “{0}”. The message has most likely not been saved."
 msgstr "El error devuelto fue «{0}». Seguramente no se ha guardado el mensaje."
@@ -11518,7 +11161,6 @@ msgstr "Ocurrió un error al enviar. ¿Cómo quiere proceder?"
 
 #: ../src/composer/mail-composer.error.xml.h:28
 #: ../src/mail/mail.error.xml.h:175
-#| msgid "The reported error was &quot;{0}&quot;."
 msgid "The reported error was “{0}”."
 msgstr "El error devuelto fue «{0}»."
 
@@ -11539,10 +11181,6 @@ msgid "Saving message to Outbox."
 msgstr "Guardando mensaje en la Bandeja de salida."
 
 #: ../src/composer/mail-composer.error.xml.h:33
-#| msgid ""
-#| "The message will be saved to your local Outbox folder, because the "
-#| "destination service is currently unavailable. You can send the message by "
-#| "clicking the Send/Receive button in Evolution's toolbar."
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -11565,19 +11203,22 @@ msgstr ""
 "cancelar el envío, si se pulsó por accidente, o enviar el mensaje."
 
 #: ../src/composer/mail-composer.error.xml.h:37
-msgid "Are you sure you want to change the composer mode?"
-msgstr "¿Está seguro de que quiere cambiar el modo del editor?"
+#| msgid "Are you sure you want to change the composer mode?"
+msgid "Are you sure you want to change the composer format?"
+msgstr "¿Está seguro de que quiere cambiar el formato del editor?"
 
 #: ../src/composer/mail-composer.error.xml.h:38
+#| msgid ""
+#| "Turning HTML mode off will cause the text to lose all formatting. Do you "
+#| "want to continue?"
 msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
 msgstr ""
-"Desactivar el modo HTML hará que el texto pierda todo su formato. ¿Quiere "
+"Cambiar a texto plano hará que el texto pierda su formato HTML. ¿Quiere "
 "continuar?"
 
 #: ../src/composer/mail-composer.error.xml.h:39
-#| msgid "_Don't lose formatting"
 msgid "_Don’t lose formatting"
 msgstr "_No perder el formato"
 
@@ -11688,7 +11329,7 @@ msgstr "Formatear parte como HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1305
 msgid "Plain Text"
 msgstr "Texto plano"
 
@@ -11845,23 +11486,23 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:582
 msgid "GPG signed"
 msgstr "Firmado con GPG"
 
-#: ../src/em-format/e-mail-formatter-utils.c:570
+#: ../src/em-format/e-mail-formatter-utils.c:588
 msgid "GPG encrypted"
 msgstr "Cifrado con GPG"
 
-#: ../src/em-format/e-mail-formatter-utils.c:576
+#: ../src/em-format/e-mail-formatter-utils.c:594
 msgid "S/MIME signed"
 msgstr "Cifrado S/MIME"
 
-#: ../src/em-format/e-mail-formatter-utils.c:582
+#: ../src/em-format/e-mail-formatter-utils.c:600
 msgid "S/MIME encrypted"
 msgstr "Cifrado con S/MIME"
 
-#: ../src/em-format/e-mail-formatter-utils.c:591
+#: ../src/em-format/e-mail-formatter-utils.c:609
 #: ../src/mail/e-mail-config-security-page.c:761
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
@@ -11900,7 +11541,6 @@ msgstr "Puntero a sitio FTP (%s)"
 
 #: ../src/em-format/e-mail-parser-message-external.c:110
 #, c-format
-#| msgid "Pointer to local file (%s) valid at site \"%s\""
 msgid "Pointer to local file (%s) valid at site “%s”"
 msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
 
@@ -11916,7 +11556,6 @@ msgstr "Puntero a datos remotos (%s)"
 
 #: ../src/em-format/e-mail-parser-message-external.c:149
 #, c-format
-#| msgid "Pointer to unknown external data (\"%s\" type)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
@@ -12068,7 +11707,6 @@ msgstr "Existe una operación de guardado en progreso"
 
 #: ../src/e-util/e-attachment.c:2707
 #, c-format
-#| msgid "Could not open %s:"
 msgid "Could not open “%s”"
 msgstr "No se pudo abrir «%s»:"
 
@@ -12083,7 +11721,6 @@ msgstr "No se cargó el contenido del adjunto"
 
 #: ../src/e-util/e-attachment.c:3551
 #, c-format
-#| msgid "Could not save '%s'"
 msgid "Could not save “%s”"
 msgstr "No se pudo guardar «%s»"
 
@@ -12209,7 +11846,6 @@ msgstr "_Propiedades"
 
 #: ../src/e-util/e-attachment-view.c:658
 #, c-format
-#| msgid "Open With \"%s\""
 msgid "Open With “%s”"
 msgstr "Abrir con «%s»"
 
@@ -12336,7 +11972,6 @@ msgstr "Icono"
 
 #: ../src/e-util/e-category-completion.c:304
 #, c-format
-#| msgid "Create category \"%s\""
 msgid "Create category “%s”"
 msgstr "Crear categoría «%s»"
 
@@ -12362,9 +11997,6 @@ msgstr "Propiedades de la categoría"
 
 #: ../src/e-util/e-category-editor.c:271
 #, c-format
-#| msgid ""
-#| "There is already a category '%s' in the configuration. Please use another "
-#| "name"
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
 "name"
@@ -12376,7 +12008,7 @@ msgid "popup list"
 msgstr "lista emergente"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2061
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2064
 msgid "?"
 msgstr "?"
 
@@ -12503,7 +12135,6 @@ msgstr "Otro…"
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
 #, c-format
-#| msgid "Cannot create a client object from extension name '%s'"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 "No se puede crear un objeto cliente a partir de un nombre de extensión «%s»"
@@ -12676,7 +12307,7 @@ msgstr "blanco"
 #: ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:427
 #: ../src/mail/e-mail-config-security-page.c:591
-#: ../src/mail/e-mail-reader.c:4060 ../src/mail/mail-config.ui.h:73
+#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -12805,6 +12436,39 @@ msgstr "Usar los valores predeterminados del sistema"
 msgid "Format:"
 msgstr "Formato:"
 
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:181
+#| msgid "days"
+msgctxt "time-unit"
+msgid "days"
+msgstr "días"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
+#: ../src/e-util/e-dialog-widgets.c:183
+#| msgid "weeks"
+msgctxt "time-unit"
+msgid "weeks"
+msgstr "semanas"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
+#: ../src/e-util/e-dialog-widgets.c:185
+#| msgid "months"
+msgctxt "time-unit"
+msgid "months"
+msgstr "meses"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
+#: ../src/e-util/e-dialog-widgets.c:187
+#| msgid "years"
+msgctxt "time-unit"
+msgid "years"
+msgstr "años"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:245
+msgid "Do not synchronize locally mails older than"
+msgstr "No sincronizar los mensajes locales anteriores a"
+
 #. Translators: :-)
 #: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
@@ -12917,7 +12581,6 @@ msgstr "(Nombre del archivo desconocido)"
 #. Translators: The string value is the basename of a file.
 #: ../src/e-util/e-file-utils.c:125
 #, c-format
-#| msgid "Writing \"%s\""
 msgid "Writing “%s”"
 msgstr "Escribiendo «%s»"
 
@@ -12925,7 +12588,6 @@ msgstr "Escribiendo «%s»"
 #. * remote file, the second string value is the hostname.
 #: ../src/e-util/e-file-utils.c:130
 #, c-format
-#| msgid "Writing \"%s\" to %s"
 msgid "Writing “%s” to %s"
 msgstr "Escribiendo «%s» a «%s»"
 
@@ -13148,488 +12810,488 @@ msgstr "Insertar archivo de texto"
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: ../src/e-util/e-html-editor-actions.c:864
+#: ../src/e-util/e-html-editor-actions.c:871
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar el texto seleccionado al portapapeles"
 
-#: ../src/e-util/e-html-editor-actions.c:871
+#: ../src/e-util/e-html-editor-actions.c:878
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar el texto seleccionado y colocarlo en el portapapeles"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:878
+#: ../src/e-util/e-html-editor-actions.c:885
 msgid "Paste text from the clipboard"
 msgstr "Pegar texto desde el portapapeles"
 
-#: ../src/e-util/e-html-editor-actions.c:885
+#: ../src/e-util/e-html-editor-actions.c:892
 msgid "Redo the last undone action"
 msgstr "Rehacer la última acción deshecha"
 
-#: ../src/e-util/e-html-editor-actions.c:899
+#: ../src/e-util/e-html-editor-actions.c:906
 msgid "Undo the last action"
 msgstr "Deshacer la última acción"
 
-#: ../src/e-util/e-html-editor-actions.c:920
+#: ../src/e-util/e-html-editor-actions.c:927
 msgid "For_mat"
 msgstr "_Formato"
 
-#: ../src/e-util/e-html-editor-actions.c:927
+#: ../src/e-util/e-html-editor-actions.c:934
 msgid "_Paragraph Style"
 msgstr "Estilo de _párrafo"
 
-#: ../src/e-util/e-html-editor-actions.c:941
+#: ../src/e-util/e-html-editor-actions.c:948
 #: ../src/e-util/e-html-editor-image-dialog.c:585
 msgid "_Alignment"
 msgstr "_Alineación"
 
-#: ../src/e-util/e-html-editor-actions.c:948
+#: ../src/e-util/e-html-editor-actions.c:955
 msgid "Current _Languages"
 msgstr "_Idiomas actuales"
 
-#: ../src/e-util/e-html-editor-actions.c:965
+#: ../src/e-util/e-html-editor-actions.c:972
 msgid "_Increase Indent"
 msgstr "Aumen_tar sangrado"
 
-#: ../src/e-util/e-html-editor-actions.c:967
+#: ../src/e-util/e-html-editor-actions.c:974
 msgid "Increase Indent"
 msgstr "Aumentar sangrado"
 
-#: ../src/e-util/e-html-editor-actions.c:972
+#: ../src/e-util/e-html-editor-actions.c:979
 msgid "_HTML File..."
 msgstr "Archivo _HTML…"
 
-#: ../src/e-util/e-html-editor-actions.c:979
+#: ../src/e-util/e-html-editor-actions.c:986
 msgid "Te_xt File..."
 msgstr "Archivo de _texto…"
 
-#: ../src/e-util/e-html-editor-actions.c:986
+#: ../src/e-util/e-html-editor-actions.c:993
 msgid "Paste _Quotation"
 msgstr "Pegar _cita"
 
 # En conflicto con _Buscar del menu principal
-#: ../src/e-util/e-html-editor-actions.c:993
+#: ../src/e-util/e-html-editor-actions.c:1000
 msgid "_Find..."
 msgstr "_Buscar…"
 
-#: ../src/e-util/e-html-editor-actions.c:995
+#: ../src/e-util/e-html-editor-actions.c:1002
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../src/e-util/e-html-editor-actions.c:1000
+#: ../src/e-util/e-html-editor-actions.c:1007
 msgid "Find A_gain"
 msgstr "Buscar otr_a vez"
 
-#: ../src/e-util/e-html-editor-actions.c:1007
+#: ../src/e-util/e-html-editor-actions.c:1014
 msgid "Re_place..."
 msgstr "_Reemplazar…"
 
-#: ../src/e-util/e-html-editor-actions.c:1009
+#: ../src/e-util/e-html-editor-actions.c:1016
 msgid "Search for and replace text"
 msgstr "Buscar y reemplazar texto"
 
-#: ../src/e-util/e-html-editor-actions.c:1014
+#: ../src/e-util/e-html-editor-actions.c:1021
 msgid "Check _Spelling..."
 msgstr "Comprobar la _ortografía…"
 
-#: ../src/e-util/e-html-editor-actions.c:1021
+#: ../src/e-util/e-html-editor-actions.c:1028
 msgid "_Decrease Indent"
 msgstr "_Disminuir sangrado"
 
-#: ../src/e-util/e-html-editor-actions.c:1023
+#: ../src/e-util/e-html-editor-actions.c:1030
 msgid "Decrease Indent"
 msgstr "Disminuir sangrado"
 
-#: ../src/e-util/e-html-editor-actions.c:1028
+#: ../src/e-util/e-html-editor-actions.c:1035
 msgid "_Wrap Lines"
 msgstr "A_juste de líneas"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1038
+#: ../src/e-util/e-html-editor-actions.c:1045
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Centrado"
 
-#: ../src/e-util/e-html-editor-actions.c:1040
+#: ../src/e-util/e-html-editor-actions.c:1047
 msgid "Center Alignment"
 msgstr "Alineación central"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1045
+#: ../src/e-util/e-html-editor-actions.c:1052
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "I_zquierda"
 
-#: ../src/e-util/e-html-editor-actions.c:1047
+#: ../src/e-util/e-html-editor-actions.c:1054
 msgid "Left Alignment"
 msgstr "Alineación izquierda"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1052
+#: ../src/e-util/e-html-editor-actions.c:1059
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Derecha"
 
-#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-actions.c:1061
 msgid "Right Alignment"
 msgstr "Alineación derecha"
 
-#: ../src/e-util/e-html-editor-actions.c:1062
+#: ../src/e-util/e-html-editor-actions.c:1069
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1064
+#: ../src/e-util/e-html-editor-actions.c:1071
 msgid "HTML editing mode"
 msgstr "Modo de edición en HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1069
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "Plain _Text"
 msgstr "_Texto plano"
 
-#: ../src/e-util/e-html-editor-actions.c:1071
+#: ../src/e-util/e-html-editor-actions.c:1078
 msgid "Plain text editing mode"
 msgstr "Modo de edición en texto plano"
 
-#: ../src/e-util/e-html-editor-actions.c:1079
+#: ../src/e-util/e-html-editor-actions.c:1086
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1093
 msgid "Header _1"
 msgstr "Cabecera _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1100
 msgid "Header _2"
 msgstr "Cabecera _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1107
 msgid "Header _3"
 msgstr "Cabecera _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1107
+#: ../src/e-util/e-html-editor-actions.c:1114
 msgid "Header _4"
 msgstr "Cabecera _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1114
+#: ../src/e-util/e-html-editor-actions.c:1121
 msgid "Header _5"
 msgstr "Cabecera _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1121
+#: ../src/e-util/e-html-editor-actions.c:1128
 msgid "Header _6"
 msgstr "Cabecera _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1128
+#: ../src/e-util/e-html-editor-actions.c:1135
 msgid "_Preformatted"
 msgstr "_Preformateado"
 
-#: ../src/e-util/e-html-editor-actions.c:1135
+#: ../src/e-util/e-html-editor-actions.c:1142
 msgid "A_ddress"
 msgstr "_Dirección"
 
-#: ../src/e-util/e-html-editor-actions.c:1142
+#: ../src/e-util/e-html-editor-actions.c:1149
 msgid "_Bulleted List"
 msgstr "Lista de _topos"
 
-#: ../src/e-util/e-html-editor-actions.c:1149
+#: ../src/e-util/e-html-editor-actions.c:1156
 msgid "_Roman Numeral List"
 msgstr "Lista de números _romanos"
 
-#: ../src/e-util/e-html-editor-actions.c:1156
+#: ../src/e-util/e-html-editor-actions.c:1163
 msgid "Numbered _List"
 msgstr "Lista _numerada"
 
-#: ../src/e-util/e-html-editor-actions.c:1163
+#: ../src/e-util/e-html-editor-actions.c:1170
 msgid "_Alphabetical List"
 msgstr "Lista _alfabética"
 
-#: ../src/e-util/e-html-editor-actions.c:1179
-#: ../src/e-util/e-html-editor-actions.c:1217
+#: ../src/e-util/e-html-editor-actions.c:1186
+#: ../src/e-util/e-html-editor-actions.c:1224
 msgid "_Image..."
 msgstr "_Imagen…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:1189
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../src/e-util/e-html-editor-actions.c:1187
-#: ../src/e-util/e-html-editor-actions.c:1224
+#: ../src/e-util/e-html-editor-actions.c:1194
+#: ../src/e-util/e-html-editor-actions.c:1231
 msgid "_Link..."
 msgstr "_Enlazar…"
 
-#: ../src/e-util/e-html-editor-actions.c:1189
+#: ../src/e-util/e-html-editor-actions.c:1196
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1195
-#: ../src/e-util/e-html-editor-actions.c:1239
+#: ../src/e-util/e-html-editor-actions.c:1202
+#: ../src/e-util/e-html-editor-actions.c:1246
 msgid "_Rule..."
 msgstr "_Regla…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1198
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Insert Rule"
 msgstr "Insertar regla"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
-#: ../src/e-util/e-html-editor-actions.c:1246
+#: ../src/e-util/e-html-editor-actions.c:1210
+#: ../src/e-util/e-html-editor-actions.c:1253
 msgid "_Table..."
 msgstr "_Tabla…"
 
-#: ../src/e-util/e-html-editor-actions.c:1205
+#: ../src/e-util/e-html-editor-actions.c:1212
 msgid "Insert Table"
 msgstr "Insertar tabla"
 
-#: ../src/e-util/e-html-editor-actions.c:1210
+#: ../src/e-util/e-html-editor-actions.c:1217
 msgid "_Cell..."
 msgstr "_Celda…"
 
-#: ../src/e-util/e-html-editor-actions.c:1231
+#: ../src/e-util/e-html-editor-actions.c:1238
 msgid "Pa_ge..."
 msgstr "_Página…"
 
-#: ../src/e-util/e-html-editor-actions.c:1255
+#: ../src/e-util/e-html-editor-actions.c:1262
 msgid "Font _Size"
 msgstr "_Tamaño de la tipografía"
 
-#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-actions.c:1269
 msgid "_Font Style"
 msgstr "_Estilo de la tipografía"
 
-#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-actions.c:1276
 msgid "Paste As _Text"
 msgstr "Pegar como _texto"
 
-#: ../src/e-util/e-html-editor-actions.c:1280
+#: ../src/e-util/e-html-editor-actions.c:1287
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Negrita"
 
-#: ../src/e-util/e-html-editor-actions.c:1282
+#: ../src/e-util/e-html-editor-actions.c:1289
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../src/e-util/e-html-editor-actions.c:1288
+#: ../src/e-util/e-html-editor-actions.c:1295
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Cursiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1290
+#: ../src/e-util/e-html-editor-actions.c:1297
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1303
 msgid "_Plain Text"
 msgstr "Texto _plano"
 
-#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-actions.c:1311
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Tachado"
 
-#: ../src/e-util/e-html-editor-actions.c:1306
+#: ../src/e-util/e-html-editor-actions.c:1313
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1319
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "S_ubrayado"
 
-#: ../src/e-util/e-html-editor-actions.c:1314
+#: ../src/e-util/e-html-editor-actions.c:1321
 msgid "Underline"
 msgstr "Subrayado"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1331
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1332
+#: ../src/e-util/e-html-editor-actions.c:1339
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1340
+#: ../src/e-util/e-html-editor-actions.c:1347
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1348
+#: ../src/e-util/e-html-editor-actions.c:1355
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1356
+#: ../src/e-util/e-html-editor-actions.c:1363
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1364
+#: ../src/e-util/e-html-editor-actions.c:1371
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1379
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1391
+#: ../src/e-util/e-html-editor-actions.c:1398
 msgid "Cell Contents"
 msgstr "Contenido de la celda"
 
-#: ../src/e-util/e-html-editor-actions.c:1398
+#: ../src/e-util/e-html-editor-actions.c:1405
 msgid "Column"
 msgstr "Columna"
 
-#: ../src/e-util/e-html-editor-actions.c:1405
+#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "Row"
 msgstr "Fila"
 
-#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1419
 msgid "Table"
 msgstr "Tabla"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1422
+#: ../src/e-util/e-html-editor-actions.c:1429
 msgid "Table Delete"
 msgstr "Eliminar tabla"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1430
+#: ../src/e-util/e-html-editor-actions.c:1437
 msgid "Table Insert"
 msgstr "Insertar tabla"
 
-#: ../src/e-util/e-html-editor-actions.c:1437
+#: ../src/e-util/e-html-editor-actions.c:1444
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../src/e-util/e-html-editor-actions.c:1455
+#: ../src/e-util/e-html-editor-actions.c:1462
 msgid "Column After"
 msgstr "Columna posterior"
 
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1469
 msgid "Column Before"
 msgstr "Columna anterior"
 
-#: ../src/e-util/e-html-editor-actions.c:1469
+#: ../src/e-util/e-html-editor-actions.c:1476
 msgid "Insert _Link"
 msgstr "Inserta en_lace"
 
-#: ../src/e-util/e-html-editor-actions.c:1476
+#: ../src/e-util/e-html-editor-actions.c:1483
 msgid "Row Above"
 msgstr "Fila superior"
 
-#: ../src/e-util/e-html-editor-actions.c:1483
+#: ../src/e-util/e-html-editor-actions.c:1490
 msgid "Row Below"
 msgstr "Fila inferior"
 
-#: ../src/e-util/e-html-editor-actions.c:1490
+#: ../src/e-util/e-html-editor-actions.c:1497
 msgid "Cell..."
 msgstr "Celda…"
 
-#: ../src/e-util/e-html-editor-actions.c:1497
+#: ../src/e-util/e-html-editor-actions.c:1504
 msgid "Image..."
 msgstr "Imagen…"
 
-#: ../src/e-util/e-html-editor-actions.c:1504
+#: ../src/e-util/e-html-editor-actions.c:1511
 msgid "Link..."
 msgstr "Enlazar…"
 
-#: ../src/e-util/e-html-editor-actions.c:1511
+#: ../src/e-util/e-html-editor-actions.c:1518
 msgid "Page..."
 msgstr "Página…"
 
-#: ../src/e-util/e-html-editor-actions.c:1518
+#: ../src/e-util/e-html-editor-actions.c:1525
 msgid "Paragraph..."
 msgstr "Párrafo…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1526
+#: ../src/e-util/e-html-editor-actions.c:1533
 msgid "Rule..."
 msgstr "Regla…"
 
-#: ../src/e-util/e-html-editor-actions.c:1533
+#: ../src/e-util/e-html-editor-actions.c:1540
 msgid "Table..."
 msgstr "Tabla…"
 
-#: ../src/e-util/e-html-editor-actions.c:1540
+#: ../src/e-util/e-html-editor-actions.c:1547
 msgid "Text..."
 msgstr "Texto…"
 
-#: ../src/e-util/e-html-editor-actions.c:1547
+#: ../src/e-util/e-html-editor-actions.c:1554
 msgid "Remove Link"
 msgstr "Quitar enlace"
 
-#: ../src/e-util/e-html-editor-actions.c:1564
+#: ../src/e-util/e-html-editor-actions.c:1571
 msgid "Add Word to Dictionary"
 msgstr "Añadir palabra al diccionario"
 
-#: ../src/e-util/e-html-editor-actions.c:1571
+#: ../src/e-util/e-html-editor-actions.c:1578
 msgid "Ignore Misspelled Word"
 msgstr "Ignorar palabra mal escrita"
 
-#: ../src/e-util/e-html-editor-actions.c:1578
+#: ../src/e-util/e-html-editor-actions.c:1585
 msgid "Add Word To"
 msgstr "Añadir palabra a"
 
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1594
 msgid "More Suggestions"
 msgstr "Más sugerencias"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1711
+#: ../src/e-util/e-html-editor-actions.c:1718
 #, c-format
 msgid "%s Dictionary"
 msgstr "Diccionario %s"
 
-#: ../src/e-util/e-html-editor-actions.c:1790
+#: ../src/e-util/e-html-editor-actions.c:1797
 msgid "_Emoticon"
 msgstr "_Emoticono"
 
-#: ../src/e-util/e-html-editor-actions.c:1791
+#: ../src/e-util/e-html-editor-actions.c:1798
 msgid "Insert Emoticon"
 msgstr "Insertar un emoticono"
 
-#: ../src/e-util/e-html-editor-actions.c:1859
+#: ../src/e-util/e-html-editor-actions.c:1866
 msgid "Re_place"
 msgstr "_Reemplazar"
 
-#: ../src/e-util/e-html-editor-actions.c:1862
+#: ../src/e-util/e-html-editor-actions.c:1869
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../src/e-util/e-html-editor-actions.c:1865
+#: ../src/e-util/e-html-editor-actions.c:1872
 msgid "_Link"
 msgstr "_Enlace"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1869
+#: ../src/e-util/e-html-editor-actions.c:1876
 msgid "_Rule"
 msgstr "_Regla"
 
-#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-actions.c:1879
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Tabla"
 
-#: ../src/e-util/e-html-editor.c:690
+#: ../src/e-util/e-html-editor.c:689
 msgid "Paragraph Style"
 msgstr "Estilo de párrafo"
 
-#: ../src/e-util/e-html-editor.c:704
+#: ../src/e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Modo de edición"
 
-#: ../src/e-util/e-html-editor.c:716
+#: ../src/e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Color de la tipografía"
 
-#: ../src/e-util/e-html-editor.c:726
+#: ../src/e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Tamaño de la tipografía"
 
@@ -13999,7 +13661,6 @@ msgstr "Reemplazar"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:83
 #, c-format
-#| msgid "<b>Suggestions for '%s'</b>"
 msgid "<b>Suggestions for “%s”</b>"
 msgstr "<b>Sugerencias para «%s»</b>"
 
@@ -14120,10 +13781,6 @@ msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
 #: ../src/e-util/e-import-assistant.c:536
-#| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If "
-#| "you would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14194,7 +13851,6 @@ msgid "Select a File"
 msgstr "Seleccione un archivo"
 
 #: ../src/e-util/e-import-assistant.c:1365
-#| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Pulse «Aplicar» para comenzar a importar el archivo en Evolution."
 
@@ -14275,25 +13931,21 @@ msgstr "No se pudo mostrar la ayuda de Evolution."
 
 #: ../src/e-util/e-misc-utils.c:2501
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Opening calendar “%s”"
 msgstr "Abriendo calendario «%s»"
 
 #: ../src/e-util/e-misc-utils.c:2504
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Opening memo list “%s”"
 msgstr "Abriendo lista de notas «%s»"
 
 #: ../src/e-util/e-misc-utils.c:2507
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Opening task list “%s”"
 msgstr "Abriendo lista de tareas «%s»"
 
 #: ../src/e-util/e-misc-utils.c:2510
 #, c-format
-#| msgid "Opening address book '%s'"
 msgid "Opening address book “%s”"
 msgstr "Abriendo libreta de direcciones «%s»"
 
@@ -14805,7 +14457,6 @@ msgstr "Más…"
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
 #, c-format
-#| msgid "Add \"%s\" to Dictionary"
 msgid "Add “%s” to Dictionary"
 msgstr "Añadir «%s» al diccionario"
 
@@ -14819,52 +14470,40 @@ msgid "Spelling Suggestions"
 msgstr "Sugerencias de ortografía"
 
 #: ../src/e-util/e-system.error.xml.h:1
-#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
 msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr "Ya existe una archivo llamado «{0}». ¿Quiere reemplazarlo?"
 
 #: ../src/e-util/e-system.error.xml.h:2
-#| msgid ""
-#| "The file already exists in \"{0}\". Replacing it will overwrite its "
-#| "contents."
 msgid ""
 "The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
 "El archivo ya existe en «{0}». Si lo reemplaza sobrescribirá su contenido."
 
 #: ../src/e-util/e-system.error.xml.h:4
-#| msgid "Cannot save file \"{0}\"."
 msgid "Cannot save file “{0}”."
 msgstr "No se puede guardar el archivo «{0}»."
 
 #: ../src/e-util/e-system.error.xml.h:6
-#| msgid "Cannot open file \"{0}\"."
 msgid "Cannot open file “{0}”."
 msgstr "No se puede abrir el archivo «{0}»."
 
 #: ../src/e-util/e-system.error.xml.h:7
-#| msgid "Failed to remove data source &quot;{0}&quot;."
 msgid "Failed to remove data source “{0}”."
 msgstr "Falló al quitar la fuente de datos «{0}»."
 
 #: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
-#| msgid "The reported error was &quot;{1}&quot;."
 msgid "The reported error was “{1}”."
 msgstr "El error devuelto fue «{1}»."
 
 #: ../src/e-util/e-system.error.xml.h:9
-#| msgid "Failed to update data source &quot;{0}&quot;."
 msgid "Failed to update data source “{0}”."
 msgstr "Falló al actualizar la fuente de datos «{0}»."
 
 #: ../src/e-util/e-system.error.xml.h:10
-#| msgid "Failed to delete resource &quot;{0}&quot;."
 msgid "Failed to delete resource “{0}”."
 msgstr "Falló al eliminar el recurso «{0}»."
 
 #: ../src/e-util/e-system.error.xml.h:11
-#| msgid ""
-#| "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The address book backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "El «backend» de la libreta de direcciones que sirve «{0}» se ha cerrado "
@@ -14878,8 +14517,6 @@ msgstr ""
 "reinicie."
 
 #: ../src/e-util/e-system.error.xml.h:13
-#| msgid ""
-#| "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The calendar backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "El «backend» del calendario que sirve «{0}» se ha cerrado inesperadamente."
@@ -14891,8 +14528,6 @@ msgstr ""
 "Algunas de sus citas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../src/e-util/e-system.error.xml.h:15
-#| msgid ""
-#| "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The memo list backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "El «backend» de la lista de notas que sirve «{0}» se ha cerrado "
@@ -14904,8 +14539,6 @@ msgstr ""
 "Algunas de sus notas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../src/e-util/e-system.error.xml.h:17
-#| msgid ""
-#| "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The task list backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "El «backend» de la lista de tareas que sirve «{0}» se ha cerrado "
@@ -14917,28 +14550,21 @@ msgstr ""
 "Algunas de sus tareas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../src/e-util/e-system.error.xml.h:19
-#| msgid ""
-#| "The address book backend servicing &quot;{0}&quot; encountered an error."
 msgid "The address book backend servicing “{0}” encountered an error."
 msgstr ""
 "El «backend» de la libreta de direcciones que sirve «{0}» ha encontrado un "
 "error."
 
 #: ../src/e-util/e-system.error.xml.h:20
-#| msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
 msgid "The calendar backend servicing “{0}” encountered an error."
 msgstr "El «backend» del calendario que sirve «{0}» ha encontrado un error."
 
 #: ../src/e-util/e-system.error.xml.h:21
-#| msgid ""
-#| "The memo list backend servicing &quot;{0}&quot; encountered an error."
 msgid "The memo list backend servicing “{0}” encountered an error."
 msgstr ""
 "El «backend» de la lista de notas que sirve «{0}» ha encontrado un error."
 
 #: ../src/e-util/e-system.error.xml.h:22
-#| msgid ""
-#| "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgid "The task list backend servicing “{0}” encountered an error."
 msgstr ""
 "El «backend» de la lista de tareas que sirve «{0}» ha encontrado un error."
@@ -15223,114 +14849,108 @@ msgstr "Opciones"
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../src/e-util/e-web-view.c:338
+#: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../src/e-util/e-web-view.c:340
+#: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
 msgstr "Copiar el enlace al portapapeles"
 
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../src/e-util/e-web-view.c:350
+#: ../src/e-util/e-web-view.c:358
 msgid "Open the link in a web browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo-e"
 
-#: ../src/e-util/e-web-view.c:365
+#: ../src/e-util/e-web-view.c:373
 msgid "Copy _Raw Email Address"
 msgstr "Copiar dirección de _correo-e en bruto"
 
-#: ../src/e-util/e-web-view.c:367
+#: ../src/e-util/e-web-view.c:375
 msgid "Copy the raw email address to the clipboard"
 msgstr "Copiar la dirección de correo-e en bruto al portapapeles"
 
-#: ../src/e-util/e-web-view.c:382
+#: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
 msgstr "_Copiar imagen"
 
-#: ../src/e-util/e-web-view.c:384
+#: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
 msgstr "Copiar la imagen al portapapeles"
 
-#: ../src/e-util/e-web-view.c:389
+#: ../src/e-util/e-web-view.c:397
 msgid "Save _Image..."
 msgstr "Guardar _imagen…"
 
-#: ../src/e-util/e-web-view.c:391
+#: ../src/e-util/e-web-view.c:399
 msgid "Save the image to a file"
 msgstr "Guardar la imagen en un archivo"
 
-#: ../src/e-util/e-web-view.c:411 ../src/e-util/e-web-view.c:1824
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1928
 msgid "Select all text and images"
 msgstr "Seleccionar todo el texto y las imágenes"
 
-#: ../src/e-util/e-web-view.c:1248
+#: ../src/e-util/e-web-view.c:1294
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../src/e-util/e-web-view.c:1250
+#: ../src/e-util/e-web-view.c:1296
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
-#: ../src/e-util/e-web-view.c:1261
+#: ../src/e-util/e-web-view.c:1307
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Ir a la sección %s del mensaje"
 
-#: ../src/e-util/e-web-view.c:1263
+#: ../src/e-util/e-web-view.c:1309
 msgid "Go to the beginning of the message"
 msgstr "Ir al principio del mensaje"
 
-#: ../src/e-util/e-web-view.c:1267
+#: ../src/e-util/e-web-view.c:1313
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: ../src/e-util/e-web-view.c:3669
+#: ../src/e-util/e-web-view.c:3837
 msgid "Copying image to clipboard"
 msgstr "Copiando imagen al portapapeles"
 
-#: ../src/e-util/e-web-view.c:3857
+#: ../src/e-util/e-web-view.c:4025
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../src/e-util/e-web-view.c:3893
+#: ../src/e-util/e-web-view.c:4061
 #, c-format
-#| msgid "Saving image to '%s'"
 msgid "Saving image to “%s”"
 msgstr "Guardando imagen en «%s»"
 
-#: ../src/e-util/e-web-view.c:3988
+#: ../src/e-util/e-web-view.c:4156
 #, c-format
-#| msgid "Cannot get URI '%s', do not know how to download it."
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "No se puede obtener el URI «%s», o no se sabe de dónde bajarlo."
 
 #: ../src/e-util/e-widget-undo.c:428
-#| msgid "Undo 'Insert text'"
 msgid "Undo “Insert text”"
 msgstr "Deshacer «insertar texto»"
 
 #: ../src/e-util/e-widget-undo.c:430
-#| msgid "Redo 'Insert text'"
 msgid "Redo “Insert text”"
 msgstr "Rehacer «insertar texto»"
 
 #: ../src/e-util/e-widget-undo.c:444
-#| msgid "Undo 'Delete text'"
 msgid "Undo “Delete text”"
 msgstr "Deshacer «eliminar texto»"
 
 #: ../src/e-util/e-widget-undo.c:446
-#| msgid "Redo 'Delete text'"
 msgid "Redo “Delete text”"
 msgstr "Rehacer «eliminar texto»"
 
@@ -15351,17 +14971,14 @@ msgid "You must specify a filename."
 msgstr "Debe especificar un nombre de archivo."
 
 #: ../src/e-util/filter.error.xml.h:5
-#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgid "File “{0}” does not exist or is not a regular file."
 msgstr "El archivo «{0}» no existe o no es un archivo regular."
 
 #: ../src/e-util/filter.error.xml.h:6
-#| msgid "Bad regular expression &quot;{0}&quot;."
 msgid "Bad regular expression “{0}”."
 msgstr "Error en la expresión regular «{0}»."
 
 #: ../src/e-util/filter.error.xml.h:7
-#| msgid "Could not compile regular expression &quot;{1}&quot;."
 msgid "Could not compile regular expression “{1}”."
 msgstr "No es posible compilar la expresión regular «{1}»."
 
@@ -15374,7 +14991,6 @@ msgid "You must name this filter."
 msgstr "Debe dar un nombre a este filtro."
 
 #: ../src/e-util/filter.error.xml.h:10
-#| msgid "Name &quot;{0}&quot; already used."
 msgid "Name “{0}” already used."
 msgstr "El nombre «{0}» ya se está usando."
 
@@ -15399,7 +15015,6 @@ msgid "One or more values cannot be empty."
 msgstr "Uno o más valores no puede estar vacíos."
 
 #: ../src/e-util/filter.error.xml.h:16
-#| msgid "Are you sure you want to remove rule '{0}'?"
 msgid "Are you sure you want to remove rule “{0}”?"
 msgstr "¿Seguro que quiere eliminar la regla «{0}»?"
 
@@ -15419,7 +15034,7 @@ msgstr "la fecha que especifique"
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:90
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
 msgid "seconds"
 msgstr "segundos"
 
@@ -15458,9 +15073,6 @@ msgid "Compare against"
 msgstr "Comparar con"
 
 #: ../src/e-util/filter.ui.h:24
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "the current time when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "the current time when filtering occurs."
@@ -15469,9 +15081,6 @@ msgstr ""
 "fecha actual del momento del filtrado."
 
 #: ../src/e-util/filter.ui.h:26
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "12:00am of the date specified."
 msgid ""
 "The message’s date will be compared against\n"
 "12:00am of the date specified."
@@ -15480,9 +15089,6 @@ msgstr ""
 "00:00 de la fecha aquí especificada."
 
 #: ../src/e-util/filter.ui.h:28
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "a time relative to when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -15599,7 +15205,6 @@ msgstr ""
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to folder “%s”"
 msgstr "Guardando mensaje en la carpeta «%s»"
 
@@ -15621,13 +15226,11 @@ msgstr "Buscando mensajes duplicados"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1150
 #, c-format
-#| msgid "Removing folder '%s'"
 msgid "Removing folder “%s”"
 msgstr "Eliminando carpeta «%s»"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1331
 #, c-format
-#| msgid "File \"%s\" has been removed."
 msgid "File “%s” has been removed."
 msgstr "Se ha quitado el archivo «%s»."
 
@@ -15648,7 +15251,6 @@ msgstr[1] "Guardando %d mensajes"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1961
 #, c-format
-#| msgid "Invalid folder URI '%s'"
 msgid "Invalid folder URI “%s”"
 msgstr "URI « %s» de la carpeta no válida"
 
@@ -15657,8 +15259,8 @@ msgstr "URI « %s» de la carpeta no válida"
 #: ../src/mail/em-folder-properties.c:776
 #: ../src/mail/em-folder-tree-model.c:1213
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1052
-#: ../src/modules/mail/e-mail-shell-view-private.c:1063
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
@@ -15666,7 +15268,7 @@ msgstr "Bandeja de entrada"
 #: ../src/libemail-engine/e-mail-session.c:126
 #: ../src/mail/em-folder-tree-model.c:1206
 #: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1050
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
 msgstr "Borradores"
 
@@ -15674,7 +15276,7 @@ msgstr "Borradores"
 #: ../src/libemail-engine/e-mail-session.c:127
 #: ../src/mail/em-folder-tree-model.c:1217
 #: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1054
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
@@ -15682,7 +15284,7 @@ msgstr "Bandeja de salida"
 #: ../src/libemail-engine/e-mail-session.c:128
 #: ../src/mail/em-folder-tree-model.c:1221
 #: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1056
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
 msgstr "Correo enviado"
 
@@ -15690,7 +15292,7 @@ msgstr "Correo enviado"
 #: ../src/libemail-engine/e-mail-session.c:129
 #: ../src/mail/em-folder-tree-model.c:1209
 #: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1058
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/plugins/templates/e-templates-store.c:2212
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
@@ -15716,9 +15318,8 @@ msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna identidad que usar, se canceló el reenvío del mensaje."
 
-#: ../src/libemail-engine/e-mail-session.c:2441
+#: ../src/libemail-engine/e-mail-session.c:2444
 #, c-format
-#| msgid "Waiting for '%s'"
 msgid "Waiting for “%s”"
 msgstr "Esperando a «%s»"
 
@@ -15729,7 +15330,6 @@ msgstr "No hay un servicio de transporte de correo disponible"
 #: ../src/libemail-engine/e-mail-session-utils.c:614
 #: ../src/libemail-engine/mail-ops.c:706
 #, c-format
-#| msgid "Posting message to '%s'"
 msgid "Posting message to “%s”"
 msgstr "Publicando mensaje a «%s»"
 
@@ -15743,16 +15343,12 @@ msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 #: ../src/libemail-engine/e-mail-session-utils.c:716
 #: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
 #, c-format
-#| msgid "Storing sent message to '%s'"
 msgid "Storing sent message to “%s”"
 msgstr "Guardando mensaje enviado a «%s»"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:705
 #: ../src/libemail-engine/mail-ops.c:790
 #, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local 'Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local “Sent” folder instead."
@@ -15763,7 +15359,6 @@ msgstr ""
 #: ../src/libemail-engine/e-mail-session-utils.c:735
 #: ../src/libemail-engine/mail-ops.c:818
 #, c-format
-#| msgid "Failed to append to local 'Sent' folder: %s"
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
@@ -15775,19 +15370,16 @@ msgstr "Enviando mensaje"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:188
 #, c-format
-#| msgid "Disconnecting from '%s'"
 msgid "Disconnecting from “%s”"
 msgstr "Desconectando de «%s»"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
 #, c-format
-#| msgid "Reconnecting to '%s'"
 msgid "Reconnecting to “%s”"
 msgstr "Reconectando a «%s»"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349
 #, c-format
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing account “%s” for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
@@ -15810,7 +15402,6 @@ msgstr ""
 
 #: ../src/libemail-engine/mail-ops.c:226
 #, c-format
-#| msgid "Fetching mail from '%s'"
 msgid "Fetching mail from “%s”"
 msgstr "Obteniendo correo de «%s»"
 
@@ -15852,61 +15443,51 @@ msgstr "Completado."
 
 #: ../src/libemail-engine/mail-ops.c:1164
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "Moviendo mensajes a «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1165
 #, c-format
-#| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
 msgstr "Copiando mensajes a «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1284
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "Guardando carpeta «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1412
 #, c-format
-#| msgid "Expunging and storing account '%s'"
 msgid "Expunging and storing account “%s”"
 msgstr "Compactando y almacenando cuenta «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1413
 #, c-format
-#| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "Almacenando cuenta «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1488
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Vaciando papelera en «%s»"
 
 #: ../src/libemail-engine/mail-ops.c:1580
 #, c-format
-#| msgid "Processing folder changes in '%s'"
 msgid "Processing folder changes in “%s”"
 msgstr "Procesando cambios de la carpeta en «%s»"
 
 #: ../src/libemail-engine/mail-tools.c:68
 #, c-format
-#| msgid "Could not create spool directory '%s': %s"
 msgid "Could not create spool directory “%s”: %s"
 msgstr "No se pudo crear la carpeta de cola de correo «%s»: %s"
 
 #: ../src/libemail-engine/mail-tools.c:108
 #, c-format
-#| msgid "Trying to movemail a non-mbox source '%s'"
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
 #: ../src/libemail-engine/mail-tools.c:257
 #, c-format
-#| msgid "Forwarded message - %s"
 msgid "Forwarded message — %s"
 msgstr "Mensaje reenviado: %s"
 
@@ -15921,7 +15502,6 @@ msgstr "Configurando carpeta de búsqueda: %s"
 
 #: ../src/libemail-engine/mail-vfolder.c:302
 #, c-format
-#| msgid "Updating Search Folders for '%s' - %s"
 msgid "Updating Search Folders for “%s” — %s"
 msgstr "Actualizando carpetas de búsqueda para «%s»: %s"
 
@@ -15932,14 +15512,6 @@ msgstr "Actualizando carpetas de búsqueda para «%s»: %s"
 #. * in front of its name, without quotes.
 #: ../src/libemail-engine/mail-vfolder.c:666
 #, c-format
-#| msgid ""
-#| "The Search Folder \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following Search Folders\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -15978,7 +15550,7 @@ msgid "De_fault"
 msgstr "_Predeterminada"
 
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1279
+#: ../src/modules/mail/em-composer-prefs.c:1285
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
 #: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
@@ -16033,12 +15605,6 @@ msgid "Check for Supported Types"
 msgstr "Comprobar tipos soportados"
 
 #: ../src/mail/e-mail-config-confirm-page.c:156
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email using Evolution.\n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -16196,10 +15762,6 @@ msgid "Defaults"
 msgstr "Predeterminados"
 
 #: ../src/mail/e-mail-config-identity-page.c:516
-#| msgid ""
-#| "Please enter your name and email address below. The \"optional\" fields "
-#| "below do not need to be filled in, unless you wish to include this "
-#| "information in email you send."
 msgid ""
 "Please enter your name and email address below. The “optional” fields below "
 "do not need to be filled in, unless you wish to include this information in "
@@ -16216,9 +15778,6 @@ msgstr "Información de la cuenta"
 
 #: ../src/mail/e-mail-config-identity-page.c:582
 #: ../src/mail/e-mail-config-summary-page.c:354
-#| msgid ""
-#| "The above name will be used to identify this account.\n"
-#| "Use for example, \"Work\" or \"Personal\"."
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -16260,7 +15819,7 @@ msgid "A_liases:"
 msgstr "A_lias:"
 
 #: ../src/mail/e-mail-config-identity-page.c:855
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "Add"
 msgstr "Añadir"
 
@@ -16269,7 +15828,7 @@ msgid "Edit"
 msgstr "Editar"
 
 #: ../src/mail/e-mail-config-identity-page.c:873
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -16306,15 +15865,15 @@ msgstr "El nombre de la cuenta no puede estar vacío"
 msgid "Looking up account details..."
 msgstr "Consultando los detalles de la cuenta…"
 
-#: ../src/mail/e-mail-config-provider-page.c:485
+#: ../src/mail/e-mail-config-provider-page.c:529
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: ../src/mail/e-mail-config-provider-page.c:501
+#: ../src/mail/e-mail-config-provider-page.c:545
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../src/mail/e-mail-config-provider-page.c:699
+#: ../src/mail/e-mail-config-provider-page.c:753
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
@@ -16359,25 +15918,25 @@ msgstr "Algoritmo de _firma:"
 
 #: ../src/mail/e-mail-config-security-page.c:430
 #: ../src/mail/e-mail-config-security-page.c:594
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:76
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../src/mail/e-mail-config-security-page.c:433
 #: ../src/mail/e-mail-config-security-page.c:597
-#: ../src/mail/mail-config.ui.h:75
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../src/mail/e-mail-config-security-page.c:436
 #: ../src/mail/e-mail-config-security-page.c:600
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../src/mail/e-mail-config-security-page.c:439
 #: ../src/mail/e-mail-config-security-page.c:603
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -16506,10 +16065,6 @@ msgid "Account Summary"
 msgstr "Resumen de la cuenta"
 
 #: ../src/mail/e-mail-config-welcome-page.c:157
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Next\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16741,7 +16296,7 @@ msgstr "Nombre de la cabecera"
 msgid "Header Value"
 msgstr "Valor de la cabecera"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
 msgid "Headers"
 msgstr "Cabeceras"
 
@@ -16784,9 +16339,8 @@ msgstr "_Ignorar siempre «Responder a:» para las listas de correo."
 msgid "Failed to retrieve message:"
 msgstr "Falló al obtener el mensaje:"
 
-#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3183
+#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
 #, c-format
-#| msgid "Retrieving message '%s'"
 msgid "Retrieving message “%s”"
 msgstr "Obteniendo mensaje «%s»"
 
@@ -17379,16 +16933,16 @@ msgstr "_Todas las cabeceras del mensaje"
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../src/mail/e-mail-reader.c:3189
+#: ../src/mail/e-mail-reader.c:3178
 msgid "Retrieving message"
 msgstr "Descargando mensaje"
 
-#: ../src/mail/e-mail-reader.c:4239
+#: ../src/mail/e-mail-reader.c:4228
 #: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../src/mail/e-mail-reader.c:4240
+#: ../src/mail/e-mail-reader.c:4229
 #: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
@@ -17397,52 +16951,52 @@ msgstr "Reenvía a alguien el mensaje seleccionado"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4259
+#: ../src/mail/e-mail-reader.c:4248
 msgid "Group Reply"
 msgstr "Responder al grupo"
 
-#: ../src/mail/e-mail-reader.c:4260
+#: ../src/mail/e-mail-reader.c:4249
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder a la lista de correo o a todos los destinatarios"
 
-#: ../src/mail/e-mail-reader.c:4326 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/mail/e-mail-reader.c:4338
+#: ../src/mail/e-mail-reader.c:4327
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/mail/e-mail-reader.c:4342
+#: ../src/mail/e-mail-reader.c:4331
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/mail/e-mail-reader.c:4351 ../src/mail/mail-dialogs.ui.h:16
+#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../src/mail/e-mail-reader.c:5424
+#: ../src/mail/e-mail-reader.c:5413
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Permitir contenido remoto para cualquiera de %s"
 
-#: ../src/mail/e-mail-reader.c:5426
+#: ../src/mail/e-mail-reader.c:5415
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Permitir contenido remoto para %s"
 
-#: ../src/mail/e-mail-reader.c:5443
+#: ../src/mail/e-mail-reader.c:5432
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Permitir contenido remoto de %s"
 
-#: ../src/mail/e-mail-reader.c:5460
+#: ../src/mail/e-mail-reader.c:5449
 msgid "Do not show this message again"
 msgstr "No mostrar otra vez este mensaje"
 
-#: ../src/mail/e-mail-reader.c:5508
+#: ../src/mail/e-mail-reader.c:5497
 msgid "Load remote content"
 msgstr "Cargar contenido remoto"
 
@@ -17452,7 +17006,6 @@ msgstr "No advertirme de nuevo"
 
 #: ../src/mail/e-mail-reader-utils.c:568
 #, c-format
-#| msgid "Refreshing folder '%s'"
 msgid "Refreshing folder “%s”"
 msgstr "Actualizando carpeta «%s»"
 
@@ -17480,12 +17033,6 @@ msgstr "Imprimiendo"
 #. * name %u with count of duplicate messages.
 #: ../src/mail/e-mail-reader-utils.c:1676
 #, c-format
-#| msgid ""
-#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
-#| "delete it?"
-#| msgid_plural ""
-#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
-#| "delete them?"
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
@@ -17535,7 +17082,6 @@ msgstr "Falló en la autenticación %s"
 
 #: ../src/mail/e-mail-ui-session.c:863
 #, c-format
-#| msgid "No data source found for UID '%s'"
 msgid "No data source found for UID “%s”"
 msgstr "No se han encontrado fuentes de datos para el UID «%s»"
 
@@ -17588,7 +17134,7 @@ msgstr "Esperando a que carguen los adjuntos…"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1743
+#: ../src/mail/em-composer-utils.c:1745
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17596,24 +17142,24 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../src/mail/em-composer-utils.c:1749
+#: ../src/mail/em-composer-utils.c:1751
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../src/mail/em-composer-utils.c:1754
+#: ../src/mail/em-composer-utils.c:1756
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../src/mail/em-composer-utils.c:3008
+#: ../src/mail/em-composer-utils.c:3038
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3484
+#: ../src/mail/em-composer-utils.c:3514
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../src/mail/em-composer-utils.c:3489
+#: ../src/mail/em-composer-utils.c:3519
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
@@ -17723,7 +17269,6 @@ msgid "Create a new folder"
 msgstr "Crea una carpeta nueva"
 
 #: ../src/mail/em-folder-tree.c:683
-#| msgid "Folder names cannot contain '/'"
 msgid "Folder names cannot contain “/”"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
@@ -17765,12 +17310,12 @@ msgstr "Moviendo la carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../src/mail/em-folder-tree.c:2262 ../src/mail/message-list.c:2503
+#: ../src/mail/em-folder-tree.c:2262 ../src/mail/message-list.c:2506
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../src/mail/em-folder-tree.c:2266 ../src/mail/message-list.c:2505
+#: ../src/mail/em-folder-tree.c:2266 ../src/mail/message-list.c:2508
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
@@ -17826,7 +17371,7 @@ msgid "Unsubscribe From _All"
 msgstr "Desuscribirse de _todo"
 
 #: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:1029
+#: ../src/modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17834,7 +17379,7 @@ msgstr[0] "%d no leído, "
 msgstr[1] "%d no leídos, "
 
 #: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1039
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17925,7 +17470,7 @@ msgstr "Filtros de mensajes"
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
 
-#: ../src/mail/em-utils.c:1707
+#: ../src/mail/em-utils.c:1764
 msgid "Deleting old messages"
 msgstr "Eliminando mensajes antiguos"
 
@@ -18122,7 +17667,7 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Leído"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:130
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "SPAM"
@@ -18334,7 +17879,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importar correo y contactos de KMail."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1060
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Trash"
 msgstr "Papelera"
 
@@ -18352,7 +17897,6 @@ msgstr "Importando correo y contactos de KMail"
 #: ../src/plugins/dbx-import/dbx-importer.c:605
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-#| msgid "Importing '%s'"
 msgid "Importing “%s”"
 msgstr "Importando «%s»"
 
@@ -18404,14 +17948,6 @@ msgstr "Añadir regla de filtrado"
 #. * of its name, without quotes.
 #: ../src/mail/mail-autofilter.c:509
 #, c-format
-#| msgid ""
-#| "The filter rule \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following filter rules\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -18606,30 +18142,35 @@ msgstr ""
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Enviando un correo usando una _tecla aceleradora (Ctrl+Intro)"
 
-#: ../src/mail/mail-config.ui.h:57
+#. Translators:
+#: ../src/mail/mail-config.ui.h:58
+msgid "Before composer _format changes from HTML to Plain Text"
+msgstr "Antes de que el editor _formatee los cambios de HTML a texto plano"
+
+#: ../src/mail/mail-config.ui.h:59
 msgid "Confirmations"
 msgstr "Confirmaciones"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:61
+#: ../src/mail/mail-config.ui.h:63
 msgid "Use for Folders"
 msgstr "Usar para carpetas"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:66
+#: ../src/mail/mail-config.ui.h:68
 msgid "Use for Recipients"
 msgstr "Usar para destinatarios"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:68 ../src/modules/mail/em-composer-prefs.c:861
+#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:861
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../src/mail/mail-config.ui.h:69
+#: ../src/mail/mail-config.ui.h:71
 msgid "Send account overrides"
 msgstr "Enviar anulaciones de cuenta"
 
-#: ../src/mail/mail-config.ui.h:70
+#: ../src/mail/mail-config.ui.h:72
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -18642,230 +18183,227 @@ msgstr ""
 "nombres parciales. Las partes de los nombres y las direcciones se comparan "
 "por separado."
 
-#: ../src/mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:73
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "La _anulación de carpeta tiene preferencia sobre la anulación de destinatario"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send Account"
 msgstr "Cuenta de envío"
 
-#: ../src/mail/mail-config.ui.h:78 ../src/smime/gui/smime-ui.ui.h:1
+#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "am"
 
-#: ../src/mail/mail-config.ui.h:79 ../src/smime/gui/smime-ui.ui.h:2
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "por"
 
-#: ../src/mail/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:82
 msgid "Start up"
 msgstr "Inicio"
 
-#: ../src/mail/mail-config.ui.h:81
+#: ../src/mail/mail-config.ui.h:83
 msgid "Check for new _messages on start"
 msgstr "Comprobar si hay mensajes _nuevos al inicio"
 
-#: ../src/mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprobar si hay _mensajes nuevos en todas las cuentas activas"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:85
 msgid "Message Display"
 msgstr "Mostrado de mensajes"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:86
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:87
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:88
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:90
 msgid "Fix_ed Width Font:"
 msgstr "Tipografía de anchura _fija:"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:91
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
 # Esta cadena debe permanecer así
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:93
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../src/mail/mail-config.ui.h:92
+#: ../src/mail/mail-config.ui.h:94
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Elija un color"
 
 # Esta traducción debe mantenerse así
-#: ../src/mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:95
 msgid "color"
 msgstr "color"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:96
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: ../src/mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:97
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar los mismos ajustes de _vista a todas las carpetas"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:98
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:99
 msgid "Delete Mail"
 msgstr "Eliminar correo-e"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:100
 msgid "Empty _trash folders"
 msgstr "Vaciar carpetas de_papelera"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:101
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de purgar una carpeta"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:102
 msgid "Archive Mail"
 msgstr "Archivar correo"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:103
 msgid "On This Computer A_rchive folder:"
 msgstr "Carpeta de a_rchivo en este equipo:"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:104
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Carpeta de archivo que usar para mensajes en este equipo"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "_Show animated images"
 msgstr "_Mostrar las imágenes animadas"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:107
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "Loading Remote Content"
 msgstr "Cargando contenido remoto"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Never load remote content from the Internet"
 msgstr "_Nunca cargar contenido remoto desde Internet"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:110
 msgid "_Load remote content only in messages from contacts"
 msgstr "Cargar el _contenido remoto sólo en los mensajes de los contactos"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Always load remote content from the Internet"
 msgstr "_Siempre cargar el contenido remoto desde Internet"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 msgid "Notify about _missing remote content in the message preview"
 msgstr ""
 "Informar de pé_rdida de contenido remoto en la vista previa del mensaje"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:115
 msgid "Allow for sites:"
 msgstr "Permitir para los sitios:"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:116
 msgid "Allow for senders:"
 msgstr "Permitir para los remitentes:"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:117
 msgid "HTML Messages"
 msgstr "Mensajes HTML"
 
-#: ../src/mail/mail-config.ui.h:116 ../src/mail/message-list.etspec.h:19
+#: ../src/mail/mail-config.ui.h:118 ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "Sender Photograph"
 msgstr "Foto del remitente"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:120
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Buscar en gra_vatar.com la foto del remitente"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "Displayed Message Headers"
 msgstr "Cabeceras mostradas del mensaje"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:123
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 #: ../src/modules/addressbook/autocompletion-config.c:117
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:126
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:127
 msgid "_Delete junk messages"
 msgstr "_Eliminar los mensajes SPAM"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
 msgid "Junk Test Options"
 msgstr "Opciones de prueba de spam"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_No marcar los mensajes como basura si el remitente está en mi libreta de "
 "direcciones"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Sin cifrado"
 
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:134
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
 #: ../src/mail/mail-dialogs.ui.h:1
-#| msgid ""
-#| "The messages you have selected for follow up are listed below.\n"
-#| "Please select a follow up action from the \"Flag\" menu."
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the “Flag” menu."
@@ -18955,7 +18493,6 @@ msgstr ""
 "soporte ningún tipo de autenticación."
 
 #: ../src/mail/mail.error.xml.h:3
-#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgid "Your login to your server “{0}” as “{0}” failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
@@ -19111,11 +18648,6 @@ msgid "Use default drafts folder?"
 msgstr "¿Quiere usar la carpeta de borradores predeterminada?"
 
 #: ../src/mail/mail.error.xml.h:34
-#| msgid ""
-#| "Unable to open the drafts folder for this account. Use the system drafts "
-#| "folder instead?\n"
-#| "\n"
-#| "The reported error was &quot;{0}&quot;."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
@@ -19132,9 +18664,6 @@ msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
 #: ../src/mail/mail.error.xml.h:38
-#| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "folder \"{0}\"?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder “{0}”?"
@@ -19203,17 +18732,14 @@ msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
 #: ../src/mail/mail.error.xml.h:54
-#| msgid "Cannot save to directory \"{0}\"."
 msgid "Cannot save to directory “{0}”."
 msgstr "No se puede guardar en la carpeta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:55
-#| msgid "Cannot save to file \"{0}\"."
 msgid "Cannot save to file “{0}”."
 msgstr "No se puede guardar al archivo «{0}»."
 
 #: ../src/mail/mail.error.xml.h:56
-#| msgid "Cannot create the save directory, because \"{1}\""
 msgid "Cannot create the save directory, because “{1}”"
 msgstr "No se puede crear la carpeta de guardado, debido a «{1}»"
 
@@ -19230,12 +18756,10 @@ msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
 #: ../src/mail/mail.error.xml.h:60
-#| msgid "Cannot delete folder \"{0}\"."
 msgid "Cannot delete folder “{0}”."
 msgstr "No se puede eliminar la carpeta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:61
-#| msgid "Cannot delete system folder \"{0}\"."
 msgid "Cannot delete system folder “{0}”."
 msgstr "No se puede eliminar la carpeta del sistema «{0}»."
 
@@ -19248,29 +18772,22 @@ msgstr ""
 "pueden renombrarse, moverse o eliminarse."
 
 #: ../src/mail/mail.error.xml.h:63
-#| msgid "Failed to expunge folder &quot;{0}&quot;."
 msgid "Failed to expunge folder “{0}”."
 msgstr "Falló al compactar la carpeta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:65
-#| msgid "Failed to refresh folder &quot;{0}&quot;."
 msgid "Failed to refresh folder “{0}”."
 msgstr "Falló al actualizar la carpeta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:66
-#| msgid "Cannot rename or move system folder \"{0}\"."
 msgid "Cannot rename or move system folder “{0}”."
 msgstr "No se puede renombrar o mover la carpeta del sistema «{0}»."
 
 #: ../src/mail/mail.error.xml.h:67
-#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgid "Really delete folder “{0}” and all of its subfolders?"
 msgstr "¿Seguro que quiere eliminar la carpeta «{0}» y todas sus subcarpetas?"
 
 #: ../src/mail/mail.error.xml.h:68
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders' "
-#| "contents will be deleted permanently."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
@@ -19279,15 +18796,10 @@ msgstr ""
 "eliminará permanentemente."
 
 #: ../src/mail/mail.error.xml.h:70
-#| msgid "Really unsubscribe folder \"{0}\"?"
 msgid "Really unsubscribe folder “{0}”?"
 msgstr "¿Realmente quiere desuscribirse de la carpeta «{0}»?"
 
 #: ../src/mail/mail.error.xml.h:71
-#| msgid ""
-#| "If you unsubscribe the folder, it might not be visible in the Evolution, "
-#| "while still being available on the server. You can re-subscribe in Folder-"
-#| ">Subscriptions... menu."
 msgid ""
 "If you unsubscribe the folder, it might not be visible in the Evolution, "
 "while still being available on the server. You can re-subscribe in "
@@ -19302,7 +18814,6 @@ msgid "Do _Not Unsubscribe"
 msgstr "_No desuscribir"
 
 #: ../src/mail/mail.error.xml.h:74
-#| msgid "Really delete folder \"{0}\"?"
 msgid "Really delete folder “{0}”?"
 msgstr "¿Realmente quiere eliminar la carpeta «{0}»?"
 
@@ -19327,17 +18838,14 @@ msgstr ""
 "mensajes?"
 
 #: ../src/mail/mail.error.xml.h:78
-#| msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgid "Cannot rename “{0}” to “{1}”."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #: ../src/mail/mail.error.xml.h:79
-#| msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgid "A folder named “{1}” already exists. Please use a different name."
 msgstr "Ya existe una carpeta llamada «{1}». Use un nombre diferente."
 
 #: ../src/mail/mail.error.xml.h:80
-#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgid "Cannot move folder “{0}” to “{1}”."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
@@ -19350,12 +18858,10 @@ msgid "Cannot open target folder. Error: {2}"
 msgstr "No se puede abrir la carpeta de destino. Error: {2}"
 
 #: ../src/mail/mail.error.xml.h:83
-#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgid "Cannot copy folder “{0}” to “{1}”."
 msgstr "No se puede copiar la carpeta: «{0}» a «{1}»."
 
 #: ../src/mail/mail.error.xml.h:84
-#| msgid "Cannot create folder \"{0}\"."
 msgid "Cannot create folder “{0}”."
 msgstr "No se puede crear la carpeta «{0}»."
 
@@ -19414,7 +18920,6 @@ msgid "_Disable"
 msgstr "_Desactivar"
 
 #: ../src/mail/mail.error.xml.h:98
-#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgid "Cannot edit Search Folder “{0}” as it does not exist."
 msgstr "No se puede editar la carpeta de búsqueda «{0}» ya que no existe."
 
@@ -19428,12 +18933,10 @@ msgstr ""
 "necesario."
 
 #: ../src/mail/mail.error.xml.h:101
-#| msgid "Cannot add Search Folder \"{0}\"."
 msgid "Cannot add Search Folder “{0}”."
 msgstr "No se puede añadir la carpeta de búsqueda «{0}»."
 
 #: ../src/mail/mail.error.xml.h:102
-#| msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgid "A folder named “{0}” already exists. Please use a different name."
 msgstr "Ya existe una carpeta llamada «{0}». Use un nombre diferente."
 
@@ -19472,16 +18975,10 @@ msgstr ""
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
 #: ../src/mail/mail.error.xml.h:112
-#| msgid "Problem migrating old mail folder \"{0}\"."
 msgid "Problem migrating old mail folder “{0}”."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
 #: ../src/mail/mail.error.xml.h:113
-#| msgid ""
-#| "A non-empty folder at \"{1}\" already exists.\n"
-#| "\n"
-#| "You can choose to ignore this folder, overwrite or append its contents, "
-#| "or quit."
 msgid ""
 "A non-empty folder at “{1}” already exists.\n"
 "\n"
@@ -19502,19 +18999,10 @@ msgid "_Append"
 msgstr "_Agregar"
 
 #: ../src/mail/mail.error.xml.h:119
-#| msgid "Evolution's local mail format has changed."
 msgid "Evolution’s local mail format has changed."
 msgstr "El formato de correo local de Evolution ha cambiado."
 
 #: ../src/mail/mail.error.xml.h:120
-#| msgid ""
-#| "Evolution's local mail format has changed from mbox to Maildir. Your "
-#| "local mail must be migrated to the new format before Evolution can "
-#| "proceed. Do you want to migrate now?\n"
-#| "\n"
-#| "An mbox account will be created to preserve the old mbox folders. You can "
-#| "delete the account after ensuring the data is safely migrated. Please "
-#| "make sure there is enough disk space if you choose to migrate now."
 msgid ""
 "Evolution’s local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -19545,9 +19033,6 @@ msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
 #: ../src/mail/mail.error.xml.h:126
-#| msgid ""
-#| "Cannot read the license file \"{0}\", due to an installation problem. You "
-#| "will not be able to use this provider until you can accept its license."
 msgid ""
 "Cannot read the license file “{0}”, due to an installation problem. You will "
 "not be able to use this provider until you can accept its license."
@@ -19642,7 +19127,6 @@ msgid "Copy folder in folder tree."
 msgstr "Copiar carpeta en el árbol de carpetas."
 
 #: ../src/mail/mail.error.xml.h:145
-#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr "¿Está seguro de que quiere copiar la carpeta «{0}» a «{1}»?"
 
@@ -19663,7 +19147,6 @@ msgid "Move folder in folder tree."
 msgstr "Mover carpeta en el árbol de carpetas."
 
 #: ../src/mail/mail.error.xml.h:151
-#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "¿Está seguro de que quiere mover la carpeta «{0}» a «{1}»?"
 
@@ -19700,17 +19183,14 @@ msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para eliminar este correo."
 
 #: ../src/mail/mail.error.xml.h:160
-#| msgid "\"Check Junk\" Failed"
 msgid "“Check Junk” Failed"
 msgstr "Falló la comprobación de SPAM"
 
 #: ../src/mail/mail.error.xml.h:161
-#| msgid "\"Report Junk\" Failed"
 msgid "“Report Junk” Failed"
 msgstr "Falló al informar de que es SPAM"
 
 #: ../src/mail/mail.error.xml.h:162
-#| msgid "\"Report Not Junk\" Failed"
 msgid "“Report Not Junk” Failed"
 msgstr "Falló al informar de que no es SPAM"
 
@@ -19724,22 +19204,18 @@ msgstr "No se encontró ningún correo duplicado."
 
 #. Translators: {0} is replaced with a folder name
 #: ../src/mail/mail.error.xml.h:166
-#| msgid "Folder '{0}' doesn't contain any duplicate message."
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "La carpeta «{0}» no contiene ningún correo duplicado."
 
 #: ../src/mail/mail.error.xml.h:167
-#| msgid "Failed to connect mail account '{0}'"
 msgid "Failed to connect account “{0}”."
 msgstr "Falló al conectar a la cuenta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:168
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
 msgid "Failed to disconnect account “{0}”."
 msgstr "Falló al desconectar la cuenta «{0}»."
 
 #: ../src/mail/mail.error.xml.h:169
-#| msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Falló al desuscribirse de la carpeta «{0}»."
 
@@ -19756,12 +19232,6 @@ msgid "Message is not available in offline mode."
 msgstr "Mensaje no disponible en modo desconectado."
 
 #: ../src/mail/mail.error.xml.h:173
-#| msgid ""
-#| "This can be due to the message not being downloaded yet. The folder, or "
-#| "the account, can be marked for offline synchronization. Then, once the "
-#| "account is online again, use File-&gt;Download Messages for Offline "
-#| "Usage, when this folder is selected, to make sure that all the messages "
-#| "in the folder will be available in offline mode."
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -19821,7 +19291,6 @@ msgid "Printing failed."
 msgstr "Falló al imprimir."
 
 #: ../src/mail/mail.error.xml.h:185
-#| msgid "The printer replied &quot;{0}&quot;."
 msgid "The printer replied “{0}”."
 msgstr "La impresora respondió «{0}»."
 
@@ -19834,27 +19303,22 @@ msgid "You must be working online to complete this operation."
 msgstr "Debe estar trabajando en línea para completar esta operación."
 
 #: ../src/mail/mail.error.xml.h:188
-#| msgid "Message from &quot;{0}&quot; account:"
 msgid "Message from “{0}” account:"
 msgstr "Mensaje de la cuenta «{0}»:"
 
 #: ../src/mail/mail.error.xml.h:189
-#| msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Falló al marcar la conversación para ignorarla en la carpeta «{0}»"
 
 #: ../src/mail/mail.error.xml.h:190
-#| msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "Falló al desmarcar la conversación para ignorarla en la carpeta «{0}»"
 
 #: ../src/mail/mail.error.xml.h:191
-#| msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "Falló al marcar la sub-conversación para ignorarla en la carpeta «{0}»"
 
 #: ../src/mail/mail.error.xml.h:192
-#| msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr ""
 "Falló al demarcar la sub-conversación para ignorarla en la carpeta «{0}»"
@@ -19892,13 +19356,11 @@ msgstr "La nota de este mensaje ha cambiado, pero no se ha guardado."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
 #: ../src/mail/mail.error.xml.h:205
-#| msgid "Failed to delete message note in folder '{0}'"
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Falló al eliminar la nota del mensaje en la carpeta «{0}»"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
 #: ../src/mail/mail.error.xml.h:207
-#| msgid "Failed to store message note in folder '{0}'"
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Falló al guardar la nota del mensaje en la carpeta «{0}»"
 
@@ -19924,25 +19386,21 @@ msgstr "Esperando…"
 
 #: ../src/mail/mail-send-recv.c:1228
 #, c-format
-#| msgid "Checking for new mail at '%s'"
 msgid "Checking for new mail at “%s”"
 msgstr "Comprobando si hay correo nuevo en «%s»"
 
 #: ../src/mail/mail-send-recv.c:1455
 #, c-format
-#| msgid "Deleting junk and expunging trash at '%s'"
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "Eliminando el spam y purgando la papelera en «%s»"
 
 #: ../src/mail/mail-send-recv.c:1457
 #, c-format
-#| msgid "Deleting junk at '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Eliminando spam en «%s»"
 
 #: ../src/mail/mail-send-recv.c:1459
 #, c-format
-#| msgid "Expunging trash at '%s'"
 msgid "Expunging trash at “%s”"
 msgstr "Purgando papelera en «%s»"
 
@@ -19958,92 +19416,87 @@ msgstr "Editar carpeta de búsqueda"
 msgid "New Search Folder"
 msgstr "Carpeta de búsqueda nueva"
 
-#: ../src/mail/message-list.c:297
+#: ../src/mail/message-list.c:298
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../src/mail/message-list.c:298
+#: ../src/mail/message-list.c:299
 msgid "Seen"
 msgstr "Visto"
 
-#: ../src/mail/message-list.c:299
+#: ../src/mail/message-list.c:300
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../src/mail/message-list.c:300
+#: ../src/mail/message-list.c:301
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../src/mail/message-list.c:315
+#: ../src/mail/message-list.c:316
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../src/mail/message-list.c:316
+#: ../src/mail/message-list.c:317
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../src/mail/message-list.c:320
+#: ../src/mail/message-list.c:321
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../src/mail/message-list.c:321
+#: ../src/mail/message-list.c:322
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../src/mail/message-list.c:467 ../src/mail/message-list.c:6208
+#: ../src/mail/message-list.c:468 ../src/mail/message-list.c:6215
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2069
+#: ../src/mail/message-list.c:2072
 #: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../src/mail/message-list.c:2078
+#: ../src/mail/message-list.c:2081
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../src/mail/message-list.c:2090
+#: ../src/mail/message-list.c:2093
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../src/mail/message-list.c:2098
+#: ../src/mail/message-list.c:2101
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../src/mail/message-list.c:2100
+#: ../src/mail/message-list.c:2103
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../src/mail/message-list.c:3008
+#: ../src/mail/message-list.c:3012
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../src/mail/message-list.c:3715 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3720 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mensajes"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5135
+#: ../src/mail/message-list.c:5142
 msgid "Follow-up"
 msgstr "Seguimiento"
 
-#: ../src/mail/message-list.c:6147
-#| msgid ""
-#| "No message satisfies your search criteria. Change search criteria by "
-#| "selecting a new Show message filter from the drop down list above or by "
-#| "running a new search either by clearing it with Search->Clear menu item "
-#| "or by changing the query above."
+#: ../src/mail/message-list.c:6154
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -20055,7 +19508,7 @@ msgstr ""
 "desplegable o ejecutando una búsqueda nueva, limpiándola con Buscar→Limpiar "
 "o cambiando la consulta anterior."
 
-#: ../src/mail/message-list.c:6155
+#: ../src/mail/message-list.c:6162
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -20084,7 +19537,6 @@ msgid "Messages To"
 msgstr "Mensajes para"
 
 #: ../src/mail/message-list.etspec.h:20
-#| msgid "Subject - Trimmed"
 msgid "Subject — Trimmed"
 msgstr "Asunto: recortado"
 
@@ -20534,7 +19986,6 @@ msgstr ""
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:352
 #, c-format
-#| msgid "Checking content of backup file '%s', please wait..."
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Comprobando el contenido del archivo de respaldo «%s», espere…"
 
@@ -20625,8 +20076,9 @@ msgstr "Respaldo de Evolution"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:900
 #, c-format
-msgid "Backing up to the folder %s"
-msgstr "Respaldando a la carpeta %s"
+#| msgid "Backing up to the folder %s"
+msgid "Backing up to the file %s"
+msgstr "Respaldando al archivo %s"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:904
 msgid "Evolution Restore"
@@ -20634,8 +20086,9 @@ msgstr "Restaurador de Evolution"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:905
 #, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restaurando desde la carpeta %s"
+#| msgid "Restoring from the folder %s"
+msgid "Restoring from the file %s"
+msgstr "Restaurando desde el archivo %s"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:974
 msgid "Backing up Evolution Data"
@@ -20663,7 +20116,6 @@ msgid "Invalid Evolution backup file"
 msgstr "Archivo de respaldo de Evolution no válido"
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "File '{0}' is not a valid Evolution backup file."
 msgid "File “{0}” is not a valid Evolution backup file."
 msgstr "El archivo «{0}» no es un archivo de respaldo de Evolution válido."
 
@@ -20820,10 +20272,6 @@ msgid "Method:"
 msgstr "Métodos:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that "
-#| "setting this to \"Using email address\" requires anonymous access to your "
-#| "LDAP server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to “Using email address” requires anonymous access to your LDAP "
@@ -20864,11 +20312,6 @@ msgid "Search Scope:"
 msgstr "Ámbito de búsqueda:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
-#| msgid ""
-#| "The search scope defines how deep you would like the search to extend "
-#| "down the directory tree.  A search scope of \"Subtree\" will include all "
-#| "entries below your search base.  A search scope of \"One Level\" will "
-#| "only include the entries one level beneath your search base."
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of “Subtree” will include all entries "
@@ -21081,37 +20524,31 @@ msgstr "Lista de notas nueva"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
-#| msgid "Copying an event into the calendar '%s'"
 msgid "Copying an event into the calendar “%s”"
 msgstr "Copiando un evento al calendario «%s»"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
-#| msgid "Moving an event into the calendar '%s'"
 msgid "Moving an event into the calendar “%s”"
 msgstr "Moviendo un evento al calendario «%s»"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
-#| msgid "Copying a memo into the memo list '%s'"
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Copiando una nota a la lista de notas «%s»"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
-#| msgid "Moving a memo into the memo list '%s'"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Moviendo una nota a la lista de notas «%s»"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
-#| msgid "Copying a task into the task list '%s'"
 msgid "Copying a task into the task list “%s”"
 msgstr "Copiando una tarea a la lista de tareas «%s»"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
-#| msgid "Moving a task into the task list '%s'"
 msgid "Moving a task into the task list “%s”"
 msgstr "Moviendo una tarea a la lista de tareas «%s»"
 
@@ -21767,7 +21204,6 @@ msgid "Active Appointments"
 msgstr "Citas activas"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
-#| msgid "Next 7 Days' Appointments"
 msgid "Next 7 Days’ Appointments"
 msgstr "Citas de los próximos 7 días"
 
@@ -22195,7 +21631,6 @@ msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:945
-#| msgid "Next 7 Days' Tasks"
 msgid "Next 7 Days’ Tasks"
 msgstr "Tareas de los próximos 7 días"
 
@@ -22714,161 +22149,171 @@ msgid "Sa_ve"
 msgstr "Guar_dar"
 
 #: ../src/modules/itip-formatter/itip-view.c:3472
-#: ../src/modules/itip-formatter/itip-view.c:4928
+#: ../src/modules/itip-formatter/itip-view.c:4941
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../src/modules/itip-formatter/itip-view.c:3637
+#: ../src/modules/itip-formatter/itip-view.c:3644
+#, c-format
+#| msgid "An appointment in the calendar “%s” conflicts with this meeting"
+msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgstr ""
+"Una cita «%s» en el calendario «%s» entra en conflicto con esta reunión"
+
+#: ../src/modules/itip-formatter/itip-view.c:3650
 #, c-format
-#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgid "An appointment in the calendar “%s” conflicts with this meeting"
-msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
+#| msgid "An appointment in the calendar “%s” conflicts with this meeting"
+msgid ""
+"The calendar “%s” contains an appointment which conflicts with this meeting"
+msgstr "El calendario «%s» una cita que entra en conflicto con esta reunión"
 
-#: ../src/modules/itip-formatter/itip-view.c:3667
+#: ../src/modules/itip-formatter/itip-view.c:3651
+#, c-format
+#| msgid "An appointment in the calendar “%s” conflicts with this meeting"
+msgid ""
+"The calendar “%s” contains %d appointments which conflict with this meeting"
+msgstr ""
+"El calendario «%s» contiene %d citas que entran en conflicto con esta reunión"
+
+#: ../src/modules/itip-formatter/itip-view.c:3683
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../src/modules/itip-formatter/itip-view.c:3801
+#: ../src/modules/itip-formatter/itip-view.c:3817
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../src/modules/itip-formatter/itip-view.c:3809
+#: ../src/modules/itip-formatter/itip-view.c:3825
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../src/modules/itip-formatter/itip-view.c:3814
+#: ../src/modules/itip-formatter/itip-view.c:3830
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../src/modules/itip-formatter/itip-view.c:3819
+#: ../src/modules/itip-formatter/itip-view.c:3835
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../src/modules/itip-formatter/itip-view.c:4163
+#: ../src/modules/itip-formatter/itip-view.c:4176
 msgid "Opening the calendar. Please wait..."
 msgstr "Abriendo el calendario. Espere…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4168
+#: ../src/modules/itip-formatter/itip-view.c:4181
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../src/modules/itip-formatter/itip-view.c:4567
+#: ../src/modules/itip-formatter/itip-view.c:4580
 #, c-format
-#| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to calendar “%s”.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4582
+#: ../src/modules/itip-formatter/itip-view.c:4595
 #, c-format
-#| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../src/modules/itip-formatter/itip-view.c:4587
+#: ../src/modules/itip-formatter/itip-view.c:4600
 #, c-format
-#| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../src/modules/itip-formatter/itip-view.c:4593
+#: ../src/modules/itip-formatter/itip-view.c:4606
 #, c-format
-#| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../src/modules/itip-formatter/itip-view.c:4599
+#: ../src/modules/itip-formatter/itip-view.c:4612
 #, c-format
-#| msgid "Sent to calendar '%s' as cancelled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../src/modules/itip-formatter/itip-view.c:4619
-#: ../src/modules/itip-formatter/itip-view.c:5065
-#: ../src/modules/itip-formatter/itip-view.c:5168
+#: ../src/modules/itip-formatter/itip-view.c:4632
+#: ../src/modules/itip-formatter/itip-view.c:5078
+#: ../src/modules/itip-formatter/itip-view.c:5181
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Guardando cambios en el calendario. Espere…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4660
+#: ../src/modules/itip-formatter/itip-view.c:4673
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../src/modules/itip-formatter/itip-view.c:4852
+#: ../src/modules/itip-formatter/itip-view.c:4865
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4869
+#: ../src/modules/itip-formatter/itip-view.c:4882
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../src/modules/itip-formatter/itip-view.c:4873
+#: ../src/modules/itip-formatter/itip-view.c:4886
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../src/modules/itip-formatter/itip-view.c:4920
+#: ../src/modules/itip-formatter/itip-view.c:4933
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4955
+#: ../src/modules/itip-formatter/itip-view.c:4968
 msgid "The meeting is invalid and cannot be updated"
 msgstr "La cita no es válida y no se puede actualizar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5030
+#: ../src/modules/itip-formatter/itip-view.c:5043
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado no es "
 "válido"
 
-#: ../src/modules/itip-formatter/itip-view.c:5101
-#: ../src/modules/itip-formatter/itip-view.c:5139
+#: ../src/modules/itip-formatter/itip-view.c:5114
+#: ../src/modules/itip-formatter/itip-view.c:5152
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../src/modules/itip-formatter/itip-view.c:5200
+#: ../src/modules/itip-formatter/itip-view.c:5213
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../src/modules/itip-formatter/itip-view.c:5205
+#: ../src/modules/itip-formatter/itip-view.c:5218
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../src/modules/itip-formatter/itip-view.c:5210
+#: ../src/modules/itip-formatter/itip-view.c:5223
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../src/modules/itip-formatter/itip-view.c:5221
+#: ../src/modules/itip-formatter/itip-view.c:5234
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5239
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../src/modules/itip-formatter/itip-view.c:5231
+#: ../src/modules/itip-formatter/itip-view.c:5244
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5296
+#: ../src/modules/itip-formatter/itip-view.c:5309
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5301
+#: ../src/modules/itip-formatter/itip-view.c:5314
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../src/modules/itip-formatter/itip-view.c:5349
 #: ../src/modules/itip-formatter/itip-view.c:5362
+#: ../src/modules/itip-formatter/itip-view.c:5375
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../src/modules/itip-formatter/itip-view.c:5350
 #: ../src/modules/itip-formatter/itip-view.c:5363
+#: ../src/modules/itip-formatter/itip-view.c:5376
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -22876,15 +22321,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../src/modules/itip-formatter/itip-view.c:5405
-#: ../src/modules/itip-formatter/itip-view.c:5435
-#: ../src/modules/itip-formatter/itip-view.c:5538
+#: ../src/modules/itip-formatter/itip-view.c:5418
+#: ../src/modules/itip-formatter/itip-view.c:5448
+#: ../src/modules/itip-formatter/itip-view.c:5551
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../src/modules/itip-formatter/itip-view.c:5406
-#: ../src/modules/itip-formatter/itip-view.c:5436
-#: ../src/modules/itip-formatter/itip-view.c:5539
+#: ../src/modules/itip-formatter/itip-view.c:5419
+#: ../src/modules/itip-formatter/itip-view.c:5449
+#: ../src/modules/itip-formatter/itip-view.c:5552
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -22892,11 +22337,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../src/modules/itip-formatter/itip-view.c:5451
+#: ../src/modules/itip-formatter/itip-view.c:5464
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../src/modules/itip-formatter/itip-view.c:5452
+#: ../src/modules/itip-formatter/itip-view.c:5465
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -22904,24 +22349,24 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../src/modules/itip-formatter/itip-view.c:5970
+#: ../src/modules/itip-formatter/itip-view.c:5983
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/modules/itip-formatter/itip-view.c:5986
+#: ../src/modules/itip-formatter/itip-view.c:5999
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../src/modules/itip-formatter/itip-view.c:6152
+#: ../src/modules/itip-formatter/itip-view.c:6165
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../src/modules/itip-formatter/itip-view.c:6155
+#: ../src/modules/itip-formatter/itip-view.c:6168
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../src/modules/itip-formatter/itip-view.c:6158
+#: ../src/modules/itip-formatter/itip-view.c:6171
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
@@ -22935,8 +22380,6 @@ msgid "This meeting has been delegated"
 msgstr "Esta reunión se ha delegado"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#| msgid ""
-#| "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr "«{0}» ha delegado la reunión. ¿Quiere añadir al delegado «{1}»?"
 
@@ -23058,7 +22501,6 @@ msgid "TLS on a dedicated port"
 msgstr "TLS en un puerto dedicado"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
-#| msgid "_Use custom binary, instead of 'sendmail'"
 msgid "_Use custom binary, instead of “sendmail”"
 msgstr "_Usar archivo binario personalizado, en lugar de «sendmail»"
 
@@ -23075,10 +22517,6 @@ msgid "Cus_tom arguments:"
 msgstr "Argumen_tos personalizados:"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
-#| msgid ""
-#| "Default arguments are '-i -f %F -- %R', where\n"
-#| "   %F - stands for the From address\n"
-#| "   %R - stands for the recipient addresses"
 msgid ""
 "Default arguments are “-i -f %F -- %R”, where\n"
 "   %F — stands for the From address\n"
@@ -23517,7 +22955,6 @@ msgid "Important Messages"
 msgstr "Mensajes importantes"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:2098
-#| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "Mensajes de los últimos 5 días"
 
@@ -23573,58 +23010,58 @@ msgstr "Búsqueda en todas las cuentas"
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:966
-#: ../src/modules/mail/e-mail-shell-view-private.c:983
+#: ../src/modules/mail/e-mail-shell-view-private.c:940
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminados"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:992
-#: ../src/modules/mail/e-mail-shell-view-private.c:998
+#: ../src/modules/mail/e-mail-shell-view-private.c:966
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1005
+#: ../src/modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d no leído"
 msgstr[1] "%d no leídos"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1552
+#: ../src/modules/mail/e-mail-shell-view-private.c:1526
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -23640,19 +23077,19 @@ msgstr "Carpeta"
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../src/modules/mail/em-composer-prefs.c:1202
+#: ../src/modules/mail/em-composer-prefs.c:1208
 msgid "Keep in Outbox"
 msgstr "Guardar en la bandeja de salida"
 
-#: ../src/modules/mail/em-composer-prefs.c:1203
+#: ../src/modules/mail/em-composer-prefs.c:1209
 msgid "Send immediately"
 msgstr "Enviar inmediatamente"
 
-#: ../src/modules/mail/em-composer-prefs.c:1204
+#: ../src/modules/mail/em-composer-prefs.c:1210
 msgid "Send after 5 minutes"
 msgstr "Enviar dentro de 5 minutos"
 
-#: ../src/modules/mail/em-composer-prefs.c:1283
+#: ../src/modules/mail/em-composer-prefs.c:1289
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -23701,20 +23138,17 @@ msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
 #. * is the subject of the email, third %s is the date.
 #: ../src/modules/mdn/evolution-mdn.c:308
 #, c-format
-#| msgid "Your message to %s about \"%s\" on %s has been read."
 msgid "Your message to %s about “%s” on %s has been read."
 msgstr "Su mensaje para %s acerca de «%s» se ha leído el %s."
 
 #. Translators: %s is the subject of the email message.
 #: ../src/modules/mdn/evolution-mdn.c:374
 #, c-format
-#| msgid "Delivery Notification for \"%s\""
 msgid "Delivery Notification for “%s”"
 msgstr "Notificación de entrega para «%s»"
 
 #: ../src/modules/mdn/evolution-mdn.c:540
 #, c-format
-#| msgid "Send a read receipt to '%s'"
 msgid "Send a read receipt to “%s”"
 msgstr "Enviar confirmación de lectura a «%s»"
 
@@ -23737,7 +23171,6 @@ msgid "Evolution is currently offline."
 msgstr "Actualmente Evolution está desconectado."
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid "Click 'Work Online' to return to online mode."
 msgid "Click “Work Online” to return to online mode."
 msgstr "Pulse en «Trabajar conectado» para volver al modo conectado."
 
@@ -23881,7 +23314,6 @@ msgstr "Falló al enviar el flujo del contenido de los correos a SpamAssassin: "
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
-#| msgid "Failed to write '%s' to SpamAssassin: "
 msgid "Failed to write “%s” to SpamAssassin: "
 msgstr "Falló al escribir «%s» a SpamAssassin: "
 
@@ -24203,11 +23635,11 @@ msgstr "Contacto de la libreta de direcciones"
 msgid "Display the part as an addressbook contact"
 msgstr "Mostrar parte como un contacto de la libreta de direcciones"
 
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:124
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:169
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:482
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
 #: ../src/plugins/templates/templates.c:488
 msgid "Keywords"
 msgstr "Palabras clave"
@@ -24360,9 +23792,6 @@ msgstr "_Cabeceras personalizadas"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
 #: ../src/plugins/email-custom-header/email-custom-header.c:807
-#| msgid ""
-#| "The format for specifying a Custom Header key value is:\n"
-#| "Name of the Custom Header key values separated by \";\"."
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -24398,9 +23827,6 @@ msgid "Command to be executed to launch the editor: "
 msgstr "Comando que ejecutar para lanzar el editor: "
 
 #: ../src/plugins/external-editor/external-editor.c:112
-#| msgid ""
-#| "For XEmacs use \"xemacs\"\n"
-#| "For Vim use \"gvim -f\""
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
@@ -24502,9 +23928,6 @@ msgid "Invalid Image Size"
 msgstr "Tamaño de imagen no válido"
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:4
-#| msgid ""
-#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
-#| "exceed 723 bytes."
 msgid ""
 "Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
 "exceed 723 bytes."
@@ -24517,10 +23940,6 @@ msgid "Incorrect Face Image Byte Size"
 msgstr "Tamaño en bytes de la imagen de la cara incorrecto"
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:6
-#| msgid ""
-#| "The Face image size is {0} bytes, while it should not be more than 723 "
-#| "bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
-#| "doesn't exceed 723 bytes."
 msgid ""
 "The Face image size is {0} bytes, while it should not be more than 723 "
 "bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
@@ -24642,12 +24061,6 @@ msgid "Send e-mail message to mailing list?"
 msgstr "¿Quiere enviar un mensaje a la lista de correo?"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#| msgid ""
-#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
-#| "the message automatically, or see and change it first.\n"
-#| "\n"
-#| "You should receive an answer from the mailing list shortly after the "
-#| "message has been sent."
 msgid ""
 "An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
@@ -24795,9 +24208,6 @@ msgstr "_Nuevo"
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:598
 #, c-format
-#| msgid ""
-#| "Selected calendar contains event '%s' already. Would you like to edit the "
-#| "old event?"
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
@@ -24807,9 +24217,6 @@ msgstr ""
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:601
 #, c-format
-#| msgid ""
-#| "Selected task list contains task '%s' already. Would you like to edit the "
-#| "old task?"
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
@@ -24819,9 +24226,6 @@ msgstr ""
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:604
 #, c-format
-#| msgid ""
-#| "Selected memo list contains memo '%s' already. Would you like to edit the "
-#| "old memo?"
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
@@ -25139,7 +24543,6 @@ msgstr "Lugar de publicación"
 #: ../src/plugins/publish-calendar/publish-format-fb.c:82
 #: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
-#| msgid "Invalid source UID '%s'"
 msgid "Invalid source UID “%s”"
 msgstr "UID «%s» de fuente no válido"
 
@@ -25452,7 +24855,6 @@ msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
 #: ../src/shell/e-shell-window-actions.c:866
-#| msgid "Show Evolution's shortcut keys"
 msgid "Show Evolution’s shortcut keys"
 msgstr "Mostrar los atajos del teclado de Evolution"
 
@@ -25681,7 +25083,6 @@ msgstr "Nuevo"
 #. Translators: This is used for the main window title.
 #: ../src/shell/e-shell-window-private.c:720
 #, c-format
-#| msgid "%s - Evolution"
 msgid "%s — Evolution"
 msgstr "%s - Evolution"
 
@@ -25737,9 +25138,6 @@ msgstr "No preguntarme más veces"
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../src/shell/main.c:314
-#| msgid ""
-#| "Start Evolution showing the specified component. Available options are "
-#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
@@ -25789,15 +25187,11 @@ msgstr ""
 "Evolution que no responde. Error del sistema: %s"
 
 #: ../src/shell/main.c:466 ../src/shell/main.c:471
-#| msgid "- The Evolution PIM and Email Client"
 msgid "— The Evolution PIM and Email Client"
 msgstr "— El cliente de correo-e y MIP Evolution"
 
 #: ../src/shell/main.c:533
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
@@ -25807,9 +25201,6 @@ msgstr ""
 
 #: ../src/shell/main.c:539
 #, c-format
-#| msgid ""
-#| "%s: --force-online and --offline cannot be used together.\n"
-#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
@@ -25877,17 +25268,14 @@ msgid "Keep _Waiting"
 msgstr "Seguir _esperando"
 
 #: ../src/shell/shell.error.xml.h:15
-#| msgid "Failed to get values from '{0}'"
 msgid "Failed to get values from “{0}”"
 msgstr "Falló al obtener los valores desde «{0}»"
 
 #: ../src/shell/shell.error.xml.h:16
-#| msgid "Failed to invoke authenticate for '{0}'"
 msgid "Failed to invoke authenticate for “{0}”"
 msgstr "Falló al invocar la autenticación para «{0}»"
 
 #: ../src/shell/shell.error.xml.h:17
-#| msgid "Failed to connect '{0}'"
 msgid "Failed to connect “{0}”"
 msgstr "Falló al conectar a «{0}»"
 
@@ -25896,42 +25284,34 @@ msgid "_Reconnect"
 msgstr "_Reconectar"
 
 #: ../src/shell/shell.error.xml.h:19
-#| msgid "Failed to connect address book '{0}'"
 msgid "Failed to connect address book “{0}”"
 msgstr "Falló al conectar a la libreta de direcciones «{0}»"
 
 #: ../src/shell/shell.error.xml.h:20
-#| msgid "Failed to connect calendar '{0}'"
 msgid "Failed to connect calendar “{0}”"
 msgstr "Falló al conectar al calendario «{0}»"
 
 #: ../src/shell/shell.error.xml.h:21
-#| msgid "Failed to connect mail account '{0}'"
 msgid "Failed to connect mail account “{0}”"
 msgstr "Falló al conectar a la cuenta de correo «{0}»"
 
 #: ../src/shell/shell.error.xml.h:22
-#| msgid "Failed to connect memo list '{0}'"
 msgid "Failed to connect memo list “{0}”"
 msgstr "Falló al conectar a la lista de notas «{0}»"
 
 #: ../src/shell/shell.error.xml.h:23
-#| msgid "Failed to connect task list '{0}'"
 msgid "Failed to connect task list “{0}”"
 msgstr "Falló al conectar a la lista de tareas «{0}»"
 
 #: ../src/shell/shell.error.xml.h:24
-#| msgid "Failed to prompt for credentials for '{0}'"
 msgid "Failed to prompt for credentials for “{0}”"
 msgstr "Falló al solicitar las credenciales para «{0}»"
 
 #: ../src/shell/shell.error.xml.h:25
-#| msgid "Failed to finish trust prompt for '{0}'"
 msgid "Failed to finish trust prompt for “{0}”"
 msgstr "Falló al terminar la solicitud de confianza para «{0}»"
 
 #: ../src/shell/shell.error.xml.h:26
-#| msgid "SSL certificate for '{0}' is not trusted."
 msgid "SSL certificate for “{0}” is not trusted."
 msgstr "El certificado SSL para «{0}» no es de confianza."
 
@@ -25940,37 +25320,28 @@ msgid "Reason: {1}"
 msgstr "Razón: {1}"
 
 #: ../src/shell/shell.error.xml.h:29
-#| msgid "SSL certificate for address book '{0}' is not trusted."
 msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr ""
 "El certificado SSL para la libreta de direcciones «{0}» no es de confianza."
 
 #: ../src/shell/shell.error.xml.h:30
-#| msgid "SSL certificate for calendar '{0}' is not trusted."
 msgid "SSL certificate for calendar “{0}” is not trusted."
 msgstr "El certificado SSL para el calendario «{0}» no es de confianza."
 
 #: ../src/shell/shell.error.xml.h:31
-#| msgid "SSL certificate for mail account '{0}' is not trusted."
 msgid "SSL certificate for mail account “{0}” is not trusted."
 msgstr "El certificado SSL para la cuenta de correo «{0}» no es de confianza."
 
 #: ../src/shell/shell.error.xml.h:32
-#| msgid "SSL certificate for memo list '{0}' is not trusted."
 msgid "SSL certificate for memo list “{0}” is not trusted."
 msgstr "El certificado SSL para la lista de notas «{0}» no es de confianza."
 
 #: ../src/shell/shell.error.xml.h:33
-#| msgid "SSL certificate for task list '{0}' is not trusted."
 msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr "El certificado SSL para la lista de tareas «{0}» no es de confianza."
 
 #: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
-#| msgid ""
-#| "Certificate '%s' is a CA certificate.\n"
-#| "\n"
-#| "Edit trust settings:"
 msgid ""
 "Certificate “%s” is a CA certificate.\n"
 "\n"
@@ -26171,7 +25542,6 @@ msgstr "Cambiar la confianza del certificado"
 
 #: ../src/smime/gui/certificate-manager.c:1358
 #, c-format
-#| msgid "Change trust for the host '%s':"
 msgid "Change trust for the host “%s”:"
 msgstr "Cambiar la confianza del equipo «%s»:"
 
@@ -26276,13 +25646,11 @@ msgstr ""
 
 #: ../src/smime/gui/component.c:53
 #, c-format
-#| msgid "Enter the password for '%s', token '%s'"
 msgid "Enter the password for “%s”, token “%s”"
 msgstr "Introduzca la contraseña para «%s», testigo «%s»"
 
 #: ../src/smime/gui/component.c:55
 #, c-format
-#| msgid "Enter the password for '%s'"
 msgid "Enter the password for “%s”"
 msgstr "Introduzca la contraseña para «%s»"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]