diff options
28 files changed, 869 insertions, 803 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 3b5402b4a6..bc3af20e3c 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -49,6 +49,9 @@ struct _AlarmNotifyPrivate { ESourceList *source_lists[E_CAL_CLIENT_SOURCE_TYPE_LAST]; ESourceList *selected_calendars; GMutex *mutex; + + GSList *offline_sources; + guint offline_timeout_id; }; typedef struct { @@ -100,6 +103,21 @@ process_removal_in_hash (const gchar *uri, prd->removals = g_list_prepend (prd->removals, (gpointer) uri); } +static gint +find_slist_source_uri_cb (gconstpointer a, gconstpointer b) +{ + ESource *asource = (ESource *) a; + const gchar *buri = b; + gchar *auri; + gint res; + + auri = e_source_get_uri (asource); + res = g_strcmp0 (auri, buri); + g_free (auri); + + return res; +} + static void alarm_notify_list_changed_cb (ESourceList *source_list, AlarmNotify *an) @@ -139,9 +157,10 @@ alarm_notify_list_changed_cb (ESourceList *source_list, continue; uri = e_source_get_uri (source); - if (!g_hash_table_lookup (an->priv->uri_client_hash[source_type], uri)) { + if (!g_hash_table_lookup (an->priv->uri_client_hash[source_type], uri) && + !g_slist_find_custom (an->priv->offline_sources, uri, find_slist_source_uri_cb)) { debug (("Adding Calendar %s", uri)); - alarm_notify_add_calendar (an, source_type, source, FALSE); + alarm_notify_add_calendar (an, source_type, source); } g_free (uri); } @@ -194,7 +213,7 @@ alarm_notify_load_calendars (AlarmNotify *an, uri = e_source_get_uri (source); debug (("Loading Calendar %s", uri)); - alarm_notify_add_calendar (an, source_type, source, FALSE); + alarm_notify_add_calendar (an, source_type, source); g_free (uri); } @@ -222,6 +241,12 @@ alarm_notify_finalize (GObject *object) priv = ALARM_NOTIFY (object)->priv; + if (priv->offline_timeout_id) + g_source_remove (priv->offline_timeout_id); + priv->offline_timeout_id = 0; + g_slist_free_full (priv->offline_sources, g_object_unref); + priv->offline_sources = NULL; + for (ii = 0; ii < E_CAL_CLIENT_SOURCE_TYPE_LAST; ii++) { g_hash_table_foreach ( priv->uri_client_hash[ii], @@ -349,6 +374,32 @@ alarm_notify_new (GCancellable *cancellable, "application-id", APPLICATION_ID, NULL); } +static gboolean +try_open_offline_timeout_cb (gpointer user_data) +{ + AlarmNotify *an = ALARM_NOTIFY (user_data); + GSList *sources, *iter; + + g_return_val_if_fail (an != NULL, FALSE); + g_return_val_if_fail (an->priv != NULL, FALSE); + + sources = an->priv->offline_sources; + an->priv->offline_sources = NULL; + an->priv->offline_timeout_id = 0; + + for (iter = sources; iter; iter = iter->next) { + ESource *source = iter->data; + + alarm_notify_add_calendar (an, + GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (source), "source-type")), + source); + } + + g_slist_free_full (sources, g_object_unref); + + return FALSE; +} + static void client_opened_cb (GObject *source_object, GAsyncResult *result, @@ -360,11 +411,22 @@ client_opened_cb (GObject *source_object, ECalClient *cal_client; ECalClientSourceType source_type; const gchar *uri; + GError *error = NULL; + + e_client_utils_open_new_finish (source, result, &client, &error); + + if (client == NULL) { + if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_REPOSITORY_OFFLINE)) { + if (an->priv->offline_timeout_id) + g_source_remove (an->priv->offline_timeout_id); + an->priv->offline_sources = g_slist_append (an->priv->offline_sources, g_object_ref (source)); + an->priv->offline_timeout_id = g_timeout_add_seconds (5 * 60, try_open_offline_timeout_cb, an); + } - e_client_utils_open_new_finish (source, result, &client, NULL); + g_clear_error (&error); - if (client == NULL) return; + } cal_client = E_CAL_CLIENT (client); source_type = e_cal_client_get_source_type (cal_client); @@ -385,8 +447,6 @@ client_opened_cb (GObject *source_object, * alarm_notify_add_calendar: * @an: An alarm notification service. * @uri: URI of the calendar to load. - * @load_afterwards: Whether this calendar should be loaded in the future - * when the alarm daemon starts up. * * Tells the alarm notification service to load a calendar and start monitoring * its alarms. It can optionally be made to save the URI of this calendar so @@ -395,8 +455,7 @@ client_opened_cb (GObject *source_object, void alarm_notify_add_calendar (AlarmNotify *an, ECalClientSourceType source_type, - ESource *source, - gboolean load_afterwards) + ESource *source) { AlarmNotifyPrivate *priv; EClientSourceType client_source_type; @@ -459,6 +518,8 @@ alarm_notify_add_calendar (AlarmNotify *an, client_source_type = E_CLIENT_SOURCE_TYPE_LAST; } + g_object_set_data (G_OBJECT (source), "source-type", GUINT_TO_POINTER (source_type)); + e_client_utils_open_new ( source, client_source_type, TRUE, NULL, e_client_utils_authenticate_handler, NULL, @@ -476,6 +537,7 @@ alarm_notify_remove_calendar (AlarmNotify *an, { AlarmNotifyPrivate *priv; ECalClient *cal_client; + GSList *in_offline; priv = an->priv; @@ -486,4 +548,17 @@ alarm_notify_remove_calendar (AlarmNotify *an, alarm_queue_remove_client (cal_client, FALSE); g_hash_table_remove (priv->uri_client_hash[source_type], str_uri); } + + in_offline = g_slist_find_custom (priv->offline_sources, str_uri, find_slist_source_uri_cb); + if (in_offline) { + ESource *source = in_offline->data; + + priv->offline_sources = g_slist_remove (priv->offline_sources, source); + if (!priv->offline_sources && priv->offline_timeout_id) { + g_source_remove (priv->offline_timeout_id); + priv->offline_timeout_id = 0; + } + + g_object_unref (source); + } } diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h index f95a4d6b33..b48cd5a602 100644 --- a/calendar/gui/alarm-notify/alarm-notify.h +++ b/calendar/gui/alarm-notify/alarm-notify.h @@ -69,8 +69,7 @@ AlarmNotify * alarm_notify_new (GCancellable *cancellable, GError **error); void alarm_notify_add_calendar (AlarmNotify *an, ECalClientSourceType source_type, - ESource *source, - gboolean load_afterwards); + ESource *source); void alarm_notify_remove_calendar (AlarmNotify *an, ECalClientSourceType source_type, const gchar *str_uri); diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 35f3a7d743..ced8414ef9 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -29,6 +29,9 @@ #include <time.h> #include <glib/gi18n.h> + +#include "e-util/e-datetime-format.h" + #include "calendar-config.h" #include "e-meeting-time-sel-item.h" #include "e-meeting-time-sel.h" @@ -389,9 +392,10 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, { EMeetingTimeSelector *mts; gint y, grid_x; - gchar buffer[128], *format; + gchar *str; gint hour, hour_x, hour_y; PangoLayout *layout; + struct tm tm_time; cairo_save (cr); @@ -437,29 +441,31 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, cairo_rel_line_to (cr, 0, height); cairo_stroke (cr); + g_date_to_struct_tm (date, &tm_time); + str = e_datetime_format_format_tm ("calendar", "table", DTFormatKindDate, &tm_time); + + g_return_if_fail (str != NULL); + /* Draw the date. Set a clipping rectangle so we don't draw over the * next day. */ - if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_FULL) - /* This is a strftime() format string %A = full weekday name, - * %B = full month name, %d = month day, %Y = full year. */ - format = _("%A, %B %d, %Y"); - else if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY) - /* This is a strftime() format string %a = abbreviated weekday - * name, %m = month number, %d = month day, %Y = full year. */ - format = _("%a %m/%d/%Y"); - else - /* This is a strftime() format string %m = month number, - * %d = month day, %Y = full year. */ - format = _("%m/%d/%Y"); + if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY + && !e_datetime_format_includes_day_name ("calendar", "table", DTFormatKindDate)) { + gchar buffer[128]; + gchar *tmp; + + g_date_strftime (buffer, sizeof (buffer), "%a", date); - g_date_strftime (buffer, sizeof (buffer), format, date); + tmp = str; + str = g_strconcat (buffer, " ", str, NULL); + g_free (tmp); + } cairo_save (cr); cairo_rectangle (cr, x, -scroll_y, mts->day_width - 2, mts->row_height - 2); cairo_clip (cr); - pango_layout_set_text (layout, buffer, -1); + pango_layout_set_text (layout, str, -1); cairo_move_to (cr, x + 2, 4 - scroll_y); pango_cairo_show_layout (cr, layout); @@ -484,6 +490,7 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, g_object_unref (layout); cairo_restore (cr); + g_free (str); } /* This paints the colored bars representing busy periods for the combined diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 36e7ad7d42..9957be998d 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -41,6 +41,7 @@ #include "misc/e-dateedit.h" #include "e-util/e-util.h" +#include "e-util/e-datetime-format.h" #include "e-meeting-utils.h" #include "e-meeting-list-view.h" @@ -2327,10 +2328,11 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) GDate date; gint max_date_width, longest_weekday_width, longest_month_width, width; gint day, longest_weekday, month, longest_month; - gchar buffer[128]; + gchar buffer[128], *str; const gchar *name; PangoContext *pango_context; PangoLayout *layout; + struct tm tm_time; /* Set up Pango prerequisites */ pango_context = gtk_widget_get_pango_context (GTK_WIDGET (mts)); @@ -2368,28 +2370,6 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) } } - /* See if we can use the full date. We want to use a date with a - * month day > 20 and also the longest weekday. We use a - * pre-calculated array of days for each month and add on the - * weekday (which is 1 (Mon) to 7 (Sun). */ - g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday, - longest_month, 2000); - /* This is a strftime() format string %A = full weekday name, - * %B = full month name, %d = month day, %Y = full year. */ - g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &date); - -#if 0 - g_print ("longest_month: %i longest_weekday: %i date: %s\n", - longest_month, longest_weekday, buffer); -#endif - - pango_layout_set_text (layout, buffer, -1); - pango_layout_get_pixel_size (layout, &width, NULL); - if (width < max_date_width) { - mts->date_format = E_MEETING_TIME_SELECTOR_DATE_FULL; - return; - } - /* Now try it with abbreviated weekday names. */ longest_weekday_width = 0; longest_weekday = G_DATE_MONDAY; @@ -2405,16 +2385,28 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday, longest_month, 2000); - /* This is a strftime() format string %a = abbreviated weekday name, - * %m = month number, %d = month day, %Y = full year. */ - g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &date); + + g_date_to_struct_tm (&date, &tm_time); + str = e_datetime_format_format_tm ("calendar", "table", DTFormatKindDate, &tm_time); + + g_return_if_fail (str != NULL); + + if (!e_datetime_format_includes_day_name ("calendar", "table", DTFormatKindDate)) { + gchar *tmp; + + g_date_strftime (buffer, sizeof (buffer), "%a", &date); + + tmp = str; + str = g_strconcat (buffer, " ", str, NULL); + g_free (tmp); + } #if 0 g_print ("longest_month: %i longest_weekday: %i date: %s\n", - longest_month, longest_weekday, buffer); + longest_month, longest_weekday, str); #endif - pango_layout_set_text (layout, buffer, -1); + pango_layout_set_text (layout, str, -1); pango_layout_get_pixel_size (layout, &width, NULL); if (width < max_date_width) mts->date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY; @@ -2422,6 +2414,7 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) mts->date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT; g_object_unref (layout); + g_free (str); } /* Turn off the background of the canvas windows. This reduces flicker diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 7f45242006..7c3f7c3021 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -68,13 +68,13 @@ G_BEGIN_DECLS /* This is used to specify the format used when displaying the dates. - * The full format is like 'Sunday, September 12, 1999'. The abbreviated format - * is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual - * format used is determined in e_meeting_time_selector_style_set (), once we - * know the font being used. */ + * The abbreviated format is like 'Sun 12/9/99'. + * The short format is like '12/9/99'. + * The actual format used is determined in e_meeting_time_selector_style_set (), + * once we know the font being used. + */ typedef enum { - E_MEETING_TIME_SELECTOR_DATE_FULL, E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY, E_MEETING_TIME_SELECTOR_DATE_SHORT } EMeetingTimeSelectorDateFormat; diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt index 765bb28f8a..562af01fc9 100644 --- a/doc/reference/shell/eshell-sections.txt +++ b/doc/reference/shell/eshell-sections.txt @@ -1099,8 +1099,6 @@ e_util_guess_mime_type e_util_get_category_filter_options e_binding_transform_color_to_string e_binding_transform_string_to_color -e_binding_transform_enum_nick_to_value -e_binding_transform_enum_value_to_nick e_binding_transform_source_to_uid e_binding_transform_uid_to_source e_charset_add_radio_actions diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c index c21d025794..877b170218 100644 --- a/e-util/e-datetime-format.c +++ b/e-util/e-datetime-format.c @@ -662,3 +662,25 @@ e_datetime_format_format_tm (const gchar *component, return res; } + +gboolean +e_datetime_format_includes_day_name (const gchar *component, const gchar *part, DTFormatKind kind) +{ + gchar *key; + const gchar *fmt; + gboolean res; + + g_return_val_if_fail (component != NULL, FALSE); + g_return_val_if_fail (*component != 0, FALSE); + + key = gen_key (component, part, kind); + g_return_val_if_fail (key != NULL, FALSE); + + fmt = get_format_internal (key, kind); + + res = fmt && (strstr (fmt, "%a") != NULL || strstr (fmt, "%A") != NULL); + + g_free (key); + + return res; +} diff --git a/e-util/e-datetime-format.h b/e-util/e-datetime-format.h index 2c19c65133..28eed151b3 100644 --- a/e-util/e-datetime-format.h +++ b/e-util/e-datetime-format.h @@ -39,6 +39,7 @@ void e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar gchar *e_datetime_format_format (const gchar *component, const gchar *part, DTFormatKind kind, time_t value); gchar *e_datetime_format_format_tm (const gchar *component, const gchar *part, DTFormatKind kind, struct tm *tm_time); +gboolean e_datetime_format_includes_day_name (const gchar *component, const gchar *part, DTFormatKind kind); G_END_DECLS diff --git a/e-util/e-util.c b/e-util/e-util.c index cda17cbbc9..d41f43630e 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1440,80 +1440,6 @@ e_binding_transform_string_to_color (GBinding *binding, } /** - * e_binding_transform_enum_value_to_nick: - * @binding: a #GBinding - * @source_value: a #GValue whose type is derived from #G_TYPE_ENUM - * @target_value: a #GValue of type #G_TYPE_STRING - * @not_used: not used - * - * Transforms an enumeration value to its corresponding nickname. - * - * Returns: %TRUE if the enum value has a corresponding nickname - **/ -gboolean -e_binding_transform_enum_value_to_nick (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer not_used) -{ - GEnumClass *enum_class; - GEnumValue *enum_value; - gint value; - gboolean success = FALSE; - - g_return_val_if_fail (G_IS_BINDING (binding), FALSE); - - enum_class = g_type_class_peek (G_VALUE_TYPE (source_value)); - g_return_val_if_fail (G_IS_ENUM_CLASS (enum_class), FALSE); - - value = g_value_get_enum (source_value); - enum_value = g_enum_get_value (enum_class, value); - if (enum_value != NULL) { - g_value_set_string (target_value, enum_value->value_nick); - success = TRUE; - } - - return success; -} - -/** - * e_binding_transform_enum_nick_to_value: - * @binding: a #GBinding - * @source_value: a #GValue of type #G_TYPE_STRING - * @target_value: a #GValue whose type is derived from #G_TYPE_ENUM - * @not_used: not_used - * - * Transforms an enumeration nickname to its corresponding value. - * - * Returns: %TRUE if the enum nickname has a corresponding value - **/ -gboolean -e_binding_transform_enum_nick_to_value (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer not_used) -{ - GEnumClass *enum_class; - GEnumValue *enum_value; - const gchar *string; - gboolean success = FALSE; - - g_return_val_if_fail (G_IS_BINDING (binding), FALSE); - - enum_class = g_type_class_peek (G_VALUE_TYPE (target_value)); - g_return_val_if_fail (G_IS_ENUM_CLASS (enum_class), FALSE); - - string = g_value_get_string (source_value); - enum_value = g_enum_get_value_by_nick (enum_class, string); - if (enum_value != NULL) { - g_value_set_enum (target_value, enum_value->value); - success = TRUE; - } - - return success; -} - -/** * e_binding_transform_source_to_uid: * @binding: a #GBinding * @source_value: a #GValue of type #E_TYPE_SOURCE diff --git a/e-util/e-util.h b/e-util/e-util.h index 1117781186..de2a817171 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -137,7 +137,7 @@ void e_util_set_source_combo_box_list (GtkWidget *source_combo_box, const gchar *source_gconf_path); -/* Useful GBinding transformation functions */ +/* Useful GBinding transform functions */ gboolean e_binding_transform_color_to_string (GBinding *binding, const GValue *source_value, @@ -148,16 +148,6 @@ gboolean e_binding_transform_string_to_color const GValue *source_value, GValue *target_value, gpointer not_used); -gboolean e_binding_transform_enum_value_to_nick - (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer not_used); -gboolean e_binding_transform_enum_nick_to_value - (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer not_used); gboolean e_binding_transform_source_to_uid (GBinding *binding, const GValue *source_value, diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c index bf80fbb778..1540841968 100644 --- a/filter/e-filter-color.c +++ b/filter/e-filter-color.c @@ -26,7 +26,6 @@ #endif #include <gtk/gtk.h> -#include <libedataserver/e-sexp.h> #include "e-filter-color.h" @@ -127,7 +126,7 @@ filter_color_format_sexp (EFilterElement *element, g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", fc->color.red, fc->color.green, fc->color.blue); - e_sexp_encode_string (out, spec); + camel_sexp_encode_string (out, spec); } static void diff --git a/filter/e-filter-element.h b/filter/e-filter-element.h index 9abd83ca0a..c0bcadd169 100644 --- a/filter/e-filter-element.h +++ b/filter/e-filter-element.h @@ -25,6 +25,7 @@ #define E_FILTER_ELEMENT_H #include <gtk/gtk.h> +#include <camel/camel.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> #include <e-util/e-alert.h> diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c index a5199fe064..baf75e71bb 100644 --- a/filter/e-filter-file.c +++ b/filter/e-filter-file.c @@ -31,8 +31,6 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-sexp.h> - #include "e-util/e-alert.h" #include "e-filter-file.h" @@ -203,7 +201,7 @@ filter_file_format_sexp (EFilterElement *element, { EFilterFile *file = E_FILTER_FILE (element); - e_sexp_encode_string (out, file->path); + camel_sexp_encode_string (out, file->path); } static void diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c index 10fa1f1765..8b92f5486e 100644 --- a/filter/e-filter-input.c +++ b/filter/e-filter-input.c @@ -32,8 +32,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-sexp.h> - #include "e-util/e-alert.h" #include "e-filter-input.h" @@ -243,7 +241,7 @@ filter_input_format_sexp (EFilterElement *element, GList *link; for (link = input->values; link != NULL; link = g_list_next (link)) - e_sexp_encode_string (out, link->data); + camel_sexp_encode_string (out, link->data); } static void diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c index dcb9b18fba..883c560795 100644 --- a/filter/e-filter-int.c +++ b/filter/e-filter-int.c @@ -27,8 +27,6 @@ #include <stdlib.h> #include <gtk/gtk.h> -#include <libedataserver/e-sexp.h> - #include "e-filter-int.h" G_DEFINE_TYPE ( diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c index 0cea021666..2f5af12e3b 100644 --- a/filter/e-filter-option.c +++ b/filter/e-filter-option.c @@ -31,8 +31,6 @@ #include <glib/gi18n.h> #include <gmodule.h> -#include <libedataserver/e-sexp.h> - #include "e-filter-option.h" #include "e-filter-part.h" @@ -409,7 +407,7 @@ filter_option_format_sexp (EFilterElement *element, EFilterOption *option = E_FILTER_OPTION (element); if (option->current) - e_sexp_encode_string (out, option->current->value); + camel_sexp_encode_string (out, option->current->value); } static void diff --git a/filter/e-filter-part.c b/filter/e-filter-part.c index 0b31097d7c..2154699178 100644 --- a/filter/e-filter-part.c +++ b/filter/e-filter-part.c @@ -501,7 +501,7 @@ e_filter_part_expand_code (EFilterPart *part, #if 0 } else if ((val = g_hash_table_lookup (part->globals, name))) { g_string_append_printf (out, "%.*s", newstart-start, start); - e_sexp_encode_string (out, val); + camel_sexp_encode_string (out, val); #endif } else { g_string_append_printf (out, "%.*s", (gint)(end-start+1), start); diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index af861f575f..f4fcbb26af 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -122,10 +122,10 @@ struct _user_message_msg { CamelSessionAlertType type; gchar *prompt; + GSList *button_captions; EFlag *done; - guint allow_cancel : 1; - guint result : 1; + gint result; guint ismain : 1; }; @@ -160,8 +160,8 @@ user_message_response (GtkDialog *dialog, struct _user_message_msg *m) { /* if !allow_cancel, then we've already replied */ - if (m->allow_cancel) { - m->result = button == GTK_RESPONSE_OK; + if (m->button_captions) { + m->result = button; e_flag_set (m->done); } @@ -175,6 +175,8 @@ user_message_exec (struct _user_message_msg *m, { GtkWindow *parent; const gchar *error_type; + gint index; + GSList *iter; if (!m->ismain && user_message_dialog != NULL) { g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); @@ -183,19 +185,13 @@ user_message_exec (struct _user_message_msg *m, switch (m->type) { case CAMEL_SESSION_ALERT_INFO: - error_type = m->allow_cancel ? - "mail:session-message-info-cancel" : - "mail:session-message-info"; + error_type = "mail:session-message-info"; break; case CAMEL_SESSION_ALERT_WARNING: - error_type = m->allow_cancel ? - "mail:session-message-warning-cancel" : - "mail:session-message-warning"; + error_type = "mail:session-message-warning"; break; case CAMEL_SESSION_ALERT_ERROR: - error_type = m->allow_cancel ? - "mail:session-message-error-cancel" : - "mail:session-message-error"; + error_type = "mail:session-message-error"; break; default: error_type = NULL; @@ -208,6 +204,25 @@ user_message_exec (struct _user_message_msg *m, parent, error_type, m->prompt, NULL); g_object_set (user_message_dialog, "resizable", TRUE, NULL); + if (m->button_captions) { + GtkWidget *action_area; + GList *children, *child; + + /* remove all default buttons and keep only those requested */ + action_area = gtk_dialog_get_action_area (GTK_DIALOG (user_message_dialog)); + + children = gtk_container_get_children (GTK_CONTAINER (action_area)); + for (child = children; child != NULL; child = child->next) { + gtk_container_remove (GTK_CONTAINER (action_area), child->data); + } + + g_list_free (children); + } + + for (index = 0, iter = m->button_captions; iter; index++, iter = iter->next) { + gtk_dialog_add_button (GTK_DIALOG (user_message_dialog), iter->data, index); + } + /* XXX This is a case where we need to be able to construct * custom EAlerts without a predefined XML definition. */ if (m->ismain) { @@ -228,6 +243,7 @@ static void user_message_free (struct _user_message_msg *m) { g_free (m->prompt); + g_slist_free_full (m->button_captions, g_free); e_flag_free (m->done); } @@ -889,24 +905,28 @@ mail_session_forget_password (CamelSession *session, return TRUE; } -static gboolean +static gint mail_session_alert_user (CamelSession *session, CamelSessionAlertType type, const gchar *prompt, - gboolean cancel) + GSList *button_captions) { struct _user_message_msg *m; GCancellable *cancellable; - gboolean result = TRUE; + gint result = -1; + GSList *iter; m = mail_msg_new (&user_message_info); m->ismain = mail_in_main_thread (); m->type = type; m->prompt = g_strdup (prompt); m->done = e_flag_new (); - m->allow_cancel = cancel; + m->button_captions = g_slist_copy (button_captions); + + for (iter = m->button_captions; iter; iter = iter->next) + iter->data = g_strdup (iter->data); - if (cancel) + if (g_slist_length (button_captions) > 1) mail_msg_ref (m); cancellable = e_activity_get_cancellable (m->base.activity); @@ -916,7 +936,7 @@ mail_session_alert_user (CamelSession *session, else mail_msg_main_loop_push (m); - if (cancel) { + if (g_slist_length (button_captions) > 1) { e_flag_wait (m->done); result = m->result; mail_msg_unref (m); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 2bc3bf3d81..64aa851d6c 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2092,13 +2092,6 @@ emae_setup_settings (EMAccountEditorService *service) settings_type = class->settings_type; g_type_class_unref (class); - /* If we already have a CamelSettings instance - * of the appropriate type, leave it alone. */ - if (service->settings != NULL) { - if (G_OBJECT_TYPE (service->settings) == settings_type) - return; - } - url = emae_account_url ( service->emae, emae_service_info[service->type].account_uri_key); @@ -2830,8 +2823,8 @@ emae_create_basic_assistant_page (EMAccountEditor *emae, title = _("Sending Email"); label = _("Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."); } else if (g_ascii_strcasecmp (page_id, "review_page") == 0) { - title = _("Review Account"); - label = _("Time to check things over before we try and connect to the server and fetch your mail."); + title = _("Account Summary"); + label = _("This is a summary of the settings which will be used to access your mail."); } else if (g_ascii_strcasecmp (page_id, "finish_page") == 0) { page_type = GTK_ASSISTANT_PAGE_CONFIRM; fill_space = TRUE; @@ -3592,13 +3585,10 @@ emae_send_page (EConfig *ec, GtkWidget *w; GtkBuilder *builder; - provider = emae_get_transport_provider (emae); - - if (provider == NULL) - return NULL; + provider = emae_get_store_provider (emae); /* no transport options page at all for these types of providers */ - if (CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) { + if (provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) { memset (&priv->transport.frame, 0, ((gchar *) &priv->transport.check_dialog) - ((gchar *) &priv->transport.frame)); return NULL; } @@ -4622,9 +4612,9 @@ emae_check_complete (EConfig *ec, gtk_label_set_text (emae->priv->receive_name, url->user); g_object_get (emae->priv->source.settings, "security-method", &method, NULL); if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT) - enc = g_strdup (_("Always(SSL)")); + enc = g_strdup (_("Always (SSL)")); else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT) - enc = g_strdup (_("When possible(TLS)")); + enc = g_strdup (_("When possible (TLS)")); else enc = g_strdup (_("Never")); @@ -4638,9 +4628,9 @@ emae_check_complete (EConfig *ec, gtk_label_set_text (emae->priv->send_name, url->user); g_object_get (emae->priv->transport.settings, "security-method", &method, NULL); if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT) - enc = g_strdup (_("Always(SSL)")); + enc = g_strdup (_("Always (SSL)")); else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT) - enc = g_strdup (_("When possible(TLS)")); + enc = g_strdup (_("When possible (TLS)")); else enc = g_strdup (_("Never")); @@ -4766,13 +4756,18 @@ emae_check_complete (EConfig *ec, } if (ok && (pageid == NULL || !strcmp (pageid, "30.send"))) { - if (emae->type != EMAE_NOTEBOOK && refresh) { - emae_refresh_providers (emae, &emae->priv->transport); - emae_provider_changed (emae->priv->transport.providers, &emae->priv->transport); - } - ok = emae_service_complete (emae, &emae->priv->transport); - if (!ok) { - d (printf ("send page incomplete\n")); + CamelProvider *provider; + + provider = emae_get_store_provider (emae); + if (!provider || !CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) { + if (emae->type != EMAE_NOTEBOOK && refresh) { + emae_refresh_providers (emae, &emae->priv->transport); + emae_provider_changed (emae->priv->transport.providers, &emae->priv->transport); + } + ok = emae_service_complete (emae, &emae->priv->transport); + if (!ok) { + d (printf ("send page incomplete\n")); + } } } @@ -5132,7 +5127,7 @@ emae_commit (EConfig *ec, } else { CamelProvider *provider; - d (printf ("Adding new account '%s'\n", e_account_get_string (account, E_ACCOUNT_NAME))); + d (printf ("Adding new account '%s'\n", e_account_get_string (modified_account, E_ACCOUNT_NAME))); e_account_list_add (accounts, modified_account); account = modified_account; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 06db108b8e..85fc96d751 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1412,17 +1412,23 @@ emu_update_composers_security (EMsgComposer *composer, guint32 validity_found) { GtkToggleAction *action; + EShell *shell; + EShellSettings *shell_settings; g_return_if_fail (composer != NULL); + shell = e_msg_composer_get_shell (composer); + shell_settings = e_shell_get_shell_settings (shell); + /* Pre-set only for encrypted messages, not for signed */ - /*if (validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) { + if ((validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) != 0 + && e_shell_settings_get_boolean (shell_settings, "composer-sign-reply-if-signed")) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_SMIME_SIGN (composer)); else action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_PGP_SIGN (composer)); gtk_toggle_action_set_active (action, TRUE); - }*/ + } if (validity_found & EM_FORMAT_VALIDITY_FOUND_ENCRYPTED) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index 74f386481e..6098c9354d 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -36,7 +36,6 @@ #include "mail/em-utils.h" #include "shell/e-shell.h" #include "filter/e-filter-part.h" -#include "libedataserver/e-sexp.h" #include "e-util/e-alert.h" #define EM_FILTER_FOLDER_ELEMENT_GET_PRIVATE(obj) \ @@ -264,7 +263,7 @@ filter_folder_element_format_sexp (EFilterElement *fe, { EMFilterFolderElement *ff = (EMFilterFolderElement *) fe; - e_sexp_encode_string (out, ff->priv->uri); + camel_sexp_encode_string (out, ff->priv->uri); } static void diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index b95c140c58..b6d518d6d6 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -32,8 +32,6 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libedataserver/e-sexp.h> - #include <e-util/e-account-utils.h> #include <filter/e-filter-part.h> @@ -402,7 +400,7 @@ filter_source_element_format_sexp (EFilterElement *fe, { EMFilterSourceElement *fs = (EMFilterSourceElement *) fe; - e_sexp_encode_string (out, fs->priv->active_id); + camel_sexp_encode_string (out, fs->priv->active_id); } static void diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index c26c0feb96..f7c3844b8a 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -77,6 +77,21 @@ </schema> <schema> + <key>/schemas/apps/evolution/mail/composer/sign_reply_if_signed</key> + <applyto>/apps/evolution/mail/composer/sign_reply_if_signed</applyto> + <owner>evolution-mail</owner> + <type>bool</type> + <default>false</default> + <locale name="C"> + <short>Digitally sign messages when original message signed (PGP or S/MIME)</short> + <long> + Automatically enable PGP or S/MIME signatures when replying + to a message which is also PGP or S/MIME signed. + </long> + </locale> + </schema> + + <schema> <key>/schemas/apps/evolution/mail/composer/reply_start_bottom</key> <applyto>/apps/evolution/mail/composer/reply_start_bottom</applyto> <owner>evolution-mail</owner> diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 02bf640a3a..e95a812b59 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -594,7 +594,7 @@ for display purposes only. </property> <object class="GtkTable" id="replies-and-forwards-table"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -697,6 +697,23 @@ for display purposes only. </property> </packing> </child> <child> + <object class="GtkCheckButton" id="chkSignReplyIfSigned"> + <property name="label" translatable="yes">Digitally _sign messages when original message signed (PGP or S/MIME)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="y_options"></property> + </packing> + </child> + <child> <object class="GtkAlignment" id="reply-style-alignment"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4887,6 +4904,7 @@ For example: "Work" or "Personal"</property> <property name="yalign">0</property> <property name="label" translatable="yes">description</property> <property name="wrap">True</property> + <property name="width-chars">40</property> </object> <packing> <property name="left_attach">1</property> @@ -5398,6 +5416,7 @@ For example: "Work" or "Personal"</property> <property name="yalign">0</property> <property name="label" translatable="yes">description</property> <property name="wrap">True</property> + <property name="width-chars">40</property> </object> <packing> <property name="left_attach">1</property> diff --git a/mail/mail.error.xml b/mail/mail.error.xml index 006cc559a4..f811abb9fd 100644 --- a/mail/mail.error.xml +++ b/mail/mail.error.xml @@ -140,32 +140,14 @@ Many email systems add an Apparently-To header to messages that only have BCC re <secondary>{0}</secondary> </error> - <error id="session-message-info-cancel" type="info" default="GTK_RESPONSE_CANCEL"> - <secondary>{0}</secondary> - <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> - <button stock="gtk-ok" response="GTK_RESPONSE_OK"/> - </error> - <error id="session-message-warning" type="warning"> <secondary>{0}</secondary> </error> - <error id="session-message-warning-cancel" type="warning" default="GTK_RESPONSE_CANCEL"> - <secondary>{0}</secondary> - <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> - <button stock="gtk-ok" response="GTK_RESPONSE_OK"/> - </error> - <error id="session-message-error" type="info"> <secondary>{0}</secondary> </error> - <error id="session-message-error-cancel" type="info" default="GTK_RESPONSE_CANCEL"> - <secondary>{0}</secondary> - <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> - <button stock="gtk-ok" response="GTK_RESPONSE_OK"/> - </error> - <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK"> <_primary>Enter password.</_primary> <secondary>{0}</secondary> diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 5cc70efdbd..8c845bddf8 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -324,6 +324,10 @@ e_mail_shell_settings_init (EShellBackend *shell_backend) "composer-group-reply-to-list"); e_shell_settings_install_property_for_key ( + "composer-sign-reply-if-signed", + "/apps/evolution/mail/composer/sign_reply_if_signed"); + + e_shell_settings_install_property_for_key ( "composer-prompt-only-bcc", MAIL_SCHEMA, "prompt-on-only-bcc"); diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 8453b88540..4f4c0d15ac 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -456,6 +456,13 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); + widget = e_builder_get_widget (prefs->builder, "chkSignReplyIfSigned"); + g_object_bind_property ( + shell_settings, "composer-sign-reply-if-signed", + widget, "active", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE); + widget = e_builder_get_widget (prefs->builder, "chkTopSignature"); g_object_bind_property ( shell_settings, "composer-top-signature", @@ -9,23 +9,23 @@ # Héctor García Álvarez <hector@scouts-es.org>, 2002. # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión). # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006. -# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011. # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011. +# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011. # #: ../shell/main.c:567 msgid "" msgstr "" "Project-Id-Version: evolution.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=evolution&keywords=I18N+L10N\n" -"POT-Creation-Date: 2011-11-12 16:04+0000\n" -"PO-Revision-Date: 2011-11-12 20:12+0100\n" -"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" -"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n" +"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n" +"POT-Creation-Date: 2011-11-15 15:20+0000\n" +"PO-Revision-Date: 2011-11-15 18:01+0100\n" +"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" +"Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" #. For Translators: {0} is the name of the address book source @@ -722,7 +722,7 @@ msgid "_List name:" msgstr "_Nombre de la lista:" #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5 -#: ../mail/mail-config.ui.h:174 +#: ../mail/mail-config.ui.h:175 msgid "_Select..." msgstr "_Seleccionar…" @@ -1585,8 +1585,8 @@ msgid "" "'{0}' is a read-only calendar and cannot be modified. Please select a " "different calendar from the side bar in the Calendar view." msgstr "" -"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione " -"un calendario diferente de la barra lateral en la vista del calendario." +"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione un " +"calendario diferente de la barra lateral en la vista del calendario." #. For Translators: {0} is the name of the calendar source #: ../calendar/calendar.error.xml.h:6 @@ -2368,7 +2368,7 @@ msgstr "Sonido de recordatorio personalizado" msgid "Mes_sage:" msgstr "_Mensaje:" -#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:79 +#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80 msgid "Options" msgstr "Opciones" @@ -2461,7 +2461,7 @@ msgstr "Tipo:" msgid "_Type:" msgstr "_Tipo:" -#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:166 +#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:167 #: ../modules/addressbook/ldap-config.ui.h:28 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2 #: ../widgets/misc/e-signature-script-dialog.c:284 @@ -2496,7 +2496,7 @@ msgstr "Colo_r:" #: ../calendar/gui/dialogs/calendar-setup.c:448 #: ../calendar/gui/dialogs/calendar-setup.c:460 #: ../calendar/gui/dialogs/calendar-setup.c:471 -#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:55 +#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:56 #: ../modules/addressbook/addressbook-config.c:1077 #: ../modules/addressbook/autocompletion-config.c:240 #: ../modules/calendar/e-calendar-preferences.ui.h:17 @@ -3503,7 +3503,7 @@ msgstr "Cada" msgid "Exceptions" msgstr "Excepciones" -#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87 +#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88 msgid "Preview" msgstr "Vista previa" @@ -7185,13 +7185,13 @@ msgid "Please enter your password." msgstr "Introduzca su contraseña." #: ../capplet/settings/mail-account-view.c:258 -#: ../mail/em-account-editor.c:4992 ../plugins/caldav/caldav-source.c:67 +#: ../mail/em-account-editor.c:4993 ../plugins/caldav/caldav-source.c:67 msgid "CalDAV" msgstr "CalDAV" #: ../capplet/settings/mail-account-view.c:360 #: ../capplet/settings/mail-account-view.c:412 -#: ../mail/em-account-editor.c:4874 ../mail/em-account-editor.c:4928 +#: ../mail/em-account-editor.c:4875 ../mail/em-account-editor.c:4929 #: ../modules/online-accounts/e-online-accounts-google.c:295 #: ../modules/online-accounts/e-online-accounts-google.c:369 #: ../plugins/google-account-setup/google-contacts-source.c:55 @@ -7203,11 +7203,11 @@ msgstr "Google" msgid "Personal details:" msgstr "Detalles personales:" -#: ../capplet/settings/mail-account-view.c:486 ../mail/mail-config.ui.h:74 +#: ../capplet/settings/mail-account-view.c:486 ../mail/mail-config.ui.h:75 msgid "Name:" msgstr "Nombre:" -#: ../capplet/settings/mail-account-view.c:495 ../mail/mail-config.ui.h:45 +#: ../capplet/settings/mail-account-view.c:495 ../mail/mail-config.ui.h:46 msgid "Email address:" msgstr "Dirección de correo-e:" @@ -7215,19 +7215,19 @@ msgstr "Dirección de correo-e:" msgid "Details:" msgstr "Detalles:" -#: ../capplet/settings/mail-account-view.c:513 ../mail/mail-config.ui.h:92 +#: ../capplet/settings/mail-account-view.c:513 ../mail/mail-config.ui.h:93 msgid "Receiving" msgstr "Recepción de correo" -#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:128 +#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:129 msgid "Server type:" msgstr "Tipo de servidor:" -#: ../capplet/settings/mail-account-view.c:529 ../mail/mail-config.ui.h:127 +#: ../capplet/settings/mail-account-view.c:529 ../mail/mail-config.ui.h:128 msgid "Server address:" msgstr "Dirección del servidor:" -#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:152 +#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:153 msgid "Username:" msgstr "Nombre de usuario:" @@ -7240,7 +7240,7 @@ msgstr "Usar cifrado:" msgid "never" msgstr "nunca" -#: ../capplet/settings/mail-account-view.c:564 ../mail/mail-config.ui.h:112 +#: ../capplet/settings/mail-account-view.c:564 ../mail/mail-config.ui.h:113 msgid "Sending" msgstr "Opciones de envío" @@ -7282,7 +7282,6 @@ msgid "You can specify your default settings for your account." msgstr "Puede especificar sus ajustes predeterminados para su cuenta." #: ../capplet/settings/mail-account-view.c:614 -#: ../mail/em-account-editor.c:2831 msgid "" "Time to check things over before we try and connect to the server and fetch " "your mail." @@ -7291,7 +7290,7 @@ msgstr "" "obtener su correo." #: ../capplet/settings/mail-account-view.c:629 -#: ../mail/em-account-editor.c:2821 ../mail/em-account-editor.c:2957 +#: ../mail/em-account-editor.c:2818 ../mail/em-account-editor.c:2954 msgid "Identity" msgstr "Identidad" @@ -7343,7 +7342,7 @@ msgid "Back - Receiving options" msgstr "Atrás - Opciones de recepción" #: ../capplet/settings/mail-account-view.c:634 -#: ../mail/em-account-editor.c:3920 +#: ../mail/em-account-editor.c:3914 msgid "Defaults" msgstr "Predeterminados" @@ -7372,12 +7371,12 @@ msgid "Setup Google calendar with Evolution" msgstr "Configurar el calendario de Google con Evolution" #: ../capplet/settings/mail-account-view.c:765 -#: ../mail/em-account-editor.c:4673 +#: ../mail/em-account-editor.c:4669 msgid "You may need to enable IMAP access." msgstr "Puede que deba activar el acceso IMAP." #: ../capplet/settings/mail-account-view.c:773 -#: ../mail/em-account-editor.c:4664 +#: ../mail/em-account-editor.c:4660 msgid "Google account settings:" msgstr "Configuración de la cuenta de Google:" @@ -7386,7 +7385,7 @@ msgid "Setup Yahoo calendar with Evolution" msgstr "Configurar el calendario de Yahoo con Evolution" #: ../capplet/settings/mail-account-view.c:803 -#: ../mail/em-account-editor.c:4692 +#: ../mail/em-account-editor.c:4688 msgid "" "Yahoo calendars are named as firstname_lastname. We have tried to form the " "calendar name. So please confirm and re-enter the calendar name if it is not " @@ -7397,7 +7396,7 @@ msgstr "" "calendario si no es correcto." #: ../capplet/settings/mail-account-view.c:812 -#: ../mail/em-account-editor.c:4701 +#: ../mail/em-account-editor.c:4697 msgid "Yahoo account settings:" msgstr "Configuración de la cuenta de Yahoo:" @@ -7988,7 +7987,7 @@ msgstr "%e/%b/%Y" msgid "Select a time to compare against" msgstr "Seleccione una fecha con la que comparar" -#: ../filter/e-filter-file.c:190 +#: ../filter/e-filter-file.c:188 msgid "Choose a File" msgstr "Elegir un archivo" @@ -8178,8 +8177,8 @@ msgctxt "mail-signature" msgid "None" msgstr "Ninguna" -#: ../mail/em-account-editor.c:1645 ../mail/em-account-editor.c:4624 -#: ../mail/em-account-editor.c:4640 +#: ../mail/em-account-editor.c:1645 ../mail/em-account-editor.c:4620 +#: ../mail/em-account-editor.c:4636 msgid "Never" msgstr "Nunca" @@ -8191,24 +8190,24 @@ msgstr "Siempre" msgid "Ask for each message" msgstr "Preguntar por cada mensaje" -#: ../mail/em-account-editor.c:2377 ../widgets/misc/e-account-tree-view.c:265 +#: ../mail/em-account-editor.c:2372 ../widgets/misc/e-account-tree-view.c:265 msgctxt "mail-receiving" msgid "None" msgstr "Ninguna" -#: ../mail/em-account-editor.c:2778 ../mail/mail-config.ui.h:168 +#: ../mail/em-account-editor.c:2775 ../mail/mail-config.ui.h:169 msgid "_Path:" msgstr "R_uta:" -#: ../mail/em-account-editor.c:2781 +#: ../mail/em-account-editor.c:2778 msgid "Fil_e:" msgstr "_Archivo:" -#: ../mail/em-account-editor.c:2818 +#: ../mail/em-account-editor.c:2815 msgid "Mail Configuration" msgstr "Configuración del correo" -#: ../mail/em-account-editor.c:2819 +#: ../mail/em-account-editor.c:2816 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" @@ -8218,7 +8217,7 @@ msgstr "" "\n" "Para comenzar, pulse «Continuar»." -#: ../mail/em-account-editor.c:2822 +#: ../mail/em-account-editor.c:2819 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 " @@ -8228,19 +8227,19 @@ msgstr "" "hace falta que los rellene, a menos que quiera incluir esta información en " "el correo-e que envíe." -#: ../mail/em-account-editor.c:2824 ../mail/em-account-editor.c:3016 +#: ../mail/em-account-editor.c:2821 ../mail/em-account-editor.c:3013 msgid "Receiving Email" msgstr "Recepción de correo" -#: ../mail/em-account-editor.c:2825 +#: ../mail/em-account-editor.c:2822 msgid "Please configure the following account settings." msgstr "Configure las siguientes opciones de la cuenta." -#: ../mail/em-account-editor.c:2827 ../mail/em-account-editor.c:3626 +#: ../mail/em-account-editor.c:2824 ../mail/em-account-editor.c:3620 msgid "Sending Email" msgstr "Envío de correo" -#: ../mail/em-account-editor.c:2828 +#: ../mail/em-account-editor.c:2825 msgid "" "Please enter information about the way you will send mail. If you are not " "sure, ask your system administrator or Internet Service Provider." @@ -8249,16 +8248,22 @@ msgstr "" "seguro, pregúntele a su administrador de sistemas o a su Proveedor de " "Servicios de Internet." -#: ../mail/em-account-editor.c:2830 -#| msgid "Review account" -msgid "Review Account" -msgstr "Revisar cuenta" +#: ../mail/em-account-editor.c:2827 +#| msgid "Account Search" +msgid "Account Summary" +msgstr "Resumen de la cuenta" + +#: ../mail/em-account-editor.c:2828 +msgid "" +"This is a summary of the settings which will be used to access your mail." +msgstr "" +"Esto es un resumen de la configuración que se usará para acceder a su correo." -#: ../mail/em-account-editor.c:2835 +#: ../mail/em-account-editor.c:2832 msgid "Done" msgstr "Hecho" -#: ../mail/em-account-editor.c:2836 +#: ../mail/em-account-editor.c:2833 msgid "" "Congratulations, your mail configuration is complete.\n" "\n" @@ -8272,55 +8277,51 @@ msgstr "" "\n" "Pulse «Aplicar» para guardar su configuración." -#: ../mail/em-account-editor.c:3381 +#: ../mail/em-account-editor.c:3378 msgid "Check for _new messages every" msgstr "Comprobar si hay mensajes _nuevos cada" -#: ../mail/em-account-editor.c:3389 +#: ../mail/em-account-editor.c:3386 msgid "minu_tes" msgstr "minuto_s" -#: ../mail/em-account-editor.c:4062 ../mail/mail-config.ui.h:108 +#: ../mail/em-account-editor.c:4056 ../mail/mail-config.ui.h:109 msgid "Security" msgstr "Seguridad" #. Most sections for this is auto-generated from the camel config #. Most sections for this is auto-generated fromt the camel config -#: ../mail/em-account-editor.c:4117 ../mail/em-account-editor.c:4219 +#: ../mail/em-account-editor.c:4111 ../mail/em-account-editor.c:4213 msgid "Receiving Options" msgstr "Opciones de recepción" -#: ../mail/em-account-editor.c:4118 ../mail/em-account-editor.c:4220 +#: ../mail/em-account-editor.c:4112 ../mail/em-account-editor.c:4214 msgid "Checking for New Messages" msgstr "Comprobando si hay mensajes nuevos" -#: ../mail/em-account-editor.c:4620 ../mail/em-account-editor.c:4636 -#| msgid "Always" -msgid "Always(SSL)" +#: ../mail/em-account-editor.c:4616 ../mail/em-account-editor.c:4632 +#| msgid "Always(SSL)" +msgid "Always (SSL)" msgstr "Siempre (SSL)" -#: ../mail/em-account-editor.c:4622 ../mail/em-account-editor.c:4638 -#| msgid "Whenever Possible" -msgid "When possible(TLS)" +#: ../mail/em-account-editor.c:4618 ../mail/em-account-editor.c:4634 +#| msgid "When possible(TLS)" +msgid "When possible (TLS)" msgstr "Cuando sea posible (TLS)" -#: ../mail/em-account-editor.c:4654 -#| msgid "Setup Google contacts with Evolution" +#: ../mail/em-account-editor.c:4650 msgid "Setup Google con_tacts with Evolution" msgstr "Configurar los con_tactos de Google con Evolution" -#: ../mail/em-account-editor.c:4655 -#| msgid "Setup Google calendar with Evolution" +#: ../mail/em-account-editor.c:4651 msgid "Setup Google ca_lendar with Evolution" msgstr "Configurar el ca_lendario de Google con Evolution" -#: ../mail/em-account-editor.c:4688 -#| msgid "Setup Yahoo calendar with Evolution" +#: ../mail/em-account-editor.c:4684 msgid "Setup _Yahoo calendar with Evolution" msgstr "Configurar el calendario de _Yahoo con Evolution" -#: ../mail/em-account-editor.c:4714 -#| msgid "Yahoo Calendar name:" +#: ../mail/em-account-editor.c:4710 msgid "Yahoo Calen_dar name:" msgstr "Nombre del calen_dario de Yahoo:" @@ -8462,7 +8463,7 @@ msgid "_Later" msgstr "_Más tarde" #: ../mail/e-mail-label-manager.c:165 -#: ../modules/mail/e-mail-shell-view-actions.c:681 +#: ../modules/mail/e-mail-shell-view-actions.c:683 msgid "Add Label" msgstr "Añadir etiqueta" @@ -9189,30 +9190,30 @@ msgid_plural "Messages" msgstr[0] "Mensaje" msgstr[1] "Mensajes" -#: ../mail/e-mail-session.c:833 +#: ../mail/e-mail-session.c:849 #, c-format msgid "Enter Passphrase for %s" msgstr "Introduzca la contraseña para %s" -#: ../mail/e-mail-session.c:837 +#: ../mail/e-mail-session.c:853 msgid "Enter Passphrase" msgstr "Introduzca la contraseña" -#: ../mail/e-mail-session.c:841 +#: ../mail/e-mail-session.c:857 #, c-format msgid "Enter Password for %s" msgstr "Introduzca su contraseña para %s" -#: ../mail/e-mail-session.c:845 +#: ../mail/e-mail-session.c:861 msgid "Enter Password" msgstr "Introduzca contraseña" -#: ../mail/e-mail-session.c:896 +#: ../mail/e-mail-session.c:912 #, c-format msgid "User canceled operation." msgstr "El usuario canceló la operación." -#: ../mail/e-mail-session.c:1009 +#: ../mail/e-mail-session.c:1029 #, c-format msgid "" "No destination address provided, forward of the message has been cancelled." @@ -9220,18 +9221,18 @@ msgstr "" "No se proporcionó ninguna dirección de destino, se canceló el reenvío del " "mensaje." -#: ../mail/e-mail-session.c:1018 +#: ../mail/e-mail-session.c:1038 #, c-format msgid "No account found to use, forward of the message has been cancelled." msgstr "" "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje." -#: ../mail/e-mail-session.c:1169 +#: ../mail/e-mail-session.c:1189 #, c-format msgid "%s authentication failed" msgstr "Falló en la autenticación %s" -#: ../mail/e-mail-session.c:1243 +#: ../mail/e-mail-session.c:1263 #, c-format msgid "No password was provided" msgstr "No se ha proporcionado ninguna contraseña" @@ -9308,29 +9309,29 @@ msgstr "-----Mensaje original-----" #. Translators: First %s is an email address, second %s #. * is the subject of the email, third %s is the date. -#: ../mail/em-composer-utils.c:2001 +#: ../mail/em-composer-utils.c:2007 #, c-format 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»" -#: ../mail/em-composer-utils.c:2061 +#: ../mail/em-composer-utils.c:2067 #, c-format msgid "Delivery Notification for: \"%s\"" msgstr "Notificación de entrega para: «%s»" -#: ../mail/em-composer-utils.c:2602 +#: ../mail/em-composer-utils.c:2608 msgid "an unknown sender" msgstr "un remitente desconocido" -#: ../mail/em-composer-utils.c:3008 +#: ../mail/em-composer-utils.c:3014 msgid "Posting destination" msgstr "Destino de publicación" -#: ../mail/em-composer-utils.c:3009 +#: ../mail/em-composer-utils.c:3015 msgid "Choose folders to post the message to." msgstr "Elija las carpetas en las que publicar el mensaje." -#: ../mail/em-filter-folder-element.c:241 +#: ../mail/em-filter-folder-element.c:240 msgid "Select Folder" msgstr "Seleccionar carpeta" @@ -9447,7 +9448,7 @@ msgstr "no está configurado" msgid "is set" msgstr "está configurado" -#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66 +#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67 msgid "Junk" msgstr "SPAM" @@ -9949,7 +9950,7 @@ msgid "Subscribe to _all" msgstr "Suscribirse a _todo" #: ../mail/em-subscription-editor.c:933 ../mail/em-subscription-editor.c:1772 -#: ../modules/mail/e-mail-shell-view-actions.c:1214 +#: ../modules/mail/e-mail-shell-view-actions.c:1216 msgid "_Unsubscribe" msgstr "Des_uscribir" @@ -9986,7 +9987,7 @@ msgid "Su_bscribe" msgstr "_Suscribirse" #: ../mail/em-subscription-editor.c:1771 -#: ../modules/mail/e-mail-shell-view-actions.c:1216 +#: ../modules/mail/e-mail-shell-view-actions.c:1218 msgid "Unsubscribe from the selected folder" msgstr "Desuscribirse de la carpeta seleccionada" @@ -10126,38 +10127,46 @@ msgid "Automatic link recognition" msgstr "Reconocimiento automático de enlaces" #: ../mail/evolution-mail.schemas.in.h:19 +msgid "" +"Automatically enable PGP or S/MIME signatures when replying to a message " +"which is also PGP or S/MIME signed." +msgstr "" +"Activar las firmas PGP o S/MIME automáticamente al responder a un mensaje " +"firmado con PGP o S/MIME." + +#: ../mail/evolution-mail.schemas.in.h:20 msgid "Check for new messages in all active accounts" msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas" -#: ../mail/evolution-mail.schemas.in.h:20 +#: ../mail/evolution-mail.schemas.in.h:21 msgid "Check for new messages on start" msgstr "Comprobar si hay mensajes nuevos al inicio" -#: ../mail/evolution-mail.schemas.in.h:21 +#: ../mail/evolution-mail.schemas.in.h:22 msgid "Check incoming mail being junk" msgstr "Comprobar si el correo entrante es SPAM" -#: ../mail/evolution-mail.schemas.in.h:22 +#: ../mail/evolution-mail.schemas.in.h:23 msgid "Citation highlight color" msgstr "Color de resaltado de citas" -#: ../mail/evolution-mail.schemas.in.h:23 +#: ../mail/evolution-mail.schemas.in.h:24 msgid "Citation highlight color." msgstr "Color de resaltado de citas." -#: ../mail/evolution-mail.schemas.in.h:24 +#: ../mail/evolution-mail.schemas.in.h:25 msgid "Composer Window default height" msgstr "Altura predeterminada de la ventana de redacción de mensajes" -#: ../mail/evolution-mail.schemas.in.h:25 +#: ../mail/evolution-mail.schemas.in.h:26 msgid "Composer Window default width" msgstr "Anchura predeterminada de la ventana de redacción de mensajes" -#: ../mail/evolution-mail.schemas.in.h:26 +#: ../mail/evolution-mail.schemas.in.h:27 msgid "Compress display of addresses in TO/CC/BCC" msgstr "Comprimir la visualización de direcciones en A/CC/CCO" -#: ../mail/evolution-mail.schemas.in.h:27 +#: ../mail/evolution-mail.schemas.in.h:28 msgid "" "Compress display of addresses in TO/CC/BCC to the number specified in " "address_count." @@ -10165,7 +10174,7 @@ msgstr "" "Comprime la visualización de direcciones en A/CC/CCO al número especificado " "en address_count." -#: ../mail/evolution-mail.schemas.in.h:28 +#: ../mail/evolution-mail.schemas.in.h:29 msgid "" "Controls how frequently local changes are synchronized with the remote mail " "server. The interval must be at least 30 seconds." @@ -10173,11 +10182,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." -#: ../mail/evolution-mail.schemas.in.h:29 +#: ../mail/evolution-mail.schemas.in.h:30 msgid "Custom headers to use while checking for junk." msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM." -#: ../mail/evolution-mail.schemas.in.h:30 +#: ../mail/evolution-mail.schemas.in.h:31 msgid "" "Custom headers to use while checking for junk. The list elements are string " "in the format \"headername=value\"." @@ -10185,66 +10194,65 @@ msgstr "" "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de " "elementos son cadenas con el formato \"headername=valor\"." -#: ../mail/evolution-mail.schemas.in.h:31 +#: ../mail/evolution-mail.schemas.in.h:32 msgid "Default charset in which to compose messages" msgstr "Conjunto de caracteres predeterminado para redactar mensajes" -#: ../mail/evolution-mail.schemas.in.h:32 +#: ../mail/evolution-mail.schemas.in.h:33 msgid "Default charset in which to compose messages." msgstr "Conjunto de caracteres predeterminado para redactar mensajes." -#: ../mail/evolution-mail.schemas.in.h:33 +#: ../mail/evolution-mail.schemas.in.h:34 msgid "Default charset in which to display messages" msgstr "Conjunto de caracteres predeterminado para mostrar mensajes" -#: ../mail/evolution-mail.schemas.in.h:34 +#: ../mail/evolution-mail.schemas.in.h:35 msgid "Default charset in which to display messages." msgstr "Conjunto de caracteres predeterminado para mostrar mensajes." -#: ../mail/evolution-mail.schemas.in.h:35 +#: ../mail/evolution-mail.schemas.in.h:36 msgid "Default forward style" msgstr "Estilo de reenvío predeterminado" -#: ../mail/evolution-mail.schemas.in.h:36 +#: ../mail/evolution-mail.schemas.in.h:37 msgid "Default height of the Composer Window." msgstr "Altura predeterminada de la ventana del editor de mensajes." -#: ../mail/evolution-mail.schemas.in.h:37 +#: ../mail/evolution-mail.schemas.in.h:38 msgid "Default height of the mail browser window." msgstr "Altura predeterminada de la ventana del examinador de correo." -#: ../mail/evolution-mail.schemas.in.h:38 +#: ../mail/evolution-mail.schemas.in.h:39 msgid "Default maximized state of the mail browser window." msgstr "" "Anchura predeterminada en estado maximizado de la ventana del examinador de " "correo." -#: ../mail/evolution-mail.schemas.in.h:39 +#: ../mail/evolution-mail.schemas.in.h:40 msgid "Default reply style" msgstr "Estilo de respuesta predeterminado" -#: ../mail/evolution-mail.schemas.in.h:40 +#: ../mail/evolution-mail.schemas.in.h:41 msgid "Default value for thread expand state" msgstr "Valor predeterminado para el estado de expansión de la conversación" -#: ../mail/evolution-mail.schemas.in.h:41 +#: ../mail/evolution-mail.schemas.in.h:42 msgid "Default width of the Composer Window." msgstr "Anchura predeterminada de la ventana del editor de mensajes." -#: ../mail/evolution-mail.schemas.in.h:42 +#: ../mail/evolution-mail.schemas.in.h:43 msgid "Default width of the mail browser window." msgstr "Anchura predeterminada de la ventana del examinador de correo." -#: ../mail/evolution-mail.schemas.in.h:43 +#: ../mail/evolution-mail.schemas.in.h:44 msgid "" "Describes whether message headers in paned view should be collapsed or " "expanded by default. \"0\" = expanded \"1\" = collapsed" msgstr "" "Describe si las cabeceras del mensajes en la vista con paneles se deben " -"contraer o expandir de manera predeterminada. «0» = expandidas «1» = " -"contraídas" +"contraer o expandir de manera predeterminada. «0» = expandidas «1» = contraídas" -#: ../mail/evolution-mail.schemas.in.h:44 +#: ../mail/evolution-mail.schemas.in.h:45 msgid "" "Determines whether to look up addresses for junk filtering in local address " "book only" @@ -10252,13 +10260,13 @@ msgstr "" "Determina si se deben buscar direcciones para filtrar SPAM sólo en la " "libreta de direcciones local" -#: ../mail/evolution-mail.schemas.in.h:45 +#: ../mail/evolution-mail.schemas.in.h:46 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" -#: ../mail/evolution-mail.schemas.in.h:46 +#: ../mail/evolution-mail.schemas.in.h:47 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 " @@ -10270,12 +10278,12 @@ msgstr "" "libretas marcadas para autocompletado. Puede ser lento si se han marcado " "para autocompletado libretas de direcciones remotas (como LDAP)." -#: ../mail/evolution-mail.schemas.in.h:47 +#: ../mail/evolution-mail.schemas.in.h:48 msgid "Determines whether to use custom headers to check for junk" msgstr "" "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM" -#: ../mail/evolution-mail.schemas.in.h:48 +#: ../mail/evolution-mail.schemas.in.h:49 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 " @@ -10285,55 +10293,61 @@ msgstr "" "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará " "la velocidad de comprobado de correo basura." -#: ../mail/evolution-mail.schemas.in.h:49 +#: ../mail/evolution-mail.schemas.in.h:50 msgid "" "Determines whether to use the same fonts for both \"From\" and \"Subject\" " "lines in the \"Messages\" column in vertical view." msgstr "" -"Determina si se debe usar la misma tipografía para las líneas «De» y " -"«Asunto» en la columna «Mensajes» de la vista vertical." +"Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» " +"en la columna «Mensajes» de la vista vertical." -#: ../mail/evolution-mail.schemas.in.h:50 +#: ../mail/evolution-mail.schemas.in.h:51 +msgid "Digitally sign messages when original message signed (PGP or S/MIME)" +msgstr "" +"Firmar mensajes digitalmente cuando el mensaje original esté firmado (PGP o " +"S/MIME)" + +#: ../mail/evolution-mail.schemas.in.h:52 msgid "Directory for saving mail component files." msgstr "Carpeta para guardar archivos enviados por correo." -#: ../mail/evolution-mail.schemas.in.h:51 +#: ../mail/evolution-mail.schemas.in.h:53 msgid "Disable or enable ellipsizing of folder names in side bar" msgstr "" "Desactivar o activar la elipsis de los nombres de las carpetas en la barra " "lateral" -#: ../mail/evolution-mail.schemas.in.h:52 +#: ../mail/evolution-mail.schemas.in.h:54 msgid "Display only message texts not exceeding certain size" msgstr "Mostrar sólo los mensajes de texto que no excedan de cierto tamaño" -#: ../mail/evolution-mail.schemas.in.h:53 +#: ../mail/evolution-mail.schemas.in.h:55 msgid "Do not add signature delimiter" msgstr "No añadir un delimitador de firma" -#: ../mail/evolution-mail.schemas.in.h:54 +#: ../mail/evolution-mail.schemas.in.h:56 msgid "Draw spelling error indicators on words as you type." msgstr "" "Dibujar indicadores de errores tipográficos en las palabras mientras se " "escribe." -#: ../mail/evolution-mail.schemas.in.h:55 +#: ../mail/evolution-mail.schemas.in.h:57 msgid "Empty Junk folders on exit" msgstr "Vaciar las carpetas SPAM al salir" -#: ../mail/evolution-mail.schemas.in.h:56 +#: ../mail/evolution-mail.schemas.in.h:58 msgid "Empty Trash folders on exit" msgstr "Vaciar papeleras al salir" -#: ../mail/evolution-mail.schemas.in.h:57 +#: ../mail/evolution-mail.schemas.in.h:59 msgid "Empty all Junk folders when exiting Evolution." msgstr "Vaciar todas las carpetas SPAM al salir de Evolution." -#: ../mail/evolution-mail.schemas.in.h:58 +#: ../mail/evolution-mail.schemas.in.h:60 msgid "Empty all Trash folders when exiting Evolution." msgstr "Vaciar todas las papeleras al salir de Evolution." -#: ../mail/evolution-mail.schemas.in.h:59 +#: ../mail/evolution-mail.schemas.in.h:61 msgid "" "Enable animated images in HTML mail. Many users find animated images " "annoying and prefer to see a static image instead." @@ -10341,35 +10355,35 @@ msgstr "" "Activar imágenes animadas en correos HTML. Muchos usuarios consideran " "molestas las imágenes animadas y prefieren ver una imagen estática." -#: ../mail/evolution-mail.schemas.in.h:60 +#: ../mail/evolution-mail.schemas.in.h:62 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." -#: ../mail/evolution-mail.schemas.in.h:61 +#: ../mail/evolution-mail.schemas.in.h:63 msgid "Enable local folders" msgstr "Activar carpetas locales" -#: ../mail/evolution-mail.schemas.in.h:62 +#: ../mail/evolution-mail.schemas.in.h:64 msgid "Enable or disable magic space bar" msgstr "Activa o desactiva la barra espaciadora mágica" -#: ../mail/evolution-mail.schemas.in.h:63 +#: ../mail/evolution-mail.schemas.in.h:65 msgid "Enable or disable the prompt whilst marking multiple messages." msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes." -#: ../mail/evolution-mail.schemas.in.h:64 +#: ../mail/evolution-mail.schemas.in.h:66 msgid "Enable or disable type ahead search feature" msgstr "Activa o desactiva la característica de búsqueda al teclear" -#: ../mail/evolution-mail.schemas.in.h:65 +#: ../mail/evolution-mail.schemas.in.h:67 msgid "Enable search folders" msgstr "Activar las carpetas de búsqueda" -#: ../mail/evolution-mail.schemas.in.h:66 +#: ../mail/evolution-mail.schemas.in.h:68 msgid "Enable search folders on startup." msgstr "Activar las carpetas de búsqueda al inicio." -#: ../mail/evolution-mail.schemas.in.h:67 +#: ../mail/evolution-mail.schemas.in.h:69 msgid "" "Enable the side bar search feature to allow interactive searching of folder " "names." @@ -10377,7 +10391,7 @@ msgstr "" "Activar la característica barra de búsqueda lateral para permitir búsquedas " "interactivas de nombres de carpetas." -#: ../mail/evolution-mail.schemas.in.h:68 +#: ../mail/evolution-mail.schemas.in.h:70 msgid "" "Enable this to use Space bar key to scroll in message preview, message list " "and folders." @@ -10385,7 +10399,7 @@ msgstr "" "Activar esto para usar la barra espaciadora para desplazarse en la vista " "previa del mensaje, lista de mensajes y carpetas." -#: ../mail/evolution-mail.schemas.in.h:69 +#: ../mail/evolution-mail.schemas.in.h:71 msgid "" "Enable to display only message texts not exceeding size defined in " "'message_text_part_limit' key." @@ -10393,27 +10407,27 @@ msgstr "" "Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaño " "definido en la clave «message_text_part_limit»." -#: ../mail/evolution-mail.schemas.in.h:70 +#: ../mail/evolution-mail.schemas.in.h:72 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" -#: ../mail/evolution-mail.schemas.in.h:71 +#: ../mail/evolution-mail.schemas.in.h:73 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." -#: ../mail/evolution-mail.schemas.in.h:72 +#: ../mail/evolution-mail.schemas.in.h:74 msgid "Enable/disable caret mode" msgstr "Activar/desactivar modo cursor" -#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:47 +#: ../mail/evolution-mail.schemas.in.h:75 ../mail/mail-config.ui.h:48 msgid "Encode file names in an Outlook/GMail way" msgstr "Codificar nombres de archivo de la forma Outlook/GMail" -#: ../mail/evolution-mail.schemas.in.h:74 +#: ../mail/evolution-mail.schemas.in.h:76 msgid "" "Encode file names in the mail headers same as Outlook or GMail do, to let " "them display correctly file names with UTF-8 letters sent by Evolution, " @@ -10425,31 +10439,31 @@ msgstr "" "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan " "el estándar incorrecto RFC 2047." -#: ../mail/evolution-mail.schemas.in.h:75 +#: ../mail/evolution-mail.schemas.in.h:77 msgid "Flush Outbox after filtering" msgstr "Limpiar la bandeja de salida después de filtrar" -#: ../mail/evolution-mail.schemas.in.h:76 +#: ../mail/evolution-mail.schemas.in.h:78 msgid "Forward message." msgstr "Reenviar mensaje." -#: ../mail/evolution-mail.schemas.in.h:77 +#: ../mail/evolution-mail.schemas.in.h:79 msgid "Group Reply replies to list" msgstr "Responder al grupo responde a la lista" -#: ../mail/evolution-mail.schemas.in.h:78 +#: ../mail/evolution-mail.schemas.in.h:80 msgid "Height of the message-list pane" msgstr "Altura del panel de lista de mensajes" -#: ../mail/evolution-mail.schemas.in.h:79 +#: ../mail/evolution-mail.schemas.in.h:81 msgid "Height of the message-list pane." msgstr "Altura del panel de vista de mensajes." -#: ../mail/evolution-mail.schemas.in.h:80 +#: ../mail/evolution-mail.schemas.in.h:82 msgid "Hides the per-folder preview and removes the selection" msgstr "Oculta la vista previa por carpeta y elimina la selección" -#: ../mail/evolution-mail.schemas.in.h:81 +#: ../mail/evolution-mail.schemas.in.h:83 msgid "" "If a user tries to open 10 or more messages at one time, ask the user if " "they really want to do it." @@ -10457,7 +10471,7 @@ msgstr "" "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar " "al usuario si quiere realmente hacerlo." -#: ../mail/evolution-mail.schemas.in.h:82 +#: ../mail/evolution-mail.schemas.in.h:84 msgid "" "If there isn't a builtin viewer for a particular MIME type inside Evolution, " "any MIME types appearing in this list which map to a Bonobo component viewer " @@ -10468,19 +10482,19 @@ msgstr "" "visor de componentes bonobo en la base de datos de GNOME puede usarse para " "mostrar el contenido." -#: ../mail/evolution-mail.schemas.in.h:83 +#: ../mail/evolution-mail.schemas.in.h:85 msgid "Ignore list Reply-To:" msgstr "Ignorar «Responder a:» para listas:" -#: ../mail/evolution-mail.schemas.in.h:84 +#: ../mail/evolution-mail.schemas.in.h:86 msgid "" "Initial height of the \"Filter Editor\" window. The value updates as the " "user resizes the window vertically." msgstr "" -"Altura inicial de la ventana «Editor de filtros». El valor se actualiza " -"según el usuario redimensiona verticalmente la ventana." +"Altura inicial de la ventana «Editor de filtros». El valor se actualiza según " +"el usuario redimensiona verticalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:85 +#: ../mail/evolution-mail.schemas.in.h:87 msgid "" "Initial height of the \"Folder Subscriptions\" window. The value updates as " "the user resizes the window vertically." @@ -10488,7 +10502,7 @@ msgstr "" "Altura inicial de la ventana «Suscripciones de carpetas». El valor se " "actualiza según el usuario redimensiona verticalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:86 +#: ../mail/evolution-mail.schemas.in.h:88 msgid "" "Initial height of the \"Search Folder Editor\" window. The value updates as " "the user resizes the window vertically." @@ -10496,15 +10510,15 @@ msgstr "" "Altura inicial de la ventana «Editor de carpetas de búsqueda». El valor se " "actualiza según el usuario redimensiona verticalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:87 +#: ../mail/evolution-mail.schemas.in.h:89 msgid "" "Initial height of the \"Send and Receive Mail\" window. The value updates as " "the user resizes the window vertically." msgstr "" -"Altura inicial de la ventana «Enviar y recibir correo». El valor se " -"actualiza según el usuario redimensiona verticalmente la ventana." +"Altura inicial de la ventana «Enviar y recibir correo». El valor se actualiza " +"según el usuario redimensiona verticalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:88 +#: ../mail/evolution-mail.schemas.in.h:90 msgid "" "Initial maximize state of the \"Filter Editor\" window. The value updates " "when the user maximizes or unmaximizes the window. Note, this particular " @@ -10516,20 +10530,20 @@ msgstr "" "usa este valor en particular ya que la ventana «Editor de filtros» no se " "puede maximizar. Esta clave existe sólo como un detalle de implementación." -#: ../mail/evolution-mail.schemas.in.h:89 +#: ../mail/evolution-mail.schemas.in.h:91 msgid "" "Initial maximize state of the \"Folder Subscriptions\" window. The value " "updates when the user maximizes or unmaximizes the window. Note, this " "particular value is not used by Evolution since the \"Folder Subscriptions\" " "window cannot be maximized. This key exists only as an implementation detail." msgstr "" -"Estado inicial maximizado de la ventana «Suscripciones de carpetas». El " -"valor se actualiza cuando el usuario maximiza o reduce la ventana. Nota: " -"Evolution no usa este valor en particular ya que la ventana «Suscripciones " -"de carpetas» no se puede maximizar. Esta clave existe sólo como un detalle " -"de implementación." +"Estado inicial maximizado de la ventana «Suscripciones de carpetas». El valor " +"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution " +"no usa este valor en particular ya que la ventana «Suscripciones de carpetas» " +"no se puede maximizar. Esta clave existe sólo como un detalle de " +"implementación." -#: ../mail/evolution-mail.schemas.in.h:90 +#: ../mail/evolution-mail.schemas.in.h:92 msgid "" "Initial maximize state of the \"Search Folder Editor\" window. The value " "updates when the user maximizes or unmaximizes the window. Note, this " @@ -10542,7 +10556,7 @@ msgstr "" "carpetas de búsqueda» no se puede maximizar. Esta clave existe sólo como un " "detalle de implementación." -#: ../mail/evolution-mail.schemas.in.h:91 +#: ../mail/evolution-mail.schemas.in.h:93 msgid "" "Initial maximize state of the \"Send and Receive Mail\" window. The value " "updates when the user maximizes or unmaximizes the window. Note, this " @@ -10556,7 +10570,7 @@ msgstr "" "no se puede maximizar. Esta clave existe sólo como un detalle de " "implementación." -#: ../mail/evolution-mail.schemas.in.h:92 +#: ../mail/evolution-mail.schemas.in.h:94 msgid "" "Initial width of the \"Filter Editor\" window. The value updates as the user " "resizes the window horizontally." @@ -10564,7 +10578,7 @@ msgstr "" "Anchura inicial de la ventana «Editor de filtros». El valor se actualiza " "según el usuario redimensiona horizontalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:93 +#: ../mail/evolution-mail.schemas.in.h:95 msgid "" "Initial width of the \"Folder Subscriptions\" window. The value updates as " "the user resizes the window horizontally." @@ -10572,7 +10586,7 @@ msgstr "" "Anchura inicial de la ventana «Suscripciones de carpetas». El valor se " "actualiza según el usuario redimensiona horizontalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:94 +#: ../mail/evolution-mail.schemas.in.h:96 msgid "" "Initial width of the \"Search Folder Editor\" window. The value updates as " "the user resizes the window horizontally." @@ -10580,7 +10594,7 @@ msgstr "" "Anchura inicial de la ventana «Editor de carpetas de búsqueda». El valor se " "actualiza según el usuario redimensiona horizontalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:95 +#: ../mail/evolution-mail.schemas.in.h:97 msgid "" "Initial width of the \"Send and Receive Mail\" window. The value updates as " "the user resizes the window horizontally." @@ -10588,7 +10602,7 @@ msgstr "" "Anchura inicial de la ventana «Enviar y recibir correo». El valor se " "actualiza según el usuario redimensiona horizontalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:96 +#: ../mail/evolution-mail.schemas.in.h:98 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 " @@ -10600,7 +10614,7 @@ msgstr "" "responder sólo a la lista de correo a través de la que recibe copias de los " "correos a los que está respondiendo." -#: ../mail/evolution-mail.schemas.in.h:97 +#: ../mail/evolution-mail.schemas.in.h:99 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 " @@ -10610,7 +10624,7 @@ msgstr "" "correos de una carpeta de búsqueda borra permanentemente el correo, no sólo " "los elimina de los resultados de la búsqueda." -#: ../mail/evolution-mail.schemas.in.h:98 +#: ../mail/evolution-mail.schemas.in.h:100 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." @@ -10619,7 +10633,7 @@ msgstr "" "que está enviando una respuesta privada a un correo que llegó a través de " "una lista de correo." -#: ../mail/evolution-mail.schemas.in.h:99 +#: ../mail/evolution-mail.schemas.in.h:101 msgid "" "It disables/enables the repeated prompts to warn that you are sending a " "reply to many people." @@ -10627,7 +10641,7 @@ msgstr "" "Desactiva o activa los mensajes repetitivos para avisarle de que está " "enviando una respuesta a mucha gente." -#: ../mail/evolution-mail.schemas.in.h:100 +#: ../mail/evolution-mail.schemas.in.h:102 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 " @@ -10638,7 +10652,7 @@ msgstr "" "una lista de correo, pero la lista establece una cabecera «Responder a:» que " "redirecciona su respuesta de nuevo a la lista." -#: ../mail/evolution-mail.schemas.in.h:101 +#: ../mail/evolution-mail.schemas.in.h:103 msgid "" "It disables/enables the repeated prompts to warn that you are trying to send " "a message to recipients not entered as mail addresses" @@ -10647,40 +10661,40 @@ msgstr "" "que está enviando un mensaje a destinatarios no introducidos como una " "dirección de correo" -#: ../mail/evolution-mail.schemas.in.h:102 +#: ../mail/evolution-mail.schemas.in.h:104 msgid "Last time Empty Junk was run" msgstr "Última vez que se vació el SPAM" -#: ../mail/evolution-mail.schemas.in.h:103 +#: ../mail/evolution-mail.schemas.in.h:105 msgid "Last time Empty Trash was run" msgstr "Última vez que se vació la papelera" -#: ../mail/evolution-mail.schemas.in.h:104 +#: ../mail/evolution-mail.schemas.in.h:106 msgid "Layout style" msgstr "Estilo de la distribución" -#: ../mail/evolution-mail.schemas.in.h:105 +#: ../mail/evolution-mail.schemas.in.h:107 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30 msgid "Level beyond which the message should be logged." msgstr "Nivel más allá del cuál el mensaje se debe registrar." -#: ../mail/evolution-mail.schemas.in.h:106 +#: ../mail/evolution-mail.schemas.in.h:108 msgid "List of Labels and their associated colors" msgstr "Lista de etiquetas y sus colores asociados" -#: ../mail/evolution-mail.schemas.in.h:107 +#: ../mail/evolution-mail.schemas.in.h:109 msgid "List of MIME types to check for Bonobo component viewers" msgstr "Lista de tipos MIME de comprobación de visores de componentes Bonobo" -#: ../mail/evolution-mail.schemas.in.h:108 +#: ../mail/evolution-mail.schemas.in.h:110 msgid "List of accepted licenses" msgstr "Lista de licencias aceptadas" -#: ../mail/evolution-mail.schemas.in.h:109 +#: ../mail/evolution-mail.schemas.in.h:111 msgid "List of accounts" msgstr "Lista de cuentas" -#: ../mail/evolution-mail.schemas.in.h:110 +#: ../mail/evolution-mail.schemas.in.h:112 msgid "" "List of accounts known to the mail component of Evolution. The list contains " "strings naming subdirectories relative to /apps/evolution/mail/accounts." @@ -10689,16 +10703,16 @@ msgstr "" "lista contiene cadenas nombrando subcarpetas relativas a /apps/evolution/" "mail/accounts." -#: ../mail/evolution-mail.schemas.in.h:111 +#: ../mail/evolution-mail.schemas.in.h:113 msgid "List of custom headers and whether they are enabled." msgstr "Lista de cabeceras personalizadas y si están activadas." -#: ../mail/evolution-mail.schemas.in.h:112 +#: ../mail/evolution-mail.schemas.in.h:114 msgid "List of dictionary language codes used for spell checking." msgstr "" "Lista de los códigos de diccionario usados para la corrección ortográfica." -#: ../mail/evolution-mail.schemas.in.h:113 +#: ../mail/evolution-mail.schemas.in.h:115 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." @@ -10707,15 +10721,15 @@ msgstr "" "lista contiene cadenas con el nombre:color donde color usa la codificación " "hex HTML." -#: ../mail/evolution-mail.schemas.in.h:114 +#: ../mail/evolution-mail.schemas.in.h:116 msgid "List of protocol names whose license has been accepted." msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada." -#: ../mail/evolution-mail.schemas.in.h:115 +#: ../mail/evolution-mail.schemas.in.h:117 msgid "Load images for HTML messages over HTTP" msgstr "Cargar imágenes para mensajes HTML sobre HTTP" -#: ../mail/evolution-mail.schemas.in.h:116 +#: ../mail/evolution-mail.schemas.in.h:118 msgid "" "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - " "Never load images off the net. \"1\" - Load images in messages from " @@ -10726,209 +10740,209 @@ msgstr "" "remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes " "desde la red." -#: ../mail/evolution-mail.schemas.in.h:117 +#: ../mail/evolution-mail.schemas.in.h:119 msgid "Log filter actions" msgstr "Registrar acciones de filtrado" -#: ../mail/evolution-mail.schemas.in.h:118 +#: ../mail/evolution-mail.schemas.in.h:120 msgid "Log filter actions to the specified log file." msgstr "Registrar acciones de filtrado en el archivo de registro especificado." -#: ../mail/evolution-mail.schemas.in.h:119 +#: ../mail/evolution-mail.schemas.in.h:121 msgid "Logfile to log filter actions" msgstr "Archivo de registro para registrar las acciones de filtrado" -#: ../mail/evolution-mail.schemas.in.h:120 +#: ../mail/evolution-mail.schemas.in.h:122 msgid "Logfile to log filter actions." msgstr "Archivo de registro para registrar las acciones de filtrado." -#: ../mail/evolution-mail.schemas.in.h:121 +#: ../mail/evolution-mail.schemas.in.h:123 msgid "Mail browser height" msgstr "Altura del examinador de correo" -#: ../mail/evolution-mail.schemas.in.h:122 +#: ../mail/evolution-mail.schemas.in.h:124 msgid "Mail browser maximized" msgstr "Examinador de correo maximizado" -#: ../mail/evolution-mail.schemas.in.h:123 +#: ../mail/evolution-mail.schemas.in.h:125 msgid "Mail browser width" msgstr "Anchura del examinador de correo" -#: ../mail/evolution-mail.schemas.in.h:124 +#: ../mail/evolution-mail.schemas.in.h:126 msgid "Mark as Seen after specified timeout" msgstr "Marcar como visto después del tiempo especificado" -#: ../mail/evolution-mail.schemas.in.h:125 +#: ../mail/evolution-mail.schemas.in.h:127 msgid "Mark as Seen after specified timeout." msgstr "Marcar como visto después del tiempo especificado." -#: ../mail/evolution-mail.schemas.in.h:126 +#: ../mail/evolution-mail.schemas.in.h:128 msgid "Mark citations in the message \"Preview\"" msgstr "Marcar citas textuales en la vista previa del mensaje" -#: ../mail/evolution-mail.schemas.in.h:127 +#: ../mail/evolution-mail.schemas.in.h:129 msgid "Mark citations in the message \"Preview\"." msgstr "Marcar citas textuales en la «vista previa» del mensaje." -#: ../mail/evolution-mail.schemas.in.h:128 +#: ../mail/evolution-mail.schemas.in.h:130 msgid "Message text limit for display" msgstr "Límite del texto del mensaje para mostrarlo" -#: ../mail/evolution-mail.schemas.in.h:129 +#: ../mail/evolution-mail.schemas.in.h:131 msgid "Message-display style (\"normal\", \"full headers\", \"source\")" msgstr "" "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras " "completas), \"source\" (fuente))" -#: ../mail/evolution-mail.schemas.in.h:130 +#: ../mail/evolution-mail.schemas.in.h:132 msgid "Minimum days between emptying the junk on exit" msgstr "Días mínimos entre el vaciado del SPAM a la salida" -#: ../mail/evolution-mail.schemas.in.h:131 +#: ../mail/evolution-mail.schemas.in.h:133 msgid "Minimum days between emptying the trash on exit" msgstr "Días mínimos entre el vaciado de la papelera a la salida" -#: ../mail/evolution-mail.schemas.in.h:132 +#: ../mail/evolution-mail.schemas.in.h:134 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." -#: ../mail/evolution-mail.schemas.in.h:133 +#: ../mail/evolution-mail.schemas.in.h:135 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." -#: ../mail/evolution-mail.schemas.in.h:134 +#: ../mail/evolution-mail.schemas.in.h:136 msgid "Number of addresses to display in TO/CC/BCC" msgstr "Número de direcciones a mostrar en PARA/CC/CCO" -#: ../mail/evolution-mail.schemas.in.h:135 +#: ../mail/evolution-mail.schemas.in.h:137 msgid "Original message." msgstr "Mensaje original." -#: ../mail/evolution-mail.schemas.in.h:136 +#: ../mail/evolution-mail.schemas.in.h:138 msgid "Path where picture gallery should search for its content" msgstr "Ruta donde la galería de imágenes debería buscar su contenido" -#: ../mail/evolution-mail.schemas.in.h:137 +#: ../mail/evolution-mail.schemas.in.h:139 msgid "" "Possible values are: never - to never close browser window always - to " "always close browser window ask - (or any other value) will ask user" msgstr "" -"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana " -"del examinador; «always» (siempre) para cerrar siempre la ventana del " -"examinador; «ask» (preguntar) o cualquier otro valor, preguntarán al usuario" +"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana del " +"examinador; «always» (siempre) para cerrar siempre la ventana del examinador; " +"«ask» (preguntar) o cualquier otro valor, preguntarán al usuario" -#: ../mail/evolution-mail.schemas.in.h:138 +#: ../mail/evolution-mail.schemas.in.h:140 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" -#: ../mail/evolution-mail.schemas.in.h:139 +#: ../mail/evolution-mail.schemas.in.h:141 msgid "Prompt on empty subject" msgstr "Preguntar si el asunto está en blanco" -#: ../mail/evolution-mail.schemas.in.h:140 +#: ../mail/evolution-mail.schemas.in.h:142 msgid "Prompt the user when he or she tries to expunge a folder." msgstr "Preguntar al usuario cuando intente purgar una carpeta." -#: ../mail/evolution-mail.schemas.in.h:141 +#: ../mail/evolution-mail.schemas.in.h:143 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." -#: ../mail/evolution-mail.schemas.in.h:142 +#: ../mail/evolution-mail.schemas.in.h:144 msgid "Prompt when deleting messages in search folder" msgstr "Preguntar al eliminar correos en carpetas de búsqueda" -#: ../mail/evolution-mail.schemas.in.h:143 +#: ../mail/evolution-mail.schemas.in.h:145 msgid "Prompt when mailing list hijacks private replies" msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas" -#: ../mail/evolution-mail.schemas.in.h:144 +#: ../mail/evolution-mail.schemas.in.h:146 msgid "Prompt when replying privately to list messages" msgstr "Preguntar al responder de forma privada a correos de una lista" -#: ../mail/evolution-mail.schemas.in.h:145 +#: ../mail/evolution-mail.schemas.in.h:147 msgid "Prompt when replying to many recipients" msgstr "Preguntar al responder a muchos desinatarios" -#: ../mail/evolution-mail.schemas.in.h:146 +#: ../mail/evolution-mail.schemas.in.h:148 msgid "Prompt when user expunges" msgstr "Preguntar cuando el usuario compacte" -#: ../mail/evolution-mail.schemas.in.h:147 +#: ../mail/evolution-mail.schemas.in.h:149 msgid "Prompt when user only fills Bcc" msgstr "Preguntar cuando el usuario sólo rellene el campo Cco" -#: ../mail/evolution-mail.schemas.in.h:148 +#: ../mail/evolution-mail.schemas.in.h:150 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" -#: ../mail/evolution-mail.schemas.in.h:149 +#: ../mail/evolution-mail.schemas.in.h:151 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." -#: ../mail/evolution-mail.schemas.in.h:150 +#: ../mail/evolution-mail.schemas.in.h:152 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." -#: ../mail/evolution-mail.schemas.in.h:151 +#: ../mail/evolution-mail.schemas.in.h:153 msgid "Prompt when user tries to send unwanted HTML" msgstr "Preguntar cuando el usuario intente enviar HTML no deseado" -#: ../mail/evolution-mail.schemas.in.h:152 +#: ../mail/evolution-mail.schemas.in.h:154 msgid "Prompt while marking multiple messages" msgstr "Preguntar cuando se marquen varios correos" -#: ../mail/evolution-mail.schemas.in.h:153 +#: ../mail/evolution-mail.schemas.in.h:155 msgid "Put personalized signatures at the top of replies" msgstr "Poner firmas personalizas en la parte superior de las respuestas" -#: ../mail/evolution-mail.schemas.in.h:154 +#: ../mail/evolution-mail.schemas.in.h:156 msgid "Put the cursor at the bottom of replies" msgstr "Comenzar a escribir en la parte final al responder" -#: ../mail/evolution-mail.schemas.in.h:155 +#: ../mail/evolution-mail.schemas.in.h:157 msgid "Recognize emoticons in text and replace them with images." msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes." -#: ../mail/evolution-mail.schemas.in.h:156 +#: ../mail/evolution-mail.schemas.in.h:158 msgid "Recognize links in text and replace them." msgstr "Reconocer enlaces en el texto y reemplazarlos." -#: ../mail/evolution-mail.schemas.in.h:157 +#: ../mail/evolution-mail.schemas.in.h:159 msgid "Run junk test on incoming mail." msgstr "Ejecutar la prueba de SPAM en el correo entrante." -#: ../mail/evolution-mail.schemas.in.h:158 +#: ../mail/evolution-mail.schemas.in.h:160 msgid "Save directory" msgstr "Carpeta donde guardar" -#: ../mail/evolution-mail.schemas.in.h:159 +#: ../mail/evolution-mail.schemas.in.h:161 msgid "Search for the sender photo in local address books" msgstr "Buscar la foto del remitente en libretas de direcciones locales" -#: ../mail/evolution-mail.schemas.in.h:160 +#: ../mail/evolution-mail.schemas.in.h:162 msgid "Send HTML mail by default" msgstr "Enviar correo en HTML de forma predeterminada" -#: ../mail/evolution-mail.schemas.in.h:161 +#: ../mail/evolution-mail.schemas.in.h:163 msgid "Send HTML mail by default." msgstr "Enviar el correo en HTML de forma predeterminada." -#: ../mail/evolution-mail.schemas.in.h:162 +#: ../mail/evolution-mail.schemas.in.h:164 msgid "Sender email-address column in the message list" msgstr "Columna del correo-e del remitente en la lista de mensajes" -#: ../mail/evolution-mail.schemas.in.h:163 +#: ../mail/evolution-mail.schemas.in.h:165 msgid "Server synchronization interval" msgstr "Intervalo de sincronización con el servidor" -#: ../mail/evolution-mail.schemas.in.h:164 +#: ../mail/evolution-mail.schemas.in.h:166 msgid "" "Set to TRUE in case you do not want to add signature delimiter before your " "signature when composing a mail." @@ -10936,71 +10950,71 @@ msgstr "" "Establézcalo a verdadero si no quiere añadir un delimitador de firma antes " "de su firma al editar un correo." -#: ../mail/evolution-mail.schemas.in.h:165 +#: ../mail/evolution-mail.schemas.in.h:167 msgid "Show \"Bcc\" field when sending a mail message" msgstr "Mostrar el campo «Cco» al enviar un mensaje de correo" -#: ../mail/evolution-mail.schemas.in.h:166 +#: ../mail/evolution-mail.schemas.in.h:168 msgid "Show \"Cc\" field when sending a mail message" msgstr "Mostrar el campo «Cc» al enviar un mensaje de correo" -#: ../mail/evolution-mail.schemas.in.h:167 +#: ../mail/evolution-mail.schemas.in.h:169 msgid "Show \"From\" field when posting to a newsgroup" msgstr "Mostrar el campo «De» al publicar en un grupo de noticias" -#: ../mail/evolution-mail.schemas.in.h:168 +#: ../mail/evolution-mail.schemas.in.h:170 msgid "Show \"Reply To\" field when posting to a newsgroup" msgstr "Mostrar el campo «Responder a» al publicar en un grupo de noticias" -#: ../mail/evolution-mail.schemas.in.h:169 +#: ../mail/evolution-mail.schemas.in.h:171 msgid "Show \"Reply To\" field when sending a mail message" msgstr "Mostrar el campo «Responder a» al enviar un mensaje de correo" -#: ../mail/evolution-mail.schemas.in.h:170 +#: ../mail/evolution-mail.schemas.in.h:172 msgid "Show Animations" msgstr "Mostrar animaciones" -#: ../mail/evolution-mail.schemas.in.h:171 +#: ../mail/evolution-mail.schemas.in.h:173 msgid "Show all message headers" msgstr "Mostrar todas las cabeceras del mensaje" -#: ../mail/evolution-mail.schemas.in.h:172 +#: ../mail/evolution-mail.schemas.in.h:174 msgid "Show all the headers when viewing a messages." msgstr "Mostrar todas las cabeceras al ver mensajes." -#: ../mail/evolution-mail.schemas.in.h:173 +#: ../mail/evolution-mail.schemas.in.h:175 msgid "Show animated images as animations." msgstr "Mostrar las imágenes animadas como animaciones." -#: ../mail/evolution-mail.schemas.in.h:174 +#: ../mail/evolution-mail.schemas.in.h:176 msgid "Show deleted messages (with a strike-through) in the message-list." msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes." -#: ../mail/evolution-mail.schemas.in.h:175 +#: ../mail/evolution-mail.schemas.in.h:177 msgid "Show deleted messages in the message-list" msgstr "Mostrar los mensajes borrados en la lista de mensajes" -#: ../mail/evolution-mail.schemas.in.h:176 +#: ../mail/evolution-mail.schemas.in.h:178 msgid "Show image animations" msgstr "Mostrar imágenes animadas" -#: ../mail/evolution-mail.schemas.in.h:177 +#: ../mail/evolution-mail.schemas.in.h:179 msgid "Show original \"Date\" header value." msgstr "Mostrar el valor original de la cabecera «Fecha»." -#: ../mail/evolution-mail.schemas.in.h:178 +#: ../mail/evolution-mail.schemas.in.h:180 msgid "Show photo of the sender" msgstr "Mostrar la foto del remitente" -#: ../mail/evolution-mail.schemas.in.h:179 +#: ../mail/evolution-mail.schemas.in.h:181 msgid "" "Show the \"Bcc\" field when sending a mail message. This is controlled from " "the View menu when a mail account is chosen." msgstr "" -"Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla " -"desde el menú Ver cuando se elige una cuenta de correo." +"Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla desde " +"el menú Ver cuando se elige una cuenta de correo." -#: ../mail/evolution-mail.schemas.in.h:180 +#: ../mail/evolution-mail.schemas.in.h:182 msgid "" "Show the \"Cc\" field when sending a mail message. This is controlled from " "the View menu when a mail account is chosen." @@ -11008,7 +11022,7 @@ msgstr "" "Mostrar el campo «Cc» al enviar un mensaje de correo. Esto se controla desde " "el menú Ver cuando se elige una cuenta de correo." -#: ../mail/evolution-mail.schemas.in.h:181 +#: ../mail/evolution-mail.schemas.in.h:183 msgid "" "Show the \"From\" field when posting to a newsgroup. This is controlled from " "the View menu when a news account is chosen." @@ -11016,7 +11030,7 @@ msgstr "" "Mostrar el campo «De» al enviar un mensaje de correo. Esto se controla desde " "el menú Ver cuando se elige una cuenta de correo." -#: ../mail/evolution-mail.schemas.in.h:182 +#: ../mail/evolution-mail.schemas.in.h:184 msgid "" "Show the \"Reply To\" field when posting to a newsgroup. This is controlled " "from the View menu when a news account is chosen." @@ -11024,7 +11038,7 @@ msgstr "" "Mostrar el campo «Responder a» al publicar en un grupo de noticias. Esto se " "controla desde el menú Ver cuando se elige una cuenta de correo." -#: ../mail/evolution-mail.schemas.in.h:183 +#: ../mail/evolution-mail.schemas.in.h:185 msgid "" "Show the \"Reply To\" field when sending a mail message. This is controlled " "from the View menu when a mail account is chosen." @@ -11032,7 +11046,7 @@ msgstr "" "Mostrar el campo «Responder a» al enviar un mensaje de correo. Esto se " "controla desde el menú Ver cuando se elige una cuenta de correo." -#: ../mail/evolution-mail.schemas.in.h:184 +#: ../mail/evolution-mail.schemas.in.h:186 msgid "" "Show the email-address of the sender in a separate column in the message " "list." @@ -11040,7 +11054,7 @@ msgstr "" "Mostrar el correo-e del remitente en una columna separada en la lista de " "mensajes." -#: ../mail/evolution-mail.schemas.in.h:185 +#: ../mail/evolution-mail.schemas.in.h:187 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 " @@ -11051,11 +11065,11 @@ msgstr "" "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora " "locales." -#: ../mail/evolution-mail.schemas.in.h:186 +#: ../mail/evolution-mail.schemas.in.h:188 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." -#: ../mail/evolution-mail.schemas.in.h:187 +#: ../mail/evolution-mail.schemas.in.h:189 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. " @@ -11065,8 +11079,8 @@ msgid "" "it will do that. It works by comparing the Reply-To: header with a List-" "Post: header, if there is one." msgstr "" -"Algunas listas de correo establecen una cabecera «Responder a:» para forzar " -"a los usuarios a responder a la lista, incluso cuando los usuarios piden que " +"Algunas listas de correo establecen una cabecera «Responder a:» para forzar a " +"los usuarios a responder a la lista, incluso cuando los usuarios piden que " "Evolution envíe una respuesta privada. Establecer esta opción a cierta " "intentará ignorar tales cabeceras «Responder a:», de tal forma que Evolution " "haga lo que se le pide. Si usa la acción de respuesta privada, responderá de " @@ -11074,27 +11088,27 @@ msgstr "" "mismo. Funciona comparando la cabecera «Responder a:» con una cabecara «List-" "Post:», si existe." -#: ../mail/evolution-mail.schemas.in.h:188 +#: ../mail/evolution-mail.schemas.in.h:190 msgid "Sort accounts alphabetically in a folder tree" msgstr "Ordenar cuentas alfabéticamente en un árbol de carpetas" -#: ../mail/evolution-mail.schemas.in.h:189 +#: ../mail/evolution-mail.schemas.in.h:191 msgid "Spell check inline" msgstr "Comprobación ortográfica en línea" -#: ../mail/evolution-mail.schemas.in.h:190 +#: ../mail/evolution-mail.schemas.in.h:192 msgid "Spell checking color" msgstr "Color de la corrección ortográfica" -#: ../mail/evolution-mail.schemas.in.h:191 +#: ../mail/evolution-mail.schemas.in.h:193 msgid "Spell checking languages" msgstr "Comprobación ortográfica de idiomas" -#: ../mail/evolution-mail.schemas.in.h:192 +#: ../mail/evolution-mail.schemas.in.h:194 msgid "State of message headers in paned view" msgstr "Estado de las cabeceras del mensaje en la vista con paneles" -#: ../mail/evolution-mail.schemas.in.h:193 +#: ../mail/evolution-mail.schemas.in.h:195 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 " @@ -11106,29 +11120,29 @@ 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." -#: ../mail/evolution-mail.schemas.in.h:194 +#: ../mail/evolution-mail.schemas.in.h:196 msgid "Terminal font" msgstr "Tipografía del terminal" -#: ../mail/evolution-mail.schemas.in.h:195 +#: ../mail/evolution-mail.schemas.in.h:197 msgid "The default plugin for Junk hook" msgstr "El complemento predeterminado para SPAM" -#: ../mail/evolution-mail.schemas.in.h:196 +#: ../mail/evolution-mail.schemas.in.h:198 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)." -#: ../mail/evolution-mail.schemas.in.h:197 +#: ../mail/evolution-mail.schemas.in.h:199 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)." -#: ../mail/evolution-mail.schemas.in.h:198 +#: ../mail/evolution-mail.schemas.in.h:200 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 " @@ -11140,11 +11154,11 @@ msgstr "" "vista previa debajo de la lista de correos. «1» (vista vertical) ubica el " "panel de vista previa junto a la lista de correos." -#: ../mail/evolution-mail.schemas.in.h:199 +#: ../mail/evolution-mail.schemas.in.h:201 msgid "The terminal font for mail display." msgstr "La tipografía de terminal para mostrar el correo." -#: ../mail/evolution-mail.schemas.in.h:200 +#: ../mail/evolution-mail.schemas.in.h:202 msgid "" "The text that is inserted when forwarding a message, saying that the " "forwarded message follows." @@ -11152,7 +11166,7 @@ msgstr "" "El texto insertado al reenviar un mensaje, diciendo que el a continuación " "está el mensaje reenviado." -#: ../mail/evolution-mail.schemas.in.h:201 +#: ../mail/evolution-mail.schemas.in.h:203 msgid "" "The text that is inserted when replying to a message (top posting), saying " "that the original message follows." @@ -11160,7 +11174,7 @@ msgstr "" "El texto insertado al responder a un mensaje (publicando por encima), " "atribuyendo el mensaje a su autor original." -#: ../mail/evolution-mail.schemas.in.h:202 +#: ../mail/evolution-mail.schemas.in.h:204 msgid "" "The text that is inserted when replying to a message, attributing the " "message to the original author." @@ -11168,19 +11182,19 @@ msgstr "" "El texto insertado al responder a un mensaje, atribuyendo el mensaje a su " "autor original." -#: ../mail/evolution-mail.schemas.in.h:203 +#: ../mail/evolution-mail.schemas.in.h:205 msgid "The variable width font for mail display." msgstr "La tipografía de anchura variable para mostrar el correo." -#: ../mail/evolution-mail.schemas.in.h:204 +#: ../mail/evolution-mail.schemas.in.h:206 msgid "" "This can have three possible values. \"0\" for errors. \"1\" for warnings. " "\"2\" for debug messages." msgstr "" -"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. " -"«2» para mensajes de depuración." +"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» " +"para mensajes de depuración." -#: ../mail/evolution-mail.schemas.in.h:205 +#: ../mail/evolution-mail.schemas.in.h:207 msgid "" "This decides the max size of the message text that will be displayed under " "Evolution, specified in terms of KB. The default is 4096 (4MB). This value " @@ -11191,7 +11205,7 @@ msgstr "" "(4MiB). Este valor sólo se usa cuando la clave 'force_message_limit' está " "activada." -#: ../mail/evolution-mail.schemas.in.h:206 +#: ../mail/evolution-mail.schemas.in.h:208 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 " @@ -11201,16 +11215,16 @@ msgstr "" "varios complementos activados. Si el complemento predeterminado listado está " "desactivado, entonces no usará los otros complementos disponibles." -#: ../mail/evolution-mail.schemas.in.h:207 +#: ../mail/evolution-mail.schemas.in.h:209 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." msgstr "" -"Esta clave es de una sola lectura y después de leerla se establece a " -"«false». Esto deselecciona el correo en la lista y elimina la vista previa " -"para esa carpeta." +"Esta clave es de una sola lectura y después de leerla se establece a «false». " +"Esto deselecciona el correo en la lista y elimina la vista previa para esa " +"carpeta." -#: ../mail/evolution-mail.schemas.in.h:208 +#: ../mail/evolution-mail.schemas.in.h:210 msgid "" "This key should contain a list of XML structures specifying custom headers, " "and whether they are to be displayed. The format of the XML structure is <" @@ -11222,7 +11236,7 @@ msgstr "" "estructura XML es <header enabled>: poner a activado si la cabecera se " "debe mostrar en la vista de correo." -#: ../mail/evolution-mail.schemas.in.h:209 +#: ../mail/evolution-mail.schemas.in.h:211 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 " @@ -11233,11 +11247,11 @@ msgstr "" "local para excluir de los filtros de correo basura el correo enviado por " "contactos conocidos." -#: ../mail/evolution-mail.schemas.in.h:210 +#: ../mail/evolution-mail.schemas.in.h:212 msgid "This option would help in improving the speed of fetching." msgstr "Esta opción ayudará a mejorar la velocidad de obtención." -#: ../mail/evolution-mail.schemas.in.h:211 +#: ../mail/evolution-mail.schemas.in.h:213 msgid "" "This sets the number of addresses to show in default message list view, " "beyond which a '...' is shown." @@ -11245,7 +11259,7 @@ msgstr "" "Esto establece el número de direcciones a mostrar en la vista de lista de " "mensajes predeterminada, más allá de los cuales se muestra un «…»." -#: ../mail/evolution-mail.schemas.in.h:212 +#: ../mail/evolution-mail.schemas.in.h:214 msgid "" "This setting specifies whether the threads should be in expanded or " "collapsed state by default. Requires a restart to apply." @@ -11254,7 +11268,7 @@ msgstr "" "deberían estar en estado expandido o contraído. Evolution necesita " "reiniciarse para aplicarlo." -#: ../mail/evolution-mail.schemas.in.h:213 +#: ../mail/evolution-mail.schemas.in.h:215 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 " @@ -11264,7 +11278,7 @@ msgstr "" "último mensaje de cada conversación, en lugar de por la fecha del mensaje. " "Evolution necesita un reinicio." -#: ../mail/evolution-mail.schemas.in.h:214 +#: ../mail/evolution-mail.schemas.in.h:216 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 " @@ -11274,37 +11288,37 @@ msgstr "" "Imágenes del sistema, habitualmente ~/Imágenes. También se usará esta " "carpeta cuando la ruta configurada no apunte a la carpeta existente." -#: ../mail/evolution-mail.schemas.in.h:215 +#: ../mail/evolution-mail.schemas.in.h:217 msgid "Thread the message-list based on Subject" msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto" -#: ../mail/evolution-mail.schemas.in.h:216 +#: ../mail/evolution-mail.schemas.in.h:218 msgid "Timeout for marking message as seen" msgstr "Tiempo para marcar un mensaje como visto" -#: ../mail/evolution-mail.schemas.in.h:217 +#: ../mail/evolution-mail.schemas.in.h:219 msgid "Timeout for marking message as seen." msgstr "Tiempo para marcar un mensaje como visto." -#: ../mail/evolution-mail.schemas.in.h:218 +#: ../mail/evolution-mail.schemas.in.h:220 msgid "UID string of the default account." msgstr "Cadena UID para la cuenta predeterminada." -#: ../mail/evolution-mail.schemas.in.h:219 +#: ../mail/evolution-mail.schemas.in.h:221 msgid "Underline color for misspelled words when using inline spelling." msgstr "" "Color de subrayado para las palabras mal escritas cuando se use corrección " "en línea." -#: ../mail/evolution-mail.schemas.in.h:220 +#: ../mail/evolution-mail.schemas.in.h:222 msgid "Use custom fonts" msgstr "Usar tipografía personalizada" -#: ../mail/evolution-mail.schemas.in.h:221 +#: ../mail/evolution-mail.schemas.in.h:223 msgid "Use custom fonts for displaying mail." msgstr "Usar tipografía personalizada para mostrar el correo." -#: ../mail/evolution-mail.schemas.in.h:222 +#: ../mail/evolution-mail.schemas.in.h:224 msgid "" "Users get all up in arms over where the cursor should go when replying to a " "message. This determines whether the cursor is placed at the top of the " @@ -11314,7 +11328,7 @@ msgstr "" "mensaje. Esto determina si el cursor se posiciona en la parte superior del " "mensaje o en la inferior." -#: ../mail/evolution-mail.schemas.in.h:223 +#: ../mail/evolution-mail.schemas.in.h:225 msgid "" "Users get all up in arms over where their signature should go when replying " "to a message. This determines whether the signature is placed at the top of " @@ -11324,28 +11338,28 @@ msgstr "" "mensaje. Esto determina si la firma se ubica en la parte superior del " "mensaje o en la inferior." -#: ../mail/evolution-mail.schemas.in.h:224 +#: ../mail/evolution-mail.schemas.in.h:226 msgid "Variable width font" msgstr "Tipografía de anchura variable" -#: ../mail/evolution-mail.schemas.in.h:225 +#: ../mail/evolution-mail.schemas.in.h:227 msgid "Whether a read receipt request gets added to every message by default." msgstr "" "Indica si se debe añadir una solicitud de lectura de forma predeterminada a " "cada mensaje." -#: ../mail/evolution-mail.schemas.in.h:226 +#: ../mail/evolution-mail.schemas.in.h:228 msgid "" "Whether 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." msgstr "" "Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas " -"activas independientemente del conteo en la opción «Comprobar si hay " -"mensajes nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se " -"usa junto con la opción «send_recv_on_start»." +"activas independientemente del conteo en la opción «Comprobar si hay mensajes " +"nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se usa junto " +"con la opción «send_recv_on_start»." -#: ../mail/evolution-mail.schemas.in.h:227 +#: ../mail/evolution-mail.schemas.in.h:229 msgid "" "Whether check for new messages when Evolution is started. This includes also " "sending messages from Outbox." @@ -11353,13 +11367,13 @@ 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." -#: ../mail/evolution-mail.schemas.in.h:228 +#: ../mail/evolution-mail.schemas.in.h:230 msgid "Whether disable ellipsizing feature of folder names in side bar." msgstr "" "Indica si se debe desactivar la característica de elipsis de los nombres de " "las carpetas en la barra lateral." -#: ../mail/evolution-mail.schemas.in.h:229 +#: ../mail/evolution-mail.schemas.in.h:231 msgid "" "Whether or not to fall back on threading by subjects when the messages do " "not contain In-Reply-To or References headers." @@ -11367,13 +11381,13 @@ 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»." -#: ../mail/evolution-mail.schemas.in.h:230 +#: ../mail/evolution-mail.schemas.in.h:232 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" -#: ../mail/evolution-mail.schemas.in.h:231 +#: ../mail/evolution-mail.schemas.in.h:233 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 " @@ -11384,17 +11398,17 @@ msgstr "" "algún filtro de acción «Reenviar a» y, aproximadamente, un minuto después de " "la última invocación a una acción." -#: ../mail/evolution-mail.schemas.in.h:232 +#: ../mail/evolution-mail.schemas.in.h:234 msgid "Whether to show local folders (On This Computer) in a folder tree." msgstr "" "Indica si se deben mostrar las carpetas locales (En este equipo) en un árbol " "de carpetas." -#: ../mail/evolution-mail.schemas.in.h:233 +#: ../mail/evolution-mail.schemas.in.h:235 msgid "Width of the message-list pane" msgstr "Anchura del panel de lista de mensajes" -#: ../mail/evolution-mail.schemas.in.h:234 +#: ../mail/evolution-mail.schemas.in.h:236 msgid "Width of the message-list pane." msgstr "Anchura del panel de lista de mensajes." @@ -11676,366 +11690,370 @@ msgid "Delete junk messages on e_xit" msgstr "Eliminar los mensajes SPAM al _salir" #: ../mail/mail-config.ui.h:39 +msgid "Digitally _sign messages when original message signed (PGP or S/MIME)" +msgstr "" +"_Firmar mensajes digitalmente cuando el mensaje original esté firmado (PGP o " +"S/MIME)" + +#: ../mail/mail-config.ui.h:40 msgid "Digitally sign o_utgoing messages (by default)" msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)" -#: ../mail/mail-config.ui.h:40 +#: ../mail/mail-config.ui.h:41 msgid "Displayed Message Headers" msgstr "Cabeceras mostradas del mensaje" -#: ../mail/mail-config.ui.h:41 +#: ../mail/mail-config.ui.h:42 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" -#: ../mail/mail-config.ui.h:42 +#: ../mail/mail-config.ui.h:43 msgid "Do not quote" msgstr "No entrecomillar" -#: ../mail/mail-config.ui.h:43 +#: ../mail/mail-config.ui.h:44 msgid "Drafts _Folder:" msgstr "Carpeta de _borradores:" -#: ../mail/mail-config.ui.h:44 +#: ../mail/mail-config.ui.h:45 msgid "Email _Address:" msgstr "Dir_ección de correo-e:" -#: ../mail/mail-config.ui.h:46 +#: ../mail/mail-config.ui.h:47 msgid "Empty trash folders on e_xit" msgstr "Vaciar _papelera al salir" -#: ../mail/mail-config.ui.h:48 +#: ../mail/mail-config.ui.h:49 msgid "Encry_ption certificate:" msgstr "Certificado de ci_frado:" -#: ../mail/mail-config.ui.h:49 +#: ../mail/mail-config.ui.h:50 msgid "Encrypt out_going messages (by default)" msgstr "Cifrar mensajes _salientes (por omisión)" -#: ../mail/mail-config.ui.h:50 -#| msgid "Encryption" +#: ../mail/mail-config.ui.h:51 msgid "Encryption:" msgstr "Cifrado:" -#: ../mail/mail-config.ui.h:51 +#: ../mail/mail-config.ui.h:52 msgid "F_all back to threading messages by subject" msgstr "Agrupar los mensajes por _asunto" -#: ../mail/mail-config.ui.h:52 +#: ../mail/mail-config.ui.h:53 msgid "Fix_ed Width Font:" msgstr "Tipografía de anchura _fija:" -#: ../mail/mail-config.ui.h:53 +#: ../mail/mail-config.ui.h:54 msgid "Format messages in _HTML" msgstr "Dar formato _HTML a los mensajes" -#: ../mail/mail-config.ui.h:54 +#: ../mail/mail-config.ui.h:55 msgid "Full Nam_e:" msgstr "Nombre co_mpleto:" -#: ../mail/mail-config.ui.h:56 +#: ../mail/mail-config.ui.h:57 msgid "Group Reply goes only to mailing list, if possible" msgstr "Responder al grupo sólo envía a la lista de correo, si es posible" -#: ../mail/mail-config.ui.h:57 +#: ../mail/mail-config.ui.h:58 msgid "HTML Messages" msgstr "Mensajes HTML" -#: ../mail/mail-config.ui.h:58 +#: ../mail/mail-config.ui.h:59 msgid "H_TTP Proxy:" msgstr "Proxy H_TTP:" -#: ../mail/mail-config.ui.h:59 +#: ../mail/mail-config.ui.h:60 msgid "Header content" msgstr "Contenido de la cabecera" -#: ../mail/mail-config.ui.h:60 +#: ../mail/mail-config.ui.h:61 msgid "Header name" msgstr "Nombre de la cabecera" -#: ../mail/mail-config.ui.h:61 +#: ../mail/mail-config.ui.h:62 msgid "Headers" msgstr "Cabeceras" # Esta cadena debe permanecer así -#: ../mail/mail-config.ui.h:62 +#: ../mail/mail-config.ui.h:63 msgid "Highlight _quotations with" msgstr "Resaltar texto _citado con este color:" -#: ../mail/mail-config.ui.h:63 +#: ../mail/mail-config.ui.h:64 msgid "Ignore Reply-To: for mailing lists" msgstr "Ignorar «Responder a:» para listas de correo" -#: ../mail/mail-config.ui.h:64 +#: ../mail/mail-config.ui.h:65 msgid "Inline" msgstr "En línea" -#: ../mail/mail-config.ui.h:65 +#: ../mail/mail-config.ui.h:66 msgid "Inline (Outlook style)" msgstr "En línea (estilo Outlook)" -#: ../mail/mail-config.ui.h:67 ../mail/message-list.etspec.h:8 +#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8 msgid "Labels" msgstr "Etiquetas" -#: ../mail/mail-config.ui.h:68 +#: ../mail/mail-config.ui.h:69 msgid "Languages Table" msgstr "Tabla de idiomas" -#: ../mail/mail-config.ui.h:69 +#: ../mail/mail-config.ui.h:70 msgid "Loading Images" msgstr "Cargando imágenes" -#: ../mail/mail-config.ui.h:70 +#: ../mail/mail-config.ui.h:71 msgid "Mail Headers Table" msgstr "Tabla de cabeceras de correo" -#: ../mail/mail-config.ui.h:71 +#: ../mail/mail-config.ui.h:72 msgid "Mailbox location" msgstr "Dirección del buzón" -#: ../mail/mail-config.ui.h:72 +#: ../mail/mail-config.ui.h:73 msgid "Message Display" msgstr "Mostrado de mensajes" -#: ../mail/mail-config.ui.h:73 +#: ../mail/mail-config.ui.h:74 msgid "Message Receipts" msgstr "Destinatarios del mensaje" -#: ../mail/mail-config.ui.h:75 +#: ../mail/mail-config.ui.h:76 msgid "No _Proxy for:" msgstr "Sin _proxy para:" -#: ../mail/mail-config.ui.h:76 ../modules/addressbook/ldap-config.ui.h:9 +#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9 msgid "No encryption" msgstr "Sin cifrado" -#: ../mail/mail-config.ui.h:77 +#: ../mail/mail-config.ui.h:78 msgid "Option is ignored if a match for custom junk headers is found." msgstr "" "Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera " "de SPAM personalizada." -#: ../mail/mail-config.ui.h:78 +#: ../mail/mail-config.ui.h:79 #: ../plugins/publish-calendar/publish-calendar.ui.h:10 msgid "Optional Information" msgstr "Información opcional" -#: ../mail/mail-config.ui.h:80 +#: ../mail/mail-config.ui.h:81 msgid "Or_ganization:" msgstr "Organi_zación:" -#: ../mail/mail-config.ui.h:81 +#: ../mail/mail-config.ui.h:82 msgid "PGP/GPG _Key ID:" msgstr "ID de c_lave GPG/PGP:" -#: ../mail/mail-config.ui.h:82 +#: ../mail/mail-config.ui.h:83 msgid "Pass_word:" msgstr "_Contraseña:" -#: ../mail/mail-config.ui.h:83 -#| msgid "Personal details:" +#: ../mail/mail-config.ui.h:84 msgid "Personal Details:" msgstr "Detalles personales:" -#: ../mail/mail-config.ui.h:84 +#: ../mail/mail-config.ui.h:85 #: ../modules/calendar/e-calendar-preferences.ui.h:21 msgid "Pick a color" msgstr "Elija un color" -#: ../mail/mail-config.ui.h:85 +#: ../mail/mail-config.ui.h:86 msgid "Port:" msgstr "Puerto:" -#: ../mail/mail-config.ui.h:86 +#: ../mail/mail-config.ui.h:87 msgid "Pretty Good Privacy (PGP/GPG)" msgstr "Pretty Good Privacy (PGP/GPG)" -#: ../mail/mail-config.ui.h:88 +#: ../mail/mail-config.ui.h:89 msgid "Proxy Settings" msgstr "Ajustes del proxy" -#: ../mail/mail-config.ui.h:89 +#: ../mail/mail-config.ui.h:90 msgid "Quoted" msgstr "Citado" -#: ../mail/mail-config.ui.h:90 +#: ../mail/mail-config.ui.h:91 msgid "Re_member password" msgstr "_Recordar contraseña" -#: ../mail/mail-config.ui.h:91 +#: ../mail/mail-config.ui.h:92 msgid "Re_ply-To:" msgstr "Res_ponder a:" -#: ../mail/mail-config.ui.h:93 +#: ../mail/mail-config.ui.h:94 msgid "Remember _password" msgstr "Recordar contrase_ña" -#: ../mail/mail-config.ui.h:94 +#: ../mail/mail-config.ui.h:95 msgid "Replies and Forwards" msgstr "Respuestas y reenvíos" -#: ../mail/mail-config.ui.h:95 +#: ../mail/mail-config.ui.h:96 msgid "Required Information" msgstr "Información requerida" -#: ../mail/mail-config.ui.h:96 +#: ../mail/mail-config.ui.h:97 msgid "SHA1" msgstr "SHA1" -#: ../mail/mail-config.ui.h:97 +#: ../mail/mail-config.ui.h:98 msgid "SHA256" msgstr "SHA256" -#: ../mail/mail-config.ui.h:98 +#: ../mail/mail-config.ui.h:99 msgid "SHA384" msgstr "SHA384" -#: ../mail/mail-config.ui.h:99 +#: ../mail/mail-config.ui.h:100 msgid "SHA512" msgstr "SHA512" -#: ../mail/mail-config.ui.h:100 +#: ../mail/mail-config.ui.h:101 msgid "SOC_KS Proxy:" msgstr "Proxy SOC_KS:" -#: ../mail/mail-config.ui.h:101 ../modules/addressbook/ldap-config.ui.h:12 +#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12 msgid "SSL encryption" msgstr "Cifrado SSL" -#: ../mail/mail-config.ui.h:102 +#: ../mail/mail-config.ui.h:103 msgid "SSL is not supported in this build of Evolution" msgstr "Esta compilación de Evolution no soporta SSL" -#: ../mail/mail-config.ui.h:103 +#: ../mail/mail-config.ui.h:104 msgid "S_earch for sender photograph only in local address books" msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales" -#: ../mail/mail-config.ui.h:104 +#: ../mail/mail-config.ui.h:105 msgid "S_elect..." msgstr "S_eleccionar…" -#: ../mail/mail-config.ui.h:105 +#: ../mail/mail-config.ui.h:106 msgid "S_end message receipts:" msgstr "_Enviar confirmaciones de mensajes:" -#: ../mail/mail-config.ui.h:106 +#: ../mail/mail-config.ui.h:107 msgid "S_tandard Font:" msgstr "Tipografía _estándar:" -#: ../mail/mail-config.ui.h:107 +#: ../mail/mail-config.ui.h:108 msgid "Secure MIME (S/MIME)" msgstr "MIME seguro (S/MIME)" -#: ../mail/mail-config.ui.h:109 +#: ../mail/mail-config.ui.h:110 msgid "Select HTML fixed width font" msgstr "Selecciona letra de anchura fija para HTML" -#: ../mail/mail-config.ui.h:110 +#: ../mail/mail-config.ui.h:111 msgid "Select HTML variable width font" msgstr "Selecciona letra de anchura variable en HTML" -#: ../mail/mail-config.ui.h:111 +#: ../mail/mail-config.ui.h:112 msgid "Sender Photograph" msgstr "Foto del remitente" #. This is in the context of: Ask for confirmation before... -#: ../mail/mail-config.ui.h:114 +#: ../mail/mail-config.ui.h:115 msgid "Sending a _private reply to a mailing list message" msgstr "Enviando una respuesta priva_da a una lista de correo" #. This is in the context of: Ask for confirmation before... -#: ../mail/mail-config.ui.h:116 +#: ../mail/mail-config.ui.h:117 msgid "Sending a message with _recipients not entered as mail addresses" msgstr "" "Enviando un mensaje con destinata_rios no introducidos como direcciones de " "correo" #. This is in the context of: Ask for confirmation before... -#: ../mail/mail-config.ui.h:118 +#: ../mail/mail-config.ui.h:119 msgid "Sending a message with an _empty subject line" msgstr "Enviando un correo con una línea de asunto _vacía" #. This is in the context of: Ask for confirmation before... -#: ../mail/mail-config.ui.h:120 +#: ../mail/mail-config.ui.h:121 msgid "Sending a message with only _Bcc recipients defined" msgstr "Enviando la respuesta sólo a los destinatarios definidos en _Cco" #. This is in the context of: Ask for confirmation before... -#: ../mail/mail-config.ui.h:122 +#: ../mail/mail-config.ui.h:123 msgid "Sending a reply to a large _number of recipients" msgstr "Enviando la respuesta a un gran _número de destinatarios" -#: ../mail/mail-config.ui.h:123 +#: ../mail/mail-config.ui.h:124 msgid "Sent _Messages Folder:" msgstr "Carpeta de _mensajes enviados:" -#: ../mail/mail-config.ui.h:124 +#: ../mail/mail-config.ui.h:125 msgid "Ser_ver requires authentication" msgstr "El ser_vidor requiere autenticación" -#: ../mail/mail-config.ui.h:125 +#: ../mail/mail-config.ui.h:126 msgid "Server Configuration" msgstr "Configuración del servidor" -#: ../mail/mail-config.ui.h:126 +#: ../mail/mail-config.ui.h:127 msgid "Server _Type:" msgstr "_Tipo de servidor:" -#: ../mail/mail-config.ui.h:129 +#: ../mail/mail-config.ui.h:130 msgid "Set custom junk header" msgstr "Establecer cabecera de SPAM personalizada" -#: ../mail/mail-config.ui.h:130 +#: ../mail/mail-config.ui.h:131 msgid "Si_gning algorithm:" msgstr "Algoritmo de _firma:" -#: ../mail/mail-config.ui.h:131 +#: ../mail/mail-config.ui.h:132 msgid "Sig_natures" msgstr "_Firmas" -#: ../mail/mail-config.ui.h:132 +#: ../mail/mail-config.ui.h:133 msgid "Sig_ning certificate:" msgstr "Certificado de _firma:" -#: ../mail/mail-config.ui.h:133 +#: ../mail/mail-config.ui.h:134 msgid "Signat_ure:" msgstr "_Firma:" -#: ../mail/mail-config.ui.h:134 +#: ../mail/mail-config.ui.h:135 msgid "Signatures" msgstr "Firmas" -#: ../mail/mail-config.ui.h:135 +#: ../mail/mail-config.ui.h:136 msgid "Signing _algorithm:" msgstr "_Algoritmo de firma:" -#: ../mail/mail-config.ui.h:136 +#: ../mail/mail-config.ui.h:137 msgid "Special Folders" msgstr "Carpetas especiales" -#: ../mail/mail-config.ui.h:137 +#: ../mail/mail-config.ui.h:138 msgid "Spell Checking" msgstr "Ortografía" -#: ../mail/mail-config.ui.h:138 +#: ../mail/mail-config.ui.h:139 msgid "Start _typing at the bottom on replying" msgstr "Comenzar a _escribir en la parte final al responder" -#: ../mail/mail-config.ui.h:139 +#: ../mail/mail-config.ui.h:140 msgid "Start up" msgstr "Inicio" -#: ../mail/mail-config.ui.h:140 ../modules/addressbook/ldap-config.ui.h:21 +#: ../mail/mail-config.ui.h:141 ../modules/addressbook/ldap-config.ui.h:21 msgid "TLS encryption" msgstr "Cifrado TLS" -#: ../mail/mail-config.ui.h:141 +#: ../mail/mail-config.ui.h:142 msgid "T_ype:" msgstr "T_ipo:" -#: ../mail/mail-config.ui.h:142 +#: ../mail/mail-config.ui.h:143 msgid "" "The list of languages here reflects only the languages for which you have a " "dictionary installed." @@ -12043,7 +12061,7 @@ msgstr "" "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles " "hay instalado un diccionario." -#: ../mail/mail-config.ui.h:143 +#: ../mail/mail-config.ui.h:144 msgid "" "The output of this script will be used as your\n" "signature. The name you specify will be used\n" @@ -12053,7 +12071,7 @@ msgstr "" "El nombre que especifique se usará únicamente \n" "para mostrarlo por pantalla. " -#: ../mail/mail-config.ui.h:146 +#: ../mail/mail-config.ui.h:147 msgid "" "To help avoid email accidents and embarrassments, ask for confirmation " "before taking the following checkmarked actions:" @@ -12061,7 +12079,7 @@ msgstr "" "Para evitar accidentes y situaciones embarazosas con el correo-e, pedir " "confirmación antes de realizar las siguientes acciones marcadas:" -#: ../mail/mail-config.ui.h:147 +#: ../mail/mail-config.ui.h:148 msgid "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" @@ -12069,149 +12087,147 @@ msgstr "" "Teclee el nombre por el que quiere identificar a esta cuenta.\n" "Por ejemplo: «Trabajo» o «Personal»" -#: ../mail/mail-config.ui.h:149 +#: ../mail/mail-config.ui.h:150 msgid "Us_ername:" msgstr "_Usuario:" -#: ../mail/mail-config.ui.h:150 +#: ../mail/mail-config.ui.h:151 msgid "Use Authe_ntication" msgstr "Usar aute_nticación" -#: ../mail/mail-config.ui.h:151 +#: ../mail/mail-config.ui.h:152 msgid "User _Name:" msgstr "_Nombre de usuario:" -#: ../mail/mail-config.ui.h:153 +#: ../mail/mail-config.ui.h:154 msgid "_Add Signature" msgstr "_Añadir firma" -#: ../mail/mail-config.ui.h:154 +#: ../mail/mail-config.ui.h:155 msgid "_Always load images from the Internet" msgstr "_Siempre cargar las imágenes desde Internet" -#: ../mail/mail-config.ui.h:155 +#: ../mail/mail-config.ui.h:156 msgid "_Authentication Type" msgstr "Tipo de _autenticación" -#: ../mail/mail-config.ui.h:156 +#: ../mail/mail-config.ui.h:157 msgid "_Direct connection to the Internet" msgstr "Conexión _directa a Internet" -#: ../mail/mail-config.ui.h:157 +#: ../mail/mail-config.ui.h:158 msgid "_Do not sign meeting requests (for Outlook compatibility)" msgstr "" "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)" -#: ../mail/mail-config.ui.h:158 +#: ../mail/mail-config.ui.h:159 msgid "_Forward style:" msgstr "_Estilo de reenvío:" -#: ../mail/mail-config.ui.h:159 +#: ../mail/mail-config.ui.h:160 msgid "_Junk Folder:" msgstr "Carpeta de _SPAM:" -#: ../mail/mail-config.ui.h:160 +#: ../mail/mail-config.ui.h:161 msgid "_Keep signature above the original message on replying" msgstr "_Mantener la firma por encima del mensaje original al responder" -#: ../mail/mail-config.ui.h:161 +#: ../mail/mail-config.ui.h:162 msgid "_Languages" msgstr "_Idiomas" -#: ../mail/mail-config.ui.h:162 +#: ../mail/mail-config.ui.h:163 msgid "_Load images only in messages from contacts" msgstr "Cargar i_mágenes en los mensajes de mis contactos" -#: ../mail/mail-config.ui.h:163 +#: ../mail/mail-config.ui.h:164 msgid "_Lookup in local address book only" msgstr "_Buscar sólo en la libreta de direcciones local" -#: ../mail/mail-config.ui.h:164 +#: ../mail/mail-config.ui.h:165 msgid "_Make this my default account" msgstr "_Hacer que ésta sea mi cuenta predeterminada" -#: ../mail/mail-config.ui.h:165 +#: ../mail/mail-config.ui.h:166 msgid "_Manual proxy configuration:" msgstr "Configuración _manual del proxy:" -#: ../mail/mail-config.ui.h:167 +#: ../mail/mail-config.ui.h:168 msgid "_Never load images from the Internet" msgstr "_Nunca cargar imágenes desde Internet" -#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29 +#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29 msgid "_Port:" msgstr "_Puerto:" -#: ../mail/mail-config.ui.h:170 +#: ../mail/mail-config.ui.h:171 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" -#: ../mail/mail-config.ui.h:171 +#: ../mail/mail-config.ui.h:172 msgid "_Reply style:" msgstr "Estilo de _respuesta:" -#: ../mail/mail-config.ui.h:172 +#: ../mail/mail-config.ui.h:173 msgid "_Script:" msgstr "_Script:" -#: ../mail/mail-config.ui.h:173 +#: ../mail/mail-config.ui.h:174 msgid "_Secure HTTP Proxy:" msgstr "Proxy HTTP _seguro:" -#: ../mail/mail-config.ui.h:175 +#: ../mail/mail-config.ui.h:176 #: ../plugins/publish-calendar/publish-calendar.ui.h:28 msgid "_Server:" msgstr "_Servidor:" #. If enabled, show animation; if disabled, only display a static image without any animation -#: ../mail/mail-config.ui.h:177 +#: ../mail/mail-config.ui.h:178 msgid "_Show animated images" msgstr "_Mostrar las imágenes animadas" -#: ../mail/mail-config.ui.h:178 +#: ../mail/mail-config.ui.h:179 msgid "_Show the photograph of sender in the message preview" msgstr "_Mostrar la foto del remitente en la vista previa del mensaje" -#: ../mail/mail-config.ui.h:179 +#: ../mail/mail-config.ui.h:180 msgid "_Trash Folder:" msgstr "Carpeta de p_apelera:" -#: ../mail/mail-config.ui.h:180 +#: ../mail/mail-config.ui.h:181 msgid "_Use secure connection:" msgstr "Usar _conexión segura:" -#: ../mail/mail-config.ui.h:181 +#: ../mail/mail-config.ui.h:182 msgid "_Use system defaults" msgstr "_Usar los valores predeterminados del sistema" -#: ../mail/mail-config.ui.h:182 +#: ../mail/mail-config.ui.h:183 msgid "_Use the same fonts as other applications" msgstr "_Usar las mismas tipografías que en otras aplicaciones" -#: ../mail/mail-config.ui.h:183 ../smime/gui/smime-ui.ui.h:48 +#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48 msgid "a" msgstr "am" -#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:49 +#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49 msgid "b" msgstr "por" # Esta traducción debe mantenerse así -#: ../mail/mail-config.ui.h:185 +#: ../mail/mail-config.ui.h:186 msgid "color" msgstr "color" -#: ../mail/mail-config.ui.h:186 +#: ../mail/mail-config.ui.h:187 msgid "description" msgstr "descripción" -#: ../mail/mail-config.ui.h:187 -#| msgid "Label" +#: ../mail/mail-config.ui.h:188 msgid "label" msgstr "etiqueta" -#: ../mail/mail-config.ui.h:188 -#| msgid "None" +#: ../mail/mail-config.ui.h:189 msgid "none" msgstr "ninguna" @@ -12510,8 +12526,8 @@ msgid "" "A read receipt notification has been requested for \"{1}\". Send the receipt " "notification to {0}?" msgstr "" -"Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar " -"una notificación de recepción a {0}?" +"Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar una " +"notificación de recepción a {0}?" #: ../mail/mail.error.xml.h:10 msgid "" @@ -13206,7 +13222,7 @@ msgid "_Discard changes" msgstr "_Descartar los cambios" #: ../mail/mail.error.xml.h:160 -#: ../modules/mail/e-mail-shell-view-actions.c:1116 +#: ../modules/mail/e-mail-shell-view-actions.c:1118 msgid "_Empty Trash" msgstr "_Vaciar papelera" @@ -13376,27 +13392,27 @@ msgid "Subject - Trimmed" msgstr "Asunto recortado" #: ../mail/searchtypes.xml.h:1 -#: ../modules/mail/e-mail-shell-view-actions.c:1556 +#: ../modules/mail/e-mail-shell-view-actions.c:1558 msgid "Body contains" msgstr "El cuerpo contiene" #: ../mail/searchtypes.xml.h:2 -#: ../modules/mail/e-mail-shell-view-actions.c:1563 +#: ../modules/mail/e-mail-shell-view-actions.c:1565 msgid "Message contains" msgstr "El mensaje contiene" #: ../mail/searchtypes.xml.h:3 -#: ../modules/mail/e-mail-shell-view-actions.c:1570 +#: ../modules/mail/e-mail-shell-view-actions.c:1572 msgid "Recipients contain" msgstr "El destinatario contiene" #: ../mail/searchtypes.xml.h:4 -#: ../modules/mail/e-mail-shell-view-actions.c:1577 +#: ../modules/mail/e-mail-shell-view-actions.c:1579 msgid "Sender contains" msgstr "El remitente contiene" #: ../mail/searchtypes.xml.h:5 -#: ../modules/mail/e-mail-shell-view-actions.c:1584 +#: ../modules/mail/e-mail-shell-view-actions.c:1586 msgid "Subject contains" msgstr "El asunto contiene" @@ -13743,7 +13759,7 @@ msgstr "" #: ../modules/calendar/e-cal-shell-view-actions.c:1405 #: ../modules/calendar/e-memo-shell-view-actions.c:640 #: ../modules/calendar/e-task-shell-view-actions.c:764 -#: ../modules/mail/e-mail-shell-view-actions.c:1193 +#: ../modules/mail/e-mail-shell-view-actions.c:1195 msgid "_Rename..." msgstr "_Renombrar…" @@ -13824,7 +13840,7 @@ msgstr "A_cciones" #: ../modules/addressbook/e-book-shell-view-actions.c:940 #: ../modules/calendar/e-memo-shell-view-actions.c:677 #: ../modules/calendar/e-task-shell-view-actions.c:829 -#: ../modules/mail/e-mail-shell-view-actions.c:1351 +#: ../modules/mail/e-mail-shell-view-actions.c:1353 msgid "_Preview" msgstr "Vista _previa" @@ -13862,7 +13878,7 @@ msgstr "Mostrar mapas en la ventana de vista previa de contactos" #: ../modules/addressbook/e-book-shell-view-actions.c:1018 #: ../modules/calendar/e-memo-shell-view-actions.c:747 #: ../modules/calendar/e-task-shell-view-actions.c:911 -#: ../modules/mail/e-mail-shell-view-actions.c:1466 +#: ../modules/mail/e-mail-shell-view-actions.c:1468 msgid "_Classic View" msgstr "Vista _clásica" @@ -13873,7 +13889,7 @@ msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes" #: ../modules/addressbook/e-book-shell-view-actions.c:1025 #: ../modules/calendar/e-memo-shell-view-actions.c:754 #: ../modules/calendar/e-task-shell-view-actions.c:918 -#: ../modules/mail/e-mail-shell-view-actions.c:1473 +#: ../modules/mail/e-mail-shell-view-actions.c:1475 msgid "_Vertical View" msgstr "Vista _vertical" @@ -13899,7 +13915,7 @@ msgstr "No coincidente" #: ../modules/calendar/e-cal-shell-view-actions.c:1727 #: ../modules/calendar/e-memo-shell-view-actions.c:781 #: ../modules/calendar/e-task-shell-view-actions.c:980 -#: ../modules/mail/e-mail-shell-view-actions.c:1549 +#: ../modules/mail/e-mail-shell-view-actions.c:1551 #: ../shell/e-shell-content.c:664 msgid "Advanced Search" msgstr "Búsqueda avanzada" @@ -14634,8 +14650,7 @@ msgstr "" #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67 msgid "Show Role field in the event/task/meeting editor" -msgstr "" -"Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones" +msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones" #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68 msgid "Show appointment end times in week and month views" @@ -14725,8 +14740,8 @@ msgid "" "The UID of the selected (or \"primary\") memo list in the sidebar of the " "\"Memos\" view." msgstr "" -"El UID de la nota seleccionada (o «primaria») en la barra lateral de la " -"vista de «Notas»." +"El UID de la nota seleccionada (o «primaria») en la barra lateral de la vista " +"de «Notas»." #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85 msgid "" @@ -14763,8 +14778,8 @@ msgid "" msgstr "" "El estilo de la distribución determina dónde ubicar el panel de vista previa " "en relación con la lista de notas. «0» (vista clásica) ubica el panel de " -"vista previa debajo de la lista de notas. «1» (vista vertical) ubica el " -"panel de vista previa junto a la lista de notas." +"vista previa debajo de la lista de notas. «1» (vista vertical) ubica el panel " +"de vista previa junto a la lista de notas." #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90 msgid "" @@ -14786,8 +14801,8 @@ msgid "" "This can have three possible values. 0 for errors. 1 for warnings. 2 for " "debug messages." msgstr "" -"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. " -"«2» para mensajes de depuración." +"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» " +"para mensajes de depuración." #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93 msgid "Time divisions" @@ -14810,8 +14825,8 @@ msgid "" "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or " "\"days\"." msgstr "" -"Unidades para el recordatorio de cumpleaños o aniversarios, «minutes», " -"«hours» o «days»." +"Unidades para el recordatorio de cumpleaños o aniversarios, «minutes», «hours» " +"o «days»." #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"." @@ -14940,8 +14955,8 @@ msgstr "" #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121 msgid "Whether to show type field in the event/task/meeting editor" msgstr "" -"Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/" -"tareas/reuniones" +"Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/tareas/" +"reuniones" #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122 msgid "Whether to show week numbers in various places in the Calendar." @@ -15810,300 +15825,300 @@ msgstr "Preferencias del editor" msgid "Network Preferences" msgstr "Preferencias de red" -#: ../modules/mail/e-mail-shell-view-actions.c:1109 +#: ../modules/mail/e-mail-shell-view-actions.c:1111 #: ../modules/mail/e-mail-shell-view.c:960 msgid "_Disable Account" msgstr "_Desactivar cuenta" -#: ../modules/mail/e-mail-shell-view-actions.c:1111 +#: ../modules/mail/e-mail-shell-view-actions.c:1113 msgid "Disable this account" msgstr "Desactivar esta cuenta" -#: ../modules/mail/e-mail-shell-view-actions.c:1118 +#: ../modules/mail/e-mail-shell-view-actions.c:1120 msgid "Permanently remove all the deleted messages from all folders" msgstr "" "Eliminar permanentemente todos los correos borrados de todas las carpetas" -#: ../modules/mail/e-mail-shell-view-actions.c:1123 +#: ../modules/mail/e-mail-shell-view-actions.c:1125 msgid "_Download Messages for Offline Usage" msgstr "_Descargar correos para trabajar sin conexión" -#: ../modules/mail/e-mail-shell-view-actions.c:1125 +#: ../modules/mail/e-mail-shell-view-actions.c:1127 msgid "Download messages of accounts and folders marked for offline usage" msgstr "" "Descargar correos para las cuentas y carpetas marcadas para usar sin conexión" -#: ../modules/mail/e-mail-shell-view-actions.c:1130 +#: ../modules/mail/e-mail-shell-view-actions.c:1132 msgid "Fl_ush Outbox" msgstr "Enviar correos pe_ndientes" -#: ../modules/mail/e-mail-shell-view-actions.c:1137 +#: ../modules/mail/e-mail-shell-view-actions.c:1139 msgid "_Copy Folder To..." msgstr "_Copiar carpeta a…" -#: ../modules/mail/e-mail-shell-view-actions.c:1139 +#: ../modules/mail/e-mail-shell-view-actions.c:1141 msgid "Copy the selected folder into another folder" msgstr "Copia la carpeta seleccionada en otra carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1146 +#: ../modules/mail/e-mail-shell-view-actions.c:1148 msgid "Permanently remove this folder" msgstr "Elimina permanentemente esta carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1151 +#: ../modules/mail/e-mail-shell-view-actions.c:1153 msgid "E_xpunge" msgstr "_Purgar" -#: ../modules/mail/e-mail-shell-view-actions.c:1153 +#: ../modules/mail/e-mail-shell-view-actions.c:1155 msgid "Permanently remove all deleted messages from this folder" msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1158 +#: ../modules/mail/e-mail-shell-view-actions.c:1160 msgid "Mar_k All Messages as Read" msgstr "Marcar todos los mensajes como _leídos" -#: ../modules/mail/e-mail-shell-view-actions.c:1160 +#: ../modules/mail/e-mail-shell-view-actions.c:1162 msgid "Mark all messages in the folder as read" msgstr "Marcar todos los mensajes en la carpeta como leídos" -#: ../modules/mail/e-mail-shell-view-actions.c:1165 +#: ../modules/mail/e-mail-shell-view-actions.c:1167 msgid "_Move Folder To..." msgstr "_Mover carpeta a…" -#: ../modules/mail/e-mail-shell-view-actions.c:1167 +#: ../modules/mail/e-mail-shell-view-actions.c:1169 msgid "Move the selected folder into another folder" msgstr "Mueve la carpeta seleccionada a otra carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1172 +#: ../modules/mail/e-mail-shell-view-actions.c:1174 msgid "_New..." msgstr "_Nueva…" -#: ../modules/mail/e-mail-shell-view-actions.c:1174 +#: ../modules/mail/e-mail-shell-view-actions.c:1176 msgid "Create a new folder for storing mail" msgstr "Crea una carpeta nueva para almacenar correo" -#: ../modules/mail/e-mail-shell-view-actions.c:1181 +#: ../modules/mail/e-mail-shell-view-actions.c:1183 msgid "Change the properties of this folder" msgstr "Cambia las propiedades de esta carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1188 +#: ../modules/mail/e-mail-shell-view-actions.c:1190 msgid "Refresh the folder" msgstr "Actualizar la carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1195 +#: ../modules/mail/e-mail-shell-view-actions.c:1197 msgid "Change the name of this folder" msgstr "Cambia el nombre de esta carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1200 +#: ../modules/mail/e-mail-shell-view-actions.c:1202 msgid "Select Message _Thread" msgstr "Seleccionar con_versación del mensaje" -#: ../modules/mail/e-mail-shell-view-actions.c:1202 +#: ../modules/mail/e-mail-shell-view-actions.c:1204 msgid "Select all messages in the same thread as the selected message" msgstr "" "Selecciona todos los correos en la misma conversación que el correo " "seleccionado" -#: ../modules/mail/e-mail-shell-view-actions.c:1207 +#: ../modules/mail/e-mail-shell-view-actions.c:1209 msgid "Select Message S_ubthread" msgstr "Seleccionar s_ubconversación del mensaje" -#: ../modules/mail/e-mail-shell-view-actions.c:1209 +#: ../modules/mail/e-mail-shell-view-actions.c:1211 msgid "Select all replies to the currently selected message" msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado" -#: ../modules/mail/e-mail-shell-view-actions.c:1221 +#: ../modules/mail/e-mail-shell-view-actions.c:1223 msgid "Empty _Trash" msgstr "_Vaciar papelera" -#: ../modules/mail/e-mail-shell-view-actions.c:1223 +#: ../modules/mail/e-mail-shell-view-actions.c:1225 msgid "Permanently remove all the deleted messages from all accounts" msgstr "" "Eliminar permanentemente todos los correos borrados de todas las cuentas" -#: ../modules/mail/e-mail-shell-view-actions.c:1228 +#: ../modules/mail/e-mail-shell-view-actions.c:1230 msgid "_New Label" msgstr "Etiqueta n_ueva" -#: ../modules/mail/e-mail-shell-view-actions.c:1237 +#: ../modules/mail/e-mail-shell-view-actions.c:1239 msgid "N_one" msgstr "Ning_uno" -#: ../modules/mail/e-mail-shell-view-actions.c:1251 +#: ../modules/mail/e-mail-shell-view-actions.c:1253 msgid "_Manage Subscriptions" msgstr "Gestionar _suscripciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1253 -#: ../modules/mail/e-mail-shell-view-actions.c:1330 +#: ../modules/mail/e-mail-shell-view-actions.c:1255 +#: ../modules/mail/e-mail-shell-view-actions.c:1332 msgid "Subscribe or unsubscribe to folders on remote servers" msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos" -#: ../modules/mail/e-mail-shell-view-actions.c:1258 -#: ../modules/mail/e-mail-shell-view-actions.c:1279 +#: ../modules/mail/e-mail-shell-view-actions.c:1260 +#: ../modules/mail/e-mail-shell-view-actions.c:1281 msgid "Send / _Receive" msgstr "Enviar / Reci_bir" -#: ../modules/mail/e-mail-shell-view-actions.c:1260 +#: ../modules/mail/e-mail-shell-view-actions.c:1262 msgid "Send queued items and retrieve new items" msgstr "Envía el correo en la cola y obtiene el nuevo" -#: ../modules/mail/e-mail-shell-view-actions.c:1265 +#: ../modules/mail/e-mail-shell-view-actions.c:1267 msgid "R_eceive All" msgstr "R_ecibir todo" -#: ../modules/mail/e-mail-shell-view-actions.c:1267 +#: ../modules/mail/e-mail-shell-view-actions.c:1269 msgid "Receive new items from all accounts" msgstr "Recibir correo nuevo para todas las cuentas" -#: ../modules/mail/e-mail-shell-view-actions.c:1272 +#: ../modules/mail/e-mail-shell-view-actions.c:1274 msgid "_Send All" msgstr "_Enviar todo" -#: ../modules/mail/e-mail-shell-view-actions.c:1274 +#: ../modules/mail/e-mail-shell-view-actions.c:1276 msgid "Send queued items in all accounts" msgstr "Enviar todos los elementos en la cola de todas las cuentas" -#: ../modules/mail/e-mail-shell-view-actions.c:1300 +#: ../modules/mail/e-mail-shell-view-actions.c:1302 #: ../widgets/misc/e-activity-proxy.c:310 msgid "Cancel" msgstr "Cancelar" -#: ../modules/mail/e-mail-shell-view-actions.c:1302 +#: ../modules/mail/e-mail-shell-view-actions.c:1304 msgid "Cancel the current mail operation" msgstr "Cancela la operación de correo actual" -#: ../modules/mail/e-mail-shell-view-actions.c:1307 +#: ../modules/mail/e-mail-shell-view-actions.c:1309 msgid "Collapse All _Threads" msgstr "_Contraer todas las conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1309 +#: ../modules/mail/e-mail-shell-view-actions.c:1311 msgid "Collapse all message threads" msgstr "Contrae todas las conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1314 +#: ../modules/mail/e-mail-shell-view-actions.c:1316 msgid "E_xpand All Threads" msgstr "E_xpandir todas las conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1316 +#: ../modules/mail/e-mail-shell-view-actions.c:1318 msgid "Expand all message threads" msgstr "Expandir todas las conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1321 +#: ../modules/mail/e-mail-shell-view-actions.c:1323 msgid "_Message Filters" msgstr "_Filtros de correos" -#: ../modules/mail/e-mail-shell-view-actions.c:1323 +#: ../modules/mail/e-mail-shell-view-actions.c:1325 msgid "Create or edit rules for filtering new mail" msgstr "Crear o editar reglas para el filtrado de correos nuevos" -#: ../modules/mail/e-mail-shell-view-actions.c:1328 +#: ../modules/mail/e-mail-shell-view-actions.c:1330 msgid "_Subscriptions..." msgstr "_Suscripciones…" -#: ../modules/mail/e-mail-shell-view-actions.c:1337 +#: ../modules/mail/e-mail-shell-view-actions.c:1339 msgid "F_older" msgstr "_Carpeta" -#: ../modules/mail/e-mail-shell-view-actions.c:1344 +#: ../modules/mail/e-mail-shell-view-actions.c:1346 msgid "_Label" msgstr "Etiq_ueta" -#: ../modules/mail/e-mail-shell-view-actions.c:1361 +#: ../modules/mail/e-mail-shell-view-actions.c:1363 msgid "C_reate Search Folder From Search..." msgstr "_Crear una carpeta de búsqueda desde la búsqueda…" -#: ../modules/mail/e-mail-shell-view-actions.c:1368 +#: ../modules/mail/e-mail-shell-view-actions.c:1370 msgid "Search F_olders" msgstr "Carpetas de búsque_da" -#: ../modules/mail/e-mail-shell-view-actions.c:1370 +#: ../modules/mail/e-mail-shell-view-actions.c:1372 msgid "Create or edit search folder definitions" msgstr "Crear o edita definiciones para carpetas de búsqueda" -#: ../modules/mail/e-mail-shell-view-actions.c:1401 +#: ../modules/mail/e-mail-shell-view-actions.c:1403 msgid "_New Folder..." msgstr "Carpeta _nueva…" -#: ../modules/mail/e-mail-shell-view-actions.c:1429 +#: ../modules/mail/e-mail-shell-view-actions.c:1431 msgid "Show Message _Preview" msgstr "Mostrar vista _previa del correo" -#: ../modules/mail/e-mail-shell-view-actions.c:1431 +#: ../modules/mail/e-mail-shell-view-actions.c:1433 msgid "Show message preview pane" msgstr "Mostrar el correo en el panel de vista previa" -#: ../modules/mail/e-mail-shell-view-actions.c:1437 +#: ../modules/mail/e-mail-shell-view-actions.c:1439 msgid "Show _Deleted Messages" msgstr "Mostrar los mensajes _eliminados" -#: ../modules/mail/e-mail-shell-view-actions.c:1439 +#: ../modules/mail/e-mail-shell-view-actions.c:1441 msgid "Show deleted messages with a line through them" msgstr "Mostrar los mensajes eliminados tachándolos" -#: ../modules/mail/e-mail-shell-view-actions.c:1445 +#: ../modules/mail/e-mail-shell-view-actions.c:1447 msgid "_Group By Threads" msgstr "A_grupar por conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1447 +#: ../modules/mail/e-mail-shell-view-actions.c:1449 msgid "Threaded message list" msgstr "Lista de correos por conversaciones" -#: ../modules/mail/e-mail-shell-view-actions.c:1468 +#: ../modules/mail/e-mail-shell-view-actions.c:1470 msgid "Show message preview below the message list" msgstr "Mostrar la vista previa del correo bajo la lista de mensajes" -#: ../modules/mail/e-mail-shell-view-actions.c:1475 +#: ../modules/mail/e-mail-shell-view-actions.c:1477 msgid "Show message preview alongside the message list" msgstr "Mostrar la vista previa del correo junto a la lista de mensajes" -#: ../modules/mail/e-mail-shell-view-actions.c:1483 +#: ../modules/mail/e-mail-shell-view-actions.c:1485 msgid "All Messages" msgstr "Todos los correos" -#: ../modules/mail/e-mail-shell-view-actions.c:1490 +#: ../modules/mail/e-mail-shell-view-actions.c:1492 msgid "Important Messages" msgstr "Mensajes importantes" -#: ../modules/mail/e-mail-shell-view-actions.c:1497 +#: ../modules/mail/e-mail-shell-view-actions.c:1499 msgid "Last 5 Days' Messages" msgstr "Mensajes de los últimos 5 días" -#: ../modules/mail/e-mail-shell-view-actions.c:1504 +#: ../modules/mail/e-mail-shell-view-actions.c:1506 msgid "Messages Not Junk" msgstr "Mensajes que no son SPAM" -#: ../modules/mail/e-mail-shell-view-actions.c:1511 +#: ../modules/mail/e-mail-shell-view-actions.c:1513 msgid "Messages with Attachments" msgstr "Mensajes con adjuntos" -#: ../modules/mail/e-mail-shell-view-actions.c:1518 +#: ../modules/mail/e-mail-shell-view-actions.c:1520 msgid "No Label" msgstr "Sin etiqueta" -#: ../modules/mail/e-mail-shell-view-actions.c:1525 +#: ../modules/mail/e-mail-shell-view-actions.c:1527 msgid "Read Messages" msgstr "Mensajes leídos" -#: ../modules/mail/e-mail-shell-view-actions.c:1532 +#: ../modules/mail/e-mail-shell-view-actions.c:1534 msgid "Recent Messages" msgstr "Mensajes recientes" -#: ../modules/mail/e-mail-shell-view-actions.c:1539 +#: ../modules/mail/e-mail-shell-view-actions.c:1541 msgid "Unread Messages" msgstr "Mensajes no leídos" -#: ../modules/mail/e-mail-shell-view-actions.c:1591 +#: ../modules/mail/e-mail-shell-view-actions.c:1593 msgid "Subject or Addresses contain" msgstr "El asunto o las direcciones contienen" -#: ../modules/mail/e-mail-shell-view-actions.c:1601 +#: ../modules/mail/e-mail-shell-view-actions.c:1603 msgid "All Accounts" msgstr "Todas las cuentas" -#: ../modules/mail/e-mail-shell-view-actions.c:1608 +#: ../modules/mail/e-mail-shell-view-actions.c:1610 msgid "Current Account" msgstr "Cuenta actual" -#: ../modules/mail/e-mail-shell-view-actions.c:1615 +#: ../modules/mail/e-mail-shell-view-actions.c:1617 msgid "Current Folder" msgstr "Carpeta actual" @@ -16184,14 +16199,14 @@ msgstr "Papelera" msgid "Send / Receive" msgstr "Enviar / Recibir" -#: ../modules/mail/em-composer-prefs.c:498 +#: ../modules/mail/em-composer-prefs.c:505 #: ../modules/plugin-manager/evolution-plugin-manager.c:360 #: ../plugins/publish-calendar/publish-calendar.c:849 #: ../widgets/misc/e-account-tree-view.c:388 msgid "Enabled" msgstr "Activado" -#: ../modules/mail/em-composer-prefs.c:502 +#: ../modules/mail/em-composer-prefs.c:509 msgid "Language(s)" msgstr "Idioma(s)" @@ -17826,8 +17841,8 @@ msgid "" "%s through %s wishes to receive the latest information for the following " "meeting:" msgstr "" -"%s desea recibir la última información de la siguiente reunión a través de " -"%s:" +"%s desea recibir la última información de la siguiente reunión a través de %" +"s:" #: ../plugins/itip-formatter/itip-view.c:402 #, c-format @@ -18287,8 +18302,8 @@ msgid "" "Selected calendar contains event '%s' already. Would you like to edit the " "old event?" msgstr "" -"El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere " -"editar el acontecimiento antiguo?" +"El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere editar " +"el acontecimiento antiguo?" #: ../plugins/mail-to-task/mail-to-task.c:612 #, c-format @@ -19426,7 +19441,7 @@ msgstr "vCard (.vcf)" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: ../shell/e-shell-view.c:296 +#: ../shell/e-shell-view.c:299 msgid "Saving user interface state" msgstr "Guardando el estado de la interfaz de usuario" @@ -21640,6 +21655,10 @@ msgstr "Seleccionar todo" msgid "Input Methods" msgstr "Métodos de entrada" +#~| msgid "Review account" +#~ msgid "Review Account" +#~ msgstr "Revisar cuenta" + #~ msgid "" #~ "Please enter a descriptive name for this account below.\n" #~ "This name will be used for display purposes only." @@ -22339,8 +22358,8 @@ msgstr "Métodos de entrada" #~ "Folder '%s' contains %d duplicate messages. Are you sure you want to " #~ "delete them?" #~ msgstr "" -#~ "La carpeta «%s» contiene %d correos duplicados. ¿Está seguro de que " -#~ "quiere eliminarlos?" +#~ "La carpeta «%s» contiene %d correos duplicados. ¿Está seguro de que quiere " +#~ "eliminarlos?" #~ msgid "" #~ "Error on %s: %s\n" @@ -22367,8 +22386,8 @@ msgstr "Métodos de entrada" #~ msgid "Count of default recurrence for a new event. -1 means forever." #~ msgstr "" -#~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. " -#~ "-1 significa para siempre." +#~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. -" +#~ "1 significa para siempre." #~ msgid "Default recurrence count" #~ msgstr "Conteo de repeticiones predeterminado" @@ -23713,8 +23732,7 @@ msgstr "Métodos de entrada" #~ msgid "The content widget appears in a shell window's right pane" #~ msgstr "" -#~ "El widget de contenido aparece en un panel derecho de la ventana de " -#~ "«shell»" +#~ "El widget de contenido aparece en un panel derecho de la ventana de «shell»" #~ msgid "Shell Sidebar Widget" #~ msgstr "Widget de barra lateral de «shell»" @@ -24701,8 +24719,8 @@ msgstr "Métodos de entrada" #~ "This is the full name of your LDAP server. For example, \"ldap.mycompany." #~ "com\"." #~ msgstr "" -#~ "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap." -#~ "miempresa.com»." +#~ "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.miempresa." +#~ "com»." #~ msgid "" #~ "This is the maximum number of entries to download. Setting this number to " |