Merge revisions 37075:37107 from trunk.

svn path=/branches/kill-bonobo/; revision=37112

72 files changed, 17282 insertions, 13394 deletions

diff --git a/ChangeLog b/ChangeLog
index f871642b73..c115e635f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Keep evolution and evolution-data-server versions in lockstep
+	from now on to avoid any more dependency screw ups.
+
+2009-01-15  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #208426
+
+	* configure.in: Added support for importing .pst files into Evolution.
+
 2009-01-12  Philip Van hoof  <philip@codeminded.be>
 
 	* e-util/e-plugin.c
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index da6ee9b473..f9ae4f0b26 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,164 @@
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #567850
+
+	* gui/e-cal-model.h: (e_cal_model_set_default_time_func):
+	* gui/e-cal-model.c: (struct _ECalModelPrivate), (ecm_append_row),
+	(e_cal_model_set_default_time_func):
+	New functionality to retrieve a default time for a model's new
+	event created from a "click-to-add" row.
+	* gui/gnome-cal.c: (gc_get_default_time), (setup_widgets):
+	Set the new time callback for the memo table.
+
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #550735
+
+	* gui/print.c: (get_summary_with_location), (print_day_long_event),
+	(print_day_event), (print_week_event):
+	Print location with summary in all views, not only in a day view.
+
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #260853
+
+	* gui/calendar-config-keys.h:
+	* gui/calendar-config.h:
+	(calendar_config_get_ba_reminder), (calendar_config_set_ba_reminder):
+	* gui/calendar-config.c:
+	(calendar_config_get_ba_reminder), (calendar_config_set_ba_reminder),
+	(string_to_units), (calendar_config_get_default_reminder_units):
+	* gui/dialogs/cal-prefs-dialog.glade:
+	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
+	* gui/dialogs/cal-prefs-dialog.c: (ba_reminder_toggled),
+	(ba_reminder_interval_changed), (ba_reminder_units_changed),
+	(setup_changes), (show_config), (calendar_prefs_dialog_construct):
+	User interface and related function to allow use change setup of
+	the alarm for Birthdays and Anniversaries calendar.
+
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #225712
+
+	* gui/dialogs/comp-editor.h: (CompEditorClass::send_comp),
+	(comp_editor_send_comp): Changed function prototypes.
+	* gui/dialogs/comp-editor.c: (real_send_comp), (save_comp_with_send),
+	(comp_editor_send_comp): Strip alarms based on user's choice.
+	* gui/dialogs/send-comp.h: (send_component_dialog):
+	* gui/dialogs/send-comp.c: (have_nonprocedural_alarm),
+	(send_component_dialog): Show option "Send my alarms with this event"
+	when prompting to send event or not, but only if have any non-procedure
+	alarms and if it the caller want to know user's opinion. Default is
+	to strip all alarms. Procedure alarms are always strip out.
+	* gui/dialogs/event-editor.c: (event_editor_send_comp):
+	* gui/dialogs/task-editor.c: (task_editor_send_comp):
+	Honor function prototype changes and use new parameter strip_alarms.
+	* gui/itip-utils.h: (itip_send_comp):
+	* gui/itip-utils.c: (comp_compliant), (itip_send_comp),
+	(reply_to_calendar_comp):
+	New parameter to strip all alarms or only procedure alarms.
+	* gui/tasks-control.c: (tasks_control_forward_cmd):
+	* gui/e-itip-control.c: (send_item), (send_freebusy), (ok_clicked_cb):
+	* gui/e-calendar-table.c: (e_calendar_table_on_forward):
+	* gui/e-memo-table.c: (e_memo_table_on_forward):
+	* gui/e-calendar-view.c: (e_calendar_view_cut_clipboard),
+	(delete_event), (e_calendar_view_delete_selected_occurrence),
+	(on_forward):
+	Always strip alarms when sending component.
+	* gui/e-calendar-view.c: (e_calendar_view_add_event),
+	(e_calendar_view_modify_and_send):
+	* gui/e-cal-model-calendar.c: (ecmc_set_value_at):
+	Strip alarms based on user's choice.
+
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #200254
+
+	* gui/apps_evolution_calendar.schemas.in:
+	* gui/dialogs/cal-prefs-dialog.glade:
+	* gui/dialogs/cal-prefs-dialog.h: (struct _CalendarPrefsDialog):
+	* gui/dialogs/cal-prefs-dialog.c: (dview_show_week_no_toggled),
+	(setup_changes), (show_config), (calendar_prefs_dialog_construct):
+	* gui/calendar-config-keys.h:
+	* gui/calendar-config.h:
+	* gui/calendar-config.c: (calendar_config_get_dview_show_week_no),
+	(calendar_config_set_dview_show_week_no),
+	(calendar_config_add_notification_dview_show_week_no):
+	New option whether to show week number in Day and Work Week view.
+	* gui/e-day-view.h: (struct _EDayView),
+	(e_day_view_get_show_week_number), (e_day_view_set_show_week_number):
+	* gui/e-day-view.c: (dview_show_week_no_changed_cb), (e_day_view_init),
+	(e_day_view_destroy), (e_day_view_recalc_day_starts),
+	(e_day_view_get_show_week_number), (e_day_view_set_show_week_number):
+	New widget showing week number of the first day in a view.
+
+2009-01-16  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #360813
+
+	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record):
+	RFC 2445 - CREATED/DTSTAMP/LAST-MODIFIED always in UTC.
+
+2009-01-16  Milan Crha  <mcrha@redhat.com>
+
+	** Partial fix for bug #310844
+
+	* gui/e-calendar-view.c: (transfer_item_to):
+	Transfer master object instead of the instance for recurring events.
+
+2009-01-15  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #303738
+
+	* gui/gnome-cal.c: (client_cal_opened_cb),
+	(default_client_cal_opened_cb):
+	* gui/e-memos.c: (client_cal_opened_cb),
+	(default_client_cal_opened_cb):
+	* gui/e-tasks.c: (client_cal_opened_cb),
+	(default_client_cal_opened_cb):
+	Forget password on AuthFailed or AuthRequired and try to reopen
+	on AuthFailed status, which will ask for a password again.
+
+	* gui/comp-editor-factory.c: (cal_opened_cb):
+	Show "Authentication Required" on such status returned.
+
+	* common/authentication.c: (auth_cal_forget_password):
+	Do not free memory which hold ECal. Also always forget password
+	for calendar with the URL key.
+
+2009-01-15  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #245156
+
+	* gui/e-day-view.c: (e_day_view_finish_long_event_resize),
+	(e_day_view_finish_resize), (e_day_view_change_event_time),
+	(e_day_view_on_top_canvas_drag_data_received),
+	(e_day_view_on_main_canvas_drag_data_received):
+	* gui/e-week-view.c: (e_week_view_change_event_time):
+	* gui/e-calendar-view.c: (on_unrecur_appointment):
+	Keep old timezone for dtstart/dtend when changing it.
+	* gui/comp-util.h: (cal_comp_set_dtstart_with_oldzone),
+	(cal_comp_set_dtend_with_oldzone):
+	* gui/comp-util.c: (cal_comp_set_dtstart_with_oldzone),
+	(cal_comp_set_dtend_with_oldzone), (datetime_to_zone):
+	Helper functions to make it easier.
+
+2009-01-15  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #246313
+
+	* gui/e-day-view.c: (e_day_view_check_if_new_event_fits): Removed.
+	* gui/e-day-view.h: (struct _EDayView):
+	* gui/e-day-view.c: (e_day_view_init), (e_day_view_size_allocate),
+	(e_day_view_recalc_main_canvas_size), (e_day_view_recalc_cell_sizes),
+	(e_day_view_update_scroll_regions), (e_day_view_check_layout):
+	* gui/e-day-view-layout.h: (e_day_view_layout_day_events):
+	* gui/e-day-view-layout.c: (e_day_view_layout_day_events),
+	(e_day_view_layout_day_event), (e_day_view_expand_day_event):
+	Added ability to show all event in one-day view, but show only up
+	to 6 columns in a multi-day view.
+	* gui/print.c: (print_day_details): Always print all events.
+
 2009-01-14  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #554454
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index 7925a36b65..85bde3d6fd 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -77,21 +77,21 @@ auth_cal_forget_password (ECal *ecal)
 {
 	ESource *source = NULL;
 	const char *auth_domain = NULL, *component_name = NULL,  *auth_type = NULL;
-	char *key = NULL;
 
 	source = e_cal_get_source (ecal);
 	auth_domain = e_source_get_property (source, "auth-domain");
 	component_name = auth_domain ? auth_domain : "Calendar";
 
 	auth_type = e_source_get_property (source, "auth-type");
-	if (auth_type)
-		key = build_pass_key (ecal);
-	else
-		key = e_source_get_uri (source);
+	if (auth_type) {
+		char *key = NULL;
 
-	e_passwords_forget_password (component_name, key);
+		key = build_pass_key (ecal);
+		e_passwords_forget_password (component_name, key);
+		g_free (key);
+	}
 
-	g_free (key);
+	e_passwords_forget_password (component_name, e_source_get_uri (source));
 }
 
 ECal *
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b5d2e1abe1..f936e33fe7 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1203,7 +1203,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 {
 	ECalComponent *comp;
 	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;
+	struct icaltimetype now = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ()), it;
 	struct icalrecurrencetype recur;
 	ECalComponentText summary = {NULL, NULL};
 	ECalComponentDateTime dt = {NULL, NULL};
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 41bdca1b0e..7f370d1a19 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -538,6 +538,18 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/day_view_show_week_number</key>
+      <applyto>/apps/evolution/calendar/display/day_view_show_week_number</applyto>
+      <owner>evolution-calendar</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Show week number in Day and Work Week View</short>
+        <long>Whether to show week number in the Day and Work Week View.</long>
+      </locale>
+    </schema>
+
     <!-- Date navigator -->
 
     <schema>
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 9d50d21c86..05feb18d00 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -61,6 +61,7 @@ G_BEGIN_DECLS
 #define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend"
 #define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end"
 #define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days"
+#define CALENDAR_CONFIG_DV_WEEK_NUMBER CALENDAR_CONFIG_PREFIX "/display/day_view_show_week_number"
 #define CALENDAR_CONFIG_DAY_SECOND_ZONE CALENDAR_CONFIG_PREFIX "/display/day_second_zone"
 #define CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST CALENDAR_CONFIG_PREFIX "/display/day_second_zones"
 #define CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX CALENDAR_CONFIG_PREFIX "/display/day_second_zones_max"
@@ -95,6 +96,11 @@ G_BEGIN_DECLS
 #define CALENDAR_CONFIG_TEMPLATE CALENDAR_CONFIG_PREFIX"/publish/template"
 
 #define CALENDAR_CONFIG_SAVE_DIR CALENDAR_CONFIG_PREFIX"/audio_dir"
+
+/* Birthday & Anniversary reminder */
+#define CALENDAR_CONFIG_BA_REMINDER CALENDAR_CONFIG_PREFIX "/other/use_ba_reminder"
+#define CALENDAR_CONFIG_BA_REMINDER_INTERVAL CALENDAR_CONFIG_PREFIX "/other/ba_reminder_interval"
+#define CALENDAR_CONFIG_BA_REMINDER_UNITS CALENDAR_CONFIG_PREFIX "/other/ba_reminder_units"
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 60df6a9285..b5928b6523 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -106,6 +106,22 @@ units_to_string (CalUnits units)
 	}
 }
 
+/* opposite function to 'units_to_string' */
+static CalUnits
+string_to_units (const char *units)
+{
+	CalUnits res;
+
+	if (units && !strcmp (units, "days"))
+		res = CAL_DAYS;
+	else if (units && !strcmp (units, "hours"))
+		res = CAL_HOURS;
+	else
+		res = CAL_MINUTES;
+
+	return res;
+}
+
 /*
  * Calendar Settings.
  */
@@ -678,6 +694,36 @@ calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpoin
 	*not_tcolor = gconf_client_notify_add (config, CALENDAR_CONFIG_MARCUS_BAINS_COLOR_TIMEBAR, func, data, NULL, NULL);
 }
 
+/* Whether we show week number in the Day View. */
+gboolean
+calendar_config_get_dview_show_week_no (void)
+{
+	calendar_config_init ();
+
+	return gconf_client_get_bool (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, NULL);
+}
+
+
+void
+calendar_config_set_dview_show_week_no (gboolean show_week_no)
+{
+	calendar_config_init ();
+
+	gconf_client_set_bool (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, show_week_no, NULL);
+}
+
+guint
+calendar_config_add_notification_dview_show_week_no (GConfClientNotifyFunc func, gpointer data)
+{
+	guint id;
+
+	calendar_config_init ();
+
+	id = gconf_client_notify_add (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, func, data, NULL, NULL);
+
+	return id;
+}
+
 /* Whether we show week numbers in the Date Navigator. */
 gboolean
 calendar_config_get_dnav_show_week_no	(void)
@@ -1424,13 +1470,7 @@ calendar_config_get_default_reminder_units (void)
 	calendar_config_init ();
 
 	units = gconf_client_get_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, NULL);
-
-	if (units && !strcmp (units, "days"))
-		cu = CAL_DAYS;
-	else if (units && !strcmp (units, "hours"))
-		cu = CAL_HOURS;
-	else
-		cu = CAL_MINUTES;
+	cu = string_to_units (units);
 	g_free (units);
 
 	return cu;
@@ -1451,6 +1491,59 @@ calendar_config_set_default_reminder_units (CalUnits units)
 }
 
 /**
+ * calendar_config_get_ba_reminder:
+ * Retrieves setup of the Birthdays & Anniversaries reminder.
+ *
+ * @interval: Retrieves the interval setup for the reminder; can be NULL.
+ * @units: Retrieves units for the interval; can be NULL.
+ *
+ * Returns whether the reminder is on or off. The values for interval and/or units
+ * are retrieved even when returns FALSE.
+ **/
+gboolean
+calendar_config_get_ba_reminder (int *interval, CalUnits *units)
+{
+	calendar_config_init ();
+
+	if (interval) {
+		*interval = gconf_client_get_int (config, CALENDAR_CONFIG_BA_REMINDER_INTERVAL, NULL);
+	}
+
+	if (units) {
+		char *str;
+
+		str = gconf_client_get_string (config, CALENDAR_CONFIG_BA_REMINDER_UNITS, NULL);
+		*units = string_to_units (str);
+		g_free (str);
+	}
+
+	return gconf_client_get_bool (config, CALENDAR_CONFIG_BA_REMINDER, NULL);
+}
+
+/**
+ * calendar_config_set_ba_reminder:
+ * Stores new values for Birthdays & Anniversaries reminder to GConf. Only those, which are not NULL.
+ *
+ * @enabled: The enabled state; can be NULL.
+ * @interval: The reminder interval; can be NULL.
+ * @units: The units of the reminder; can be NULL.
+ **/
+void
+calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units)
+{
+	calendar_config_init ();
+
+	if (enabled)
+		gconf_client_set_bool (config, CALENDAR_CONFIG_BA_REMINDER, *enabled, NULL);
+
+	if (interval)
+		gconf_client_set_int (config, CALENDAR_CONFIG_BA_REMINDER_INTERVAL, *interval, NULL);
+
+	if (units)
+		gconf_client_set_string (config, CALENDAR_CONFIG_BA_REMINDER_UNITS, units_to_string (*units), NULL);
+}
+
+/**
  * calendar_config_get_hide_completed_tasks_sexp:
  *
  * @get_completed: Whether to form subexpression that
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 495b5c591b..0d79d2050c 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -154,6 +154,11 @@ gboolean  calendar_config_get_dnav_show_week_no	(void);
 void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
 guint calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data);
 
+/* Whether we show week number in the day view. */
+gboolean  calendar_config_get_dview_show_week_no (void);
+void	  calendar_config_set_dview_show_week_no (gboolean show_week_no);
+guint calendar_config_add_notification_dview_show_week_no (GConfClientNotifyFunc func, gpointer data);
+
 /* The positions of the panes in the normal and month views. */
 gint      calendar_config_get_hpane_pos		(void);
 void	  calendar_config_set_hpane_pos		(gint	      hpane_pos);
@@ -265,4 +270,8 @@ char *  calendar_config_get_day_second_zone (void);
 void    calendar_config_select_day_second_zone (void);
 guint   calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data);
 
+/* Birthdays & Anniversaries reminder settings */
+gboolean calendar_config_get_ba_reminder (int *interval, CalUnits *units);
+void calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units);
+
 #endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index a6694bbbcc..8b9e33d58f 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -417,6 +417,12 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
 						 "%s", _("Permission denied to open the calendar"));
 		break;
 
+	case E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED:
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+						 "%s", _("Authentication Required"));
+		break;
+
 	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED :
 		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 0e63a9c336..9504c7bda7 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -530,3 +530,80 @@ cal_comp_selection_get_string_list (GtkSelectionData *data)
 
 	return list;
 }
+
+static void
+datetime_to_zone (ECal *client, ECalComponentDateTime *date, const char *tzid)
+{
+	icaltimezone *from, *to;
+
+	g_return_if_fail (date != NULL);
+
+	if (date->tzid == NULL || tzid == NULL ||
+	    date->tzid == tzid || g_str_equal (date->tzid, tzid))
+		return;
+
+	from = icaltimezone_get_builtin_timezone_from_tzid (date->tzid);
+	if (!from) {
+		if (!e_cal_get_timezone (client, date->tzid, &from, NULL))
+			g_warning ("%s: Could not get timezone from server: %s", G_STRFUNC, date->tzid ? date->tzid : "");
+	}
+
+	to = icaltimezone_get_builtin_timezone_from_tzid (tzid);
+	if (!to) {
+		/* do not check failure here, maybe the zone is not available there */
+		e_cal_get_timezone (client, tzid, &to, NULL);
+	}
+
+	icaltimezone_convert_time (date->value, from, to);
+	date->tzid = tzid;
+}
+
+/**
+ * cal_comp_set_dtstart_with_oldzone:
+ * Changes 'dtstart' of the component, but converts time to the old timezone.
+ * @param client ECal structure, to retrieve timezone from, when required.
+ * @param comp Component, where make the change.
+ * @param pdate Value, to change to.
+ **/
+void
+cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate)
+{
+	ECalComponentDateTime olddate, date;
+
+	g_return_if_fail (comp != NULL);
+	g_return_if_fail (pdate != NULL);
+
+	e_cal_component_get_dtstart (comp, &olddate);
+
+	date = *pdate;
+
+	datetime_to_zone (client, &date, olddate.tzid);
+	e_cal_component_set_dtstart (comp, &date);
+
+	e_cal_component_free_datetime (&olddate);
+}
+
+/**
+ * cal_comp_set_dtend_with_oldzone:
+ * Changes 'dtend' of the component, but converts time to the old timezone.
+ * @param client ECal structure, to retrieve timezone from, when required.
+ * @param comp Component, where make the change.
+ * @param pdate Value, to change to.
+ **/
+void
+cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate)
+{
+	ECalComponentDateTime olddate, date;
+
+	g_return_if_fail (comp != NULL);
+	g_return_if_fail (pdate != NULL);
+
+	e_cal_component_get_dtend (comp, &olddate);
+
+	date = *pdate;
+
+	datetime_to_zone (client, &date, olddate.tzid);
+	e_cal_component_set_dtend (comp, &date);
+
+	e_cal_component_free_datetime (&olddate);
+}
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index 5e471815c6..e4e200217e 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -54,4 +54,7 @@ ECalComponent *cal_comp_memo_new_with_defaults (ECal *client);
 void    cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list);
 GSList *cal_comp_selection_get_string_list (GtkSelectionData *data);
 
+void cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
+void cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate);
+
 #endif
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 38871c2f89..21ace5aea4 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -49,6 +49,7 @@ static const int hide_completed_units_map[] = {
 	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
 };
 
+/* same is used for Birthdays & Anniversaries calendar */
 static const int default_reminder_units_map[] = {
 	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1
 };
@@ -333,6 +334,12 @@ dnav_show_week_no_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs)
 }
 
 static void
+dview_show_week_no_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs)
+{
+	calendar_config_set_dview_show_week_no (gtk_toggle_button_get_active (toggle));
+}
+
+static void
 hide_completed_tasks_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs)
 {
 	gboolean hide;
@@ -408,6 +415,34 @@ default_reminder_units_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 }
 
 static void
+ba_reminder_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs)
+{
+	gboolean enabled = gtk_toggle_button_get_active (toggle);
+
+	calendar_config_set_ba_reminder (&enabled, NULL, NULL);
+}
+
+static void
+ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
+{
+	const gchar *str;
+	int value;
+
+	str = gtk_entry_get_text (GTK_ENTRY (widget));
+	value = (int) g_ascii_strtod (str, NULL);
+
+	calendar_config_set_ba_reminder (NULL, &value, NULL);
+}
+
+static void
+ba_reminder_units_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
+{
+	CalUnits units = e_dialog_combo_box_get (prefs->ba_reminder_units, default_reminder_units_map);
+
+	calendar_config_set_ba_reminder (NULL, NULL, &units);
+}
+
+static void
 alarms_selection_changed (ESourceSelector *selector, CalendarPrefsDialog *prefs)
 {
 	ESourceList *source_list = prefs->alarms_list;
@@ -483,6 +518,7 @@ setup_changes (CalendarPrefsDialog *prefs)
 	g_signal_connect (G_OBJECT (prefs->show_end_times), "toggled", G_CALLBACK (show_end_times_toggled), prefs);
 	g_signal_connect (G_OBJECT (prefs->compress_weekend), "toggled", G_CALLBACK (compress_weekend_toggled), prefs);
 	g_signal_connect (G_OBJECT (prefs->dnav_show_week_no), "toggled", G_CALLBACK (dnav_show_week_no_toggled), prefs);
+	g_signal_connect (G_OBJECT (prefs->dview_show_week_no), "toggled", G_CALLBACK (dview_show_week_no_toggled), prefs);
 
 	g_signal_connect (G_OBJECT (prefs->tasks_hide_completed), "toggled",
 			  G_CALLBACK (hide_completed_tasks_toggled), prefs);
@@ -500,6 +536,11 @@ setup_changes (CalendarPrefsDialog *prefs)
 			  G_CALLBACK (default_reminder_interval_changed), prefs);
 	g_signal_connect (G_OBJECT (prefs->default_reminder_units), "changed", G_CALLBACK (default_reminder_units_changed), prefs);
 
+	g_signal_connect (G_OBJECT (prefs->ba_reminder), "toggled", G_CALLBACK (ba_reminder_toggled), prefs);
+	g_signal_connect (G_OBJECT (prefs->ba_reminder_interval), "changed",
+			  G_CALLBACK (ba_reminder_interval_changed), prefs);
+	g_signal_connect (G_OBJECT (prefs->ba_reminder_units), "changed", G_CALLBACK (ba_reminder_units_changed), prefs);
+
 	g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs);
 
 
@@ -593,6 +634,8 @@ show_config (CalendarPrefsDialog *prefs)
 	gboolean sensitive, set = FALSE;
 	icalcomponent *icalcomp, *dl_comp;
 	char *location;
+	CalUnits units;
+	int interval;
 
 	/* Timezone. */
 	location = calendar_config_get_timezone ();
@@ -654,6 +697,9 @@ show_config (CalendarPrefsDialog *prefs)
 	/* Date Navigator - Show Week Numbers. */
 	e_dialog_toggle_set (prefs->dnav_show_week_no, calendar_config_get_dnav_show_week_no ());
 
+	/* Day/Work Week view - Show Week Number. */
+	e_dialog_toggle_set (prefs->dview_show_week_no, calendar_config_get_dview_show_week_no ());
+
 	/* Task list */
 	show_task_list_config (prefs);
 
@@ -668,6 +714,13 @@ show_config (CalendarPrefsDialog *prefs)
 	e_dialog_toggle_set (prefs->default_reminder, calendar_config_get_use_default_reminder ());
 	e_dialog_spin_set (prefs->default_reminder_interval, calendar_config_get_default_reminder_interval ());
 	e_dialog_combo_box_set (prefs->default_reminder_units, calendar_config_get_default_reminder_units (), default_reminder_units_map);
+
+	/* Birthdays & Anniversaries reminder */
+	set = calendar_config_get_ba_reminder (&interval, &units);
+
+	e_dialog_toggle_set (prefs->ba_reminder, set);
+	e_dialog_spin_set (prefs->ba_reminder_interval, interval);
+	e_dialog_combo_box_set (prefs->ba_reminder_units, units, default_reminder_units_map);
 }
 
 /* plugin meta-data */
@@ -749,12 +802,16 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 	prefs->default_reminder = glade_xml_get_widget (gui, "default_reminder");
 	prefs->default_reminder_interval = glade_xml_get_widget (gui, "default_reminder_interval");
 	prefs->default_reminder_units = glade_xml_get_widget (gui, "default_reminder_units");
+	prefs->ba_reminder = glade_xml_get_widget (gui, "ba_reminder");
+	prefs->ba_reminder_interval = glade_xml_get_widget (gui, "ba_reminder_interval");
+	prefs->ba_reminder_units = glade_xml_get_widget (gui, "ba_reminder_units");
 
 	/* Display tab */
 	prefs->time_divisions = glade_xml_get_widget (gui, "time_divisions");
 	prefs->show_end_times = glade_xml_get_widget (gui, "show_end_times");
 	prefs->compress_weekend = glade_xml_get_widget (gui, "compress_weekend");
 	prefs->dnav_show_week_no = glade_xml_get_widget (gui, "dnav_show_week_no");
+	prefs->dview_show_week_no = glade_xml_get_widget (gui, "dview_show_week_no");
 	prefs->tasks_due_today_color = glade_xml_get_widget (gui, "tasks_due_today_color");
 	prefs->tasks_overdue_color = glade_xml_get_widget (gui, "tasks_overdue_color");
 	prefs->tasks_hide_completed = glade_xml_get_widget (gui, "tasks_hide_completed");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 0282d17d4d..b8947b4c44 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -950,6 +950,98 @@ Days</property>
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox25">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">4</property>
+
+		      <child>
+			<widget class="GtkCheckButton" id="ba_reminder">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Show a _reminder</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkSpinButton" id="ba_reminder_interval">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="climb_rate">1</property>
+			  <property name="digits">0</property>
+			  <property name="numeric">False</property>
+			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			  <property name="snap_to_ticks">False</property>
+			  <property name="wrap">False</property>
+			  <property name="adjustment">0 0 9999 1 10 10</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkComboBox" id="ba_reminder_units">
+			  <property name="visible">True</property>
+			  <property name="items" translatable="yes">Minutes
+Hours
+Days</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="ba_reminder_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">before every anniversary/birthday</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1176,6 +1268,24 @@ Days</property>
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
+		  <child>
+		    <widget class="GtkCheckButton" id="dview_show_week_no">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Show week n_umber in Day and Work Week View</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index bb51d9d50d..895a263986 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -55,12 +55,16 @@ struct _CalendarPrefsDialog {
 	GtkWidget *default_reminder;
 	GtkWidget *default_reminder_interval;
 	GtkWidget *default_reminder_units;
+	GtkWidget *ba_reminder;
+	GtkWidget *ba_reminder_interval;
+	GtkWidget *ba_reminder_units;
 
 	/* Display tab */
 	GtkWidget *time_divisions;
 	GtkWidget *show_end_times;
 	GtkWidget *compress_weekend;
 	GtkWidget *dnav_show_week_no;
+	GtkWidget *dview_show_week_no;
 	GtkWidget *tasks_due_today_color;
 	GtkWidget *tasks_overdue_color;
 	GtkWidget *tasks_hide_completed;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 5d9298cd18..e9967eccaf 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -171,7 +171,7 @@ static void comp_editor_show_help (CompEditor *editor);
 static void setup_widgets (CompEditor *editor);
 
 static void real_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method);
+static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
 static gboolean prompt_and_save_changes (CompEditor *editor, gboolean send);
 static void close_dialog (CompEditor *editor);
 
@@ -897,6 +897,7 @@ save_comp_with_send (CompEditor *editor)
 	CompEditorFlags flags;
 	gboolean send;
 	gboolean delegate;
+	gboolean strip_alarms = TRUE;
 
 	priv = editor->priv;
 
@@ -916,18 +917,18 @@ save_comp_with_send (CompEditor *editor)
 	if (!save_comp (editor))
 		return FALSE;
 
-	if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org))) {
+	if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org, &strip_alarms))) {
  		if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp))) {
  			if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
-				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH);
+				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH, strip_alarms);
 			else
-				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST);
+				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms);
 		} else {
-			if (!comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST))
+			if (!comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms))
 				return FALSE;
 
 			if (delegate)
-				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY);
+				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms);
 		}
  	}
 
@@ -3083,7 +3084,7 @@ get_users_from_memo_comp (ECalComponent *comp, GList **users)
 }
 
 static gboolean
-real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
+real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms)
 {
 	CompEditorPrivate *priv;
 	CompEditorFlags flags;
@@ -3129,7 +3130,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 		if (!e_cal_component_has_attachments (priv->comp) 
 		 || e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
 		if (itip_send_comp (method, send_comp, priv->client,
-					NULL, NULL, users)) {
+					NULL, NULL, users, strip_alarms)) {
 			g_object_unref (send_comp);
 			return TRUE;
 		}
@@ -3150,7 +3151,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 		/* mime_attach_list is freed by itip_send_comp */
 		mime_attach_list = comp_editor_get_mime_attach_list (editor);
 		if (itip_send_comp (method, send_comp, priv->client,
-					NULL, mime_attach_list, users)) {
+					NULL, mime_attach_list, users, strip_alarms)) {
 			save_comp (editor);
 			g_object_unref (send_comp);
 			return TRUE;
@@ -3272,7 +3273,7 @@ comp_editor_delete_comp (CompEditor *editor)
  *
  **/
 gboolean
-comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
+comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms)
 {
 	CompEditorClass *class;
 
@@ -3281,7 +3282,7 @@ comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 	class = COMP_EDITOR_GET_CLASS (editor);
 
 	if (class->send_comp)
-		return class->send_comp (editor, method);
+		return class->send_comp (editor, method, strip_alarms);
 
 	return FALSE;
 }
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 23a8d3acea..7fdc17ba16 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -67,7 +67,7 @@ struct _CompEditorClass {
 	/* Virtual functions */
 	void (*edit_comp) (CompEditor *page, ECalComponent *comp);
 	void (*object_created) (CompEditor *page);
-	gboolean (*send_comp) (CompEditor *page, ECalComponentItipMethod method);
+	gboolean (*send_comp) (CompEditor *page, ECalComponentItipMethod method, gboolean strip_alarms);
 
 	void (*show_categories) (CompEditor *editor, gboolean visible);
 	void (*show_role) (CompEditor *editor, gboolean visible);
@@ -131,7 +131,8 @@ gboolean	comp_editor_save_comp		(CompEditor *editor,
 						 gboolean send);
 void		comp_editor_delete_comp		(CompEditor *editor);
 gboolean	comp_editor_send_comp		(CompEditor *editor,
-						 ECalComponentItipMethod method);
+						 ECalComponentItipMethod method,
+						 gboolean strip_alarms);
 GSList *	comp_editor_get_mime_attach_list(CompEditor *editor);
 gboolean	comp_editor_close		(CompEditor *editor);
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index ef94f631d0..72cbf37823 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -98,7 +98,7 @@ static const gchar *ui =
 "</ui>";
 
 static void event_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
+static gboolean event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
 
 G_DEFINE_TYPE (EventEditor, event_editor, TYPE_COMP_EDITOR)
 
@@ -619,7 +619,7 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 }
 
 static gboolean
-event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
+event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms)
 {
 	EventEditorPrivate *priv;
 	ECalComponent *comp = NULL;
@@ -638,7 +638,7 @@ event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
 		client = e_meeting_store_get_e_cal (priv->model);
 		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL, NULL);
+				client, NULL, NULL, NULL, strip_alarms);
 		g_object_unref (comp);
 
 		return result;
@@ -646,7 +646,7 @@ event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
  parent:
 	if (COMP_EDITOR_CLASS (event_editor_parent_class)->send_comp)
-		return COMP_EDITOR_CLASS (event_editor_parent_class)->send_comp (editor, method);
+		return COMP_EDITOR_CLASS (event_editor_parent_class)->send_comp (editor, method, strip_alarms);
 
 	return FALSE;
 }
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 11d6e74757..a7d87c47f4 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -26,11 +26,44 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
 #include "e-util/e-error.h"
 #include "send-comp.h"
 
 
 
+static gboolean
+have_nonprocedural_alarm (ECalComponent *comp)
+{
+	GList *uids, *l;
+
+	g_return_val_if_fail (comp != NULL, FALSE);
+
+	uids = e_cal_component_get_alarm_uids (comp);
+
+	for (l = uids; l; l = l->next) {
+		ECalComponentAlarm *alarm;
+		ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
+
+		alarm = e_cal_component_get_alarm (comp, (const char *)l->data);
+		if (alarm) {
+			e_cal_component_alarm_get_action (alarm, &action);
+			e_cal_component_alarm_free (alarm);
+
+			if (action != E_CAL_COMPONENT_ALARM_NONE &&
+			    action != E_CAL_COMPONENT_ALARM_PROCEDURE &&
+			    action != E_CAL_COMPONENT_ALARM_UNKNOWN) {
+				cal_obj_uid_list_free (uids);
+				return TRUE;
+			}
+		}
+	}
+
+	cal_obj_uid_list_free (uids);
+
+	return FALSE;
+}
+
 /**
  * send_component_dialog:
  *
@@ -40,11 +73,14 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new)
+send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms)
 {
 	ECalComponentVType vtype;
 	const char *id;
 
+	if (strip_alarms)
+		*strip_alarms = TRUE;
+
 	if (e_cal_get_save_schedules (client))
 		return FALSE;
 
@@ -72,10 +108,32 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo
 		return FALSE;
 	}
 
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
-		return TRUE;
-	else
-		return FALSE;
+	if (strip_alarms && have_nonprocedural_alarm (comp)) {
+		GtkWidget *dialog, *checkbox, *align;
+		gboolean res;
+
+		dialog = e_error_new (parent, id, NULL);
+		checkbox = gtk_check_button_new_with_label (_("Send my alarms with this event"));
+		align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+		gtk_container_add (GTK_CONTAINER (align), checkbox);
+		gtk_widget_show (checkbox);
+		gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), align, TRUE, TRUE, 6);
+		gtk_widget_show (align);
+
+		res = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES;
+
+		if (res)
+			*strip_alarms = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+
+		return res;
+	} else {
+		if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
+			return TRUE;
+		else
+			return FALSE;
+	}
 }
 
 gboolean
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
index 4a1a6c55ab..21b310947a 100644
--- a/calendar/gui/dialogs/send-comp.h
+++ b/calendar/gui/dialogs/send-comp.h
@@ -28,7 +28,7 @@
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
 
-gboolean send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new);
+gboolean send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms);
 gboolean send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *comp);
 
 #endif
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 3ef5b4bcf2..656e7b4836 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -87,7 +87,7 @@ static const gchar *ui =
 "</ui>";
 
 static void task_editor_edit_comp (CompEditor *editor, ECalComponent *comp);
-static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
+static gboolean task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
 
 G_DEFINE_TYPE (TaskEditor, task_editor, TYPE_COMP_EDITOR)
 
@@ -445,7 +445,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 }
 
 static gboolean
-task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
+task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms)
 {
 	TaskEditorPrivate *priv;
 	ECalComponent *comp = NULL;
@@ -464,7 +464,7 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
 		client = e_meeting_store_get_e_cal (priv->model);
 		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL, NULL);
+				client, NULL, NULL, NULL, strip_alarms);
 		g_object_unref (comp);
 
 		if (!result)
@@ -473,7 +473,7 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 
  parent:
 	if (COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp)
-		return COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp (editor, method);
+		return COMP_EDITOR_CLASS (task_editor_parent_class)->send_comp (editor, method, strip_alarms);
 
 	return FALSE;
 }
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 27c73dd12c..7f5d7b55c6 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -382,8 +382,10 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
 	}
 
 	if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, mod, NULL)) {
+		gboolean strip_alarms = TRUE;
+
 		if (itip_organizer_is_user (comp, comp_data->client) &&
-		    send_component_dialog (NULL, comp_data->client, comp, FALSE)) {
+		    send_component_dialog (NULL, comp_data->client, comp, FALSE, &strip_alarms)) {
 			ECalComponent *send_comp = NULL;
 
 			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) {
@@ -403,7 +405,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value)
 			}
 
 			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp,
-					comp_data->client, NULL, NULL, NULL);
+					comp_data->client, NULL, NULL, NULL, strip_alarms);
 
 			if (send_comp)
 				g_object_unref (send_comp);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index acbee0cd26..850807ed05 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -77,6 +77,10 @@ struct _ECalModelPrivate {
 
 	/* Whether we display dates in 24-hour format. */
         gboolean use_24_hour_format;
+
+	/* callback, to retrieve start time for newly added rows by click-to-add */
+	ECalModelDefaultTimeFunc get_default_time;
+	gpointer get_default_time_user_data;
 };
 
 #define E_CAL_MODEL_COMPONENT_GET_PRIVATE(obj) \
@@ -816,9 +820,26 @@ ecm_append_row (ETableModel *etm, ETableModel *source, int row)
 	set_categories (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_CATEGORIES, row));
 	set_classification (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_CLASSIFICATION, row));
 	set_description (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_DESCRIPTION, row));
-	set_dtstart (model, &comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_DTSTART, row));
 	set_summary (&comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_SUMMARY, row));
 
+	if (e_table_model_value_at (source, E_CAL_MODEL_FIELD_DTSTART, row)) {
+		set_dtstart (model, &comp_data, e_table_model_value_at (source, E_CAL_MODEL_FIELD_DTSTART, row));
+	} else if (model->priv->get_default_time) {
+		time_t tt = model->priv->get_default_time (model, model->priv->get_default_time_user_data);
+
+		if (tt > 0) {
+			struct icaltimetype itt = icaltime_from_timet_with_zone (tt, FALSE, e_cal_model_get_timezone (model));
+			icalproperty *prop = icalcomponent_get_first_property (comp_data.icalcomp, ICAL_DTSTART_PROPERTY);
+
+			if (prop) {
+				icalproperty_set_dtstart (prop, itt);
+			} else {
+				prop = icalproperty_new_dtstart (itt);
+				icalcomponent_add_property (comp_data.icalcomp, prop);
+			}
+		}
+	}
+
 	/* call the class' method for filling the component */
 	model_class = (ECalModelClass *) G_OBJECT_GET_CLASS (model);
 	if (model_class->fill_component_from_model != NULL) {
@@ -2460,3 +2481,17 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon
 	}
 	comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone);
 }
+
+/**
+ * e_cal_model_set_default_time_func:
+ * This function will be used when creating new item from the "click-to-add",
+ * when user didn't fill a start date there.
+ **/
+void
+e_cal_model_set_default_time_func (ECalModel *model, ECalModelDefaultTimeFunc func, gpointer user_data)
+{
+	g_return_if_fail (E_IS_CAL_MODEL (model));
+
+	model->priv->get_default_time = func;
+	model->priv->get_default_time_user_data = user_data;
+}
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index ad9bc7d9ae..80ba4d4b5b 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -121,6 +121,8 @@ typedef struct {
 	void (* cal_view_done) (ECalModel *model, ECalendarStatus status, ECalSourceType type);
 } ECalModelClass;
 
+typedef time_t (*ECalModelDefaultTimeFunc)(ECalModel *model, gpointer user_data);
+
 GType               e_cal_model_get_type                       (void);
 GType 		    e_cal_model_component_get_type 	       (void);
 icalcomponent_kind  e_cal_model_get_component_kind             (ECalModel           *model);
@@ -184,6 +186,8 @@ void e_cal_model_set_search_query_with_time_range (ECalModel *model, const char
 
 gboolean e_cal_model_test_row_editable (ECalModel *model, int row);
 
+void e_cal_model_set_default_time_func (ECalModel *model, ECalModelDefaultTimeFunc func, gpointer user_data);
+
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 633291adc4..e24cb6230a 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -372,6 +372,8 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 	/* FIXME Error handling */
 	uid = NULL;
 	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
+		gboolean strip_alarms = TRUE;
+
 		if (uid) {
 			e_cal_component_set_uid (comp, uid);
 			g_free (uid);
@@ -379,9 +381,9 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 
 		if ((itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp)) &&
 		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-					   client, comp, TRUE)) {
+					   client, comp, TRUE, &strip_alarms)) {
 			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp,
-				client, NULL, NULL, NULL);
+				client, NULL, NULL, NULL, strip_alarms);
 		}
 	} else {
 		g_message (G_STRLOC ": Could not create the object!");
@@ -635,7 +637,7 @@ e_calendar_view_cut_clipboard (ECalendarView *cal_view)
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 						event->comp_data->client, comp, TRUE))
 			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL, NULL);
+					event->comp_data->client, NULL, NULL, NULL, TRUE);
 
 		e_cal_component_get_uid (comp, &uid);
 		if (e_cal_component_is_instance (comp)) {
@@ -985,7 +987,7 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 						event->comp_data->client,
 						comp, TRUE))
 			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL, NULL);
+					event->comp_data->client, NULL, NULL, NULL, TRUE);
 
 		e_cal_component_get_uid (comp, &uid);
 		if (!uid || !*uid) {
@@ -1134,7 +1136,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 
 				e_cal_component_free_datetime (&range.datetime);
 			}
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, event->comp_data->client, NULL, NULL, NULL);
+			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, event->comp_data->client, NULL, NULL, NULL, TRUE);
 		}
 
 		if (is_instance)
@@ -1312,7 +1314,28 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 		if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL))
 			return;
 	} else {
-		orig_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
+		if (e_cal_util_component_is_instance (event->comp_data->icalcomp)) {
+			icalcomponent *icalcomp = NULL;
+
+			if (e_cal_get_object (event->comp_data->client, uid, NULL, &icalcomp, NULL)) {
+				/* use master object when working with recurring event */
+				orig_icalcomp = icalcomponent_new_clone (icalcomp);
+				icalcomponent_free (icalcomp);
+			} else {
+				/* ... or remove the recurrence id property... */
+				orig_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
+
+				if (e_cal_util_component_has_recurrences (orig_icalcomp)) {
+					/* ... for non-detached instances, to make it a master object */
+					icalproperty *prop;
+
+					prop = icalcomponent_get_first_property (orig_icalcomp, ICAL_RECURRENCEID_PROPERTY);
+					if (prop)
+						icalcomponent_remove_property (orig_icalcomp, prop);
+				}
+			}
+		} else
+			orig_icalcomp = icalcomponent_new_clone (event->comp_data->icalcomp);
 
 		icalprop = icalproperty_new_x ("1");
 		icalproperty_set_x_name (icalprop, "X-EVOLUTION-MOVE-CALENDAR");
@@ -1339,10 +1362,16 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 
 	/* remove the item from the source calendar */
 	if (remove_item) {
-		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_is_instance (event->comp_data->icalcomp))
-			e_cal_remove_object_with_mod (event->comp_data->client, uid,
-					NULL, CALOBJ_MOD_ALL, NULL);
-		else
+		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
+			char *rid = NULL;
+			struct icaltimetype recur_id = icalcomponent_get_recurrenceid (event->comp_data->icalcomp);
+
+			if (!icaltime_is_null_time (recur_id))
+				rid = icaltime_as_ical_string (recur_id);
+
+			e_cal_remove_object_with_mod (event->comp_data->client, uid, rid, CALOBJ_MOD_ALL, NULL);
+			g_free (rid);
+		} else
 			e_cal_remove_object (event->comp_data->client, uid, NULL);
 	}
 }
@@ -1521,7 +1550,7 @@ on_forward (EPopup *ep, EPopupItem *pitem, void *data)
 
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-		itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, event->comp_data->client, NULL, NULL, NULL);
+		itip_send_comp (E_CAL_COMPONENT_METHOD_PUBLISH, comp, event->comp_data->client, NULL, NULL, NULL, TRUE);
 
 		g_list_free (selected);
 		g_object_unref (comp);
@@ -1629,10 +1658,10 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data)
 
 	*date.value = icaltime_from_timet_with_zone (event->comp_data->instance_start, FALSE,
 						     e_calendar_view_get_timezone (cal_view));
-	e_cal_component_set_dtstart (new_comp, &date);
+	cal_comp_set_dtstart_with_oldzone (client, new_comp, &date);
 	*date.value = icaltime_from_timet_with_zone (event->comp_data->instance_end, FALSE,
 						     e_calendar_view_get_timezone (cal_view));
-	e_cal_component_set_dtend (new_comp, &date);
+	cal_comp_set_dtend_with_oldzone (client, new_comp, &date);
 	e_cal_component_commit_sequence (new_comp);
 
 	/* Now update both ECalComponents. Note that we do this last since at
@@ -2012,8 +2041,10 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 				 gboolean new)
 {
 	if (e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), mod, NULL)) {
+		gboolean strip_alarms = TRUE;
+
 		if ((itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp)) &&
-		    send_component_dialog (toplevel, client, comp, new)) {
+		    send_component_dialog (toplevel, client, comp, new, &strip_alarms)) {
 			ECalComponent *send_comp = NULL;
 
 			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) {
@@ -2032,7 +2063,7 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 				}
 			}
 
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, client, NULL, NULL, NULL);
+			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, client, NULL, NULL, NULL, strip_alarms);
 
 			if (send_comp)
 				g_object_unref (send_comp);
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 26459997df..949f4b7ce2 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -29,6 +29,7 @@
 #include <config.h>
 
 #include "e-day-view-layout.h"
+#include "e-util/e-bit-array.h"
 
 static void e_day_view_layout_long_event (EDayViewEvent	  *event,
 					  guint8	  *grid,
@@ -37,13 +38,14 @@ static void e_day_view_layout_long_event (EDayViewEvent	  *event,
 					  gint		  *rows_in_top_display);
 
 static void e_day_view_layout_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
+					 EBitArray       **grid,
 					 guint16	  *group_starts,
 					 guint8	          *cols_per_row,
 					 gint	           rows,
-					 gint	           mins_per_row);
+					 gint	           mins_per_row,
+					 gint              max_cols);
 static void e_day_view_expand_day_event (EDayViewEvent    *event,
-					 guint8	          *grid,
+					 EBitArray       **grid,
 					 guint8	          *cols_per_row,
 					 gint	           mins_per_row);
 static void e_day_view_recalc_cols_per_row (gint           rows,
@@ -127,15 +129,17 @@ e_day_view_layout_long_event (EDayViewEvent *event,
 }
 
 
-void
+/* returns maximum number of columns among all rows */
+gint
 e_day_view_layout_day_events (GArray	   *events,
 			      gint	    rows,
 			      gint	    mins_per_row,
-			      guint8	   *cols_per_row)
+			      guint8	   *cols_per_row,
+			      gint          max_cols)
 {
 	EDayViewEvent *event;
-	gint row, event_num;
-	guint8 *grid;
+	gint row, event_num, res;
+	EBitArray **grid;
 
 	/* This is a temporary array which keeps track of rows which are
 	   connected. When an appointment spans multiple rows then the number
@@ -145,18 +149,20 @@ e_day_view_layout_day_events (GArray	   *events,
 	   rows. */
 	guint16 group_starts[12 * 24];
 
+	/* This is a temporary 2-d grid which is used to place events.
+	   Each element is 0 if the position is empty, or 1 if occupied. */
+	grid = g_new0 (EBitArray *, rows);
+
 	/* Reset the cols_per_row array, and initialize the connected rows so
 	   that all rows are not connected - each row is the start of a new
 	   group. */
 	for (row = 0; row < rows; row++) {
 		cols_per_row[row] = 0;
 		group_starts[row] = row;
-	}
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied. */
-	grid = g_new0 (guint8, rows * E_DAY_VIEW_MAX_COLUMNS);
 
+		/* row doesn't contain any event at the moment */
+		grid [row] = e_bit_array_new (0);
+	}
 
 	/* Iterate over the events, finding which rows they cover, and putting
 	   them in the first free column available. Increment the number of
@@ -166,7 +172,7 @@ e_day_view_layout_day_events (GArray	   *events,
 		event = &g_array_index (events, EDayViewEvent, event_num);
 
 		e_day_view_layout_day_event (event, grid, group_starts,
-					     cols_per_row, rows, mins_per_row);
+					     cols_per_row, rows, mins_per_row, max_cols);
 	}
 
 	/* Recalculate the number of columns needed in each row. */
@@ -180,8 +186,15 @@ e_day_view_layout_day_events (GArray	   *events,
 					     mins_per_row);
 	}
 
-	/* Free the grid. */
+	/* Free the grid and compute maximum number of columns used. */
+	res = 0;
+	for (row = 0; row < rows; row++) {
+		res = MAX (res, e_bit_array_bit_count (grid [row]));
+		g_object_unref (grid [row]);
+	}
 	g_free (grid);
+
+	return res;
 }
 
 
@@ -190,11 +203,12 @@ e_day_view_layout_day_events (GArray	   *events,
    sure they are all in one group. */
 static void
 e_day_view_layout_day_event (EDayViewEvent *event,
-			     guint8	   *grid,
+			     EBitArray    **grid,
 			     guint16	   *group_starts,
 			     guint8	   *cols_per_row,
 			     gint	    rows,
-			     gint	    mins_per_row)
+			     gint	    mins_per_row,
+			     gint           max_cols)
 {
 	gint start_row, end_row, free_col, col, row, group_start;
 
@@ -214,10 +228,11 @@ e_day_view_layout_day_event (EDayViewEvent *event,
 	end_row = CLAMP (end_row, 0, rows - 1);
 
 	/* Try each column until we find a free one. */
-	for (col = 0; col < E_DAY_VIEW_MAX_COLUMNS; col++) {
+	for (col = 0; max_cols <= 0 || col < max_cols; col++) {
 		free_col = col;
 		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
+			if (e_bit_array_bit_count (grid [row]) > col &&
+			    e_bit_array_value_at (grid [row], col)) {
 				free_col = -1;
 				break;
 			}
@@ -243,7 +258,11 @@ e_day_view_layout_day_event (EDayViewEvent *event,
 	   all the events have been layed out. Also make sure all the rows that
 	   the event covers are in one group. */
 	for (row = start_row; row <= end_row; row++) {
-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;
+		/* resize the array if necessary */
+		if (e_bit_array_bit_count (grid [row]) <= free_col)
+			e_bit_array_insert (grid [row], e_bit_array_bit_count (grid [row]), free_col - e_bit_array_bit_count (grid [row]) + 1);
+
+		e_bit_array_change_one_row (grid [row], free_col, TRUE);
 		cols_per_row[row]++;
 		group_starts[row] = group_start;
 	}
@@ -284,7 +303,7 @@ e_day_view_recalc_cols_per_row (gint      rows,
 /* Expands the event horizontally to fill any free space. */
 static void
 e_day_view_expand_day_event (EDayViewEvent *event,
-			     guint8	   *grid,
+			     EBitArray    **grid,
 			     guint8	   *cols_per_row,
 			     gint	    mins_per_row)
 {
@@ -300,7 +319,8 @@ e_day_view_expand_day_event (EDayViewEvent *event,
 	clashed = FALSE;
 	for (col = event->start_row_or_col + 1; col < cols_per_row[start_row]; col++) {
 		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
+			if (e_bit_array_bit_count (grid [row]) > col &&
+			    e_bit_array_value_at (grid [row], col)) {
 				clashed = TRUE;
 				break;
 			}
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 19ee6ee036..4ad1de64bd 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -39,10 +39,11 @@ void e_day_view_layout_long_events	(GArray	   *events,
 					 gint	   *rows_in_top_display);
 
 
-void e_day_view_layout_day_events	(GArray	   *events,
+gint e_day_view_layout_day_events	(GArray	   *events,
 					 gint	    rows,
 					 gint	    mins_per_row,
-					 guint8	   *cols_per_row);
+					 guint8	   *cols_per_row,
+					 gint       max_cols);
 
 gboolean   e_day_view_find_long_event_days	(EDayViewEvent	*event,
 						 gint		 days_shown,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 21a3102e9f..9391f48ced 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -181,8 +181,6 @@ static void e_day_view_top_scroll (EDayView	*day_view,
 
 static void e_day_view_update_top_scroll (EDayView *day_view, gboolean scroll_to_top);
 
-static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);
-
 static void e_day_view_on_canvas_realized (GtkWidget *widget,
 					   EDayView *day_view);
 
@@ -705,6 +703,12 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
 }
 
 static void
+dview_show_week_no_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+{
+	e_day_view_set_show_week_number (data, calendar_config_get_dview_show_week_no ());
+}
+
+static void
 e_day_view_init (EDayView *day_view)
 {
 	gint day;
@@ -808,6 +812,12 @@ e_day_view_init (EDayView *day_view)
 	day_view->before_click_dtstart = 0;
 	day_view->before_click_dtend = 0;
 
+	day_view->week_number_label = gtk_label_new ("");
+	gtk_table_attach (GTK_TABLE (day_view), day_view->week_number_label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	day_view->wn_notif_id = calendar_config_add_notification_dview_show_week_no (dview_show_week_no_changed_cb, day_view);
+	if (calendar_config_get_dview_show_week_no ())
+		gtk_widget_show (day_view->week_number_label);
+
 	/*
 	 * Top Canvas
 	 */
@@ -988,6 +998,10 @@ e_day_view_init (EDayView *day_view)
 	/*
 	 * Scrollbar.
 	 */
+	day_view->mc_hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->hadjustment);
+	gtk_table_attach (GTK_TABLE (day_view), day_view->mc_hscrollbar, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+	gtk_widget_show (day_view->mc_hscrollbar);
+
 	day_view->tc_vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->top_canvas)->vadjustment);
 	gtk_table_attach (GTK_TABLE (day_view), day_view->tc_vscrollbar,
 			  2, 3, 0, 1, 0, GTK_FILL, 0, 0);
@@ -1080,6 +1094,11 @@ e_day_view_destroy (GtkObject *object)
 
 	e_day_view_stop_auto_scroll (day_view);
 
+	if (day_view->wn_notif_id) {
+		calendar_config_remove_notification (day_view->wn_notif_id);
+		day_view->wn_notif_id = 0;
+	}
+
 	if (day_view->large_font_desc) {
 		pango_font_description_free (day_view->large_font_desc);
 		day_view->large_font_desc = NULL;
@@ -1462,28 +1481,19 @@ e_day_view_style_set (GtkWidget *widget,
 	pango_font_metrics_unref (font_metrics);
 }
 
-/* This recalculates the sizes of each column. */
 static void
-e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+e_day_view_recalc_main_canvas_size (EDayView *day_view)
 {
-	EDayView *day_view;
 	gint day, scroll_y;
 	gboolean need_reshape;
 
-#if 0
-	g_print ("In e_day_view_size_allocate\n");
-#endif
-	day_view = E_DAY_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (e_day_view_parent_class)->size_allocate) (widget, allocation);
-
-	e_day_view_recalc_cell_sizes (day_view);
-
 	/* Set the scroll region of the top canvas */
 	e_day_view_update_top_scroll (day_view, TRUE);
 
 	need_reshape = e_day_view_update_scroll_regions (day_view);
 
+	e_day_view_recalc_cell_sizes (day_view);
+
 	/* Scroll to the start of the working day, if this is the initial
 	   allocation. */
 	if (day_view->scroll_to_work_day) {
@@ -1504,6 +1514,17 @@ e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	}
 }
 
+/* This recalculates the sizes of each column. */
+static void
+e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+{
+#if 0
+	g_print ("In e_day_view_size_allocate\n");
+#endif
+	(*GTK_WIDGET_CLASS (e_day_view_parent_class)->size_allocate) (widget, allocation);
+
+	e_day_view_recalc_main_canvas_size (E_DAY_VIEW (widget));
+}
 
 static void
 e_day_view_recalc_cell_sizes	(EDayView	*day_view)
@@ -1530,6 +1551,8 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 	   get divided evenly. Note that we use one more element than the
 	   number of columns, to make it easy to get the column widths. */
 	width = day_view->main_canvas->allocation.width;
+	if (day_view->days_shown == 1)
+		width = MAX (width, day_view->max_cols * (E_DAY_VIEW_MIN_DAY_COL_WIDTH + E_DAY_VIEW_GAP_WIDTH) - E_DAY_VIEW_MIN_DAY_COL_WIDTH - 1);
 	width /= day_view->days_shown;
 	offset = 0;
 	for (day = 0; day <= day_view->days_shown; day++) {
@@ -2276,6 +2299,9 @@ e_day_view_recalc_day_starts (EDayView *day_view,
 			      time_t start_time)
 {
 	gint day;
+	char *str;
+	struct icaltimetype tt;
+	GDate dt;
 
 	day_view->day_starts[0] = start_time;
 	for (day = 1; day <= day_view->days_shown; day++) {
@@ -2289,8 +2315,36 @@ e_day_view_recalc_day_starts (EDayView *day_view,
 
 	day_view->lower = start_time;
 	day_view->upper = day_view->day_starts[day_view->days_shown];
+
+	tt = icaltime_from_timet_with_zone (day_view->day_starts[0], FALSE, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+	g_date_clear (&dt, 1);
+	g_date_set_dmy (&dt, tt.day, tt.month, tt.year);
+	/* To Translators: the %d stands for a week number, it's value between 1 and 52/53 */
+	str = g_strdup_printf (_("Week %d"), g_date_get_iso8601_week_of_year (&dt));
+	gtk_label_set_text (GTK_LABEL (day_view->week_number_label), str);
+	g_free (str);
 }
 
+gboolean
+e_day_view_get_show_week_number (EDayView *day_view)
+{
+	g_return_val_if_fail (day_view != NULL, FALSE);
+
+	return GTK_WIDGET_VISIBLE (day_view->week_number_label);
+}
+
+void
+e_day_view_set_show_week_number (EDayView *day_view, gboolean show)
+{
+	g_return_if_fail (day_view != NULL);
+
+	if (e_day_view_get_show_week_number (day_view) != show) {
+		if (show)
+			gtk_widget_show (day_view->week_number_label);
+		else
+			gtk_widget_hide (day_view->week_number_label);
+	}
+}
 
 /* Whether we are displaying a work-week, in which case the display always
    starts on the first day of the working week. */
@@ -2674,12 +2728,21 @@ e_day_view_update_scroll_regions (EDayView *day_view)
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->main_canvas),
 					NULL, NULL, &old_x2, &old_y2);
 	new_x2 = day_view->main_canvas->allocation.width - 1;
+
+	if (day_view->days_shown == 1)
+		new_x2 = MAX (new_x2, day_view->max_cols * (E_DAY_VIEW_MIN_DAY_COL_WIDTH + E_DAY_VIEW_GAP_WIDTH) - E_DAY_VIEW_MIN_DAY_COL_WIDTH - 1);
+
 	if (old_x2 != new_x2 || old_y2 != new_y2) {
 		need_reshape = TRUE;
 		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->main_canvas),
 						0, 0, new_x2, new_y2);
 	}
 
+	if (new_x2 <= day_view->main_canvas->allocation.width - 1)
+		gtk_widget_hide (day_view->mc_hscrollbar);
+	else
+		gtk_widget_show (day_view->mc_hscrollbar);
+
 	return need_reshape;
 }
 
@@ -3929,7 +3992,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 		dt = day_view->day_starts[day_view->resize_start_row];
 		*date.value = icaltime_from_timet_with_zone (dt, is_date,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
+		cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 		e_cal_component_free_datetime (&ecdt);
 		date.tzid = NULL; /* do not reuse it later */
 	} else {
@@ -3942,7 +4005,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 		dt = day_view->day_starts[day_view->resize_end_row + 1];
 		*date.value = icaltime_from_timet_with_zone (dt, is_date,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
+		cal_comp_set_dtend_with_oldzone (client, comp, &date);
 		e_cal_component_free_datetime (&ecdt);
 		date.tzid = NULL; /* do not reuse it later */
 	}
@@ -3960,12 +4023,12 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 				*date.value = icaltime_from_timet_with_zone (
 					event->comp_data->instance_end, FALSE,
 					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtend (comp, &date);
+				cal_comp_set_dtend_with_oldzone (client, comp, &date);
 			} else {
 				*date.value = icaltime_from_timet_with_zone (
 					event->comp_data->instance_start, FALSE,
 					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtstart (comp, &date);
+				cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 			}
 
 			e_cal_component_set_rdate_list (comp, NULL);
@@ -4025,20 +4088,18 @@ e_day_view_finish_resize (EDayView *day_view)
 	}
 
 	date.value = &itt;
-	/* FIXME: Should probably keep the timezone of the original start
-	   and end times. */
 	date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 
 	if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
 		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
 		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtstart (comp, &date);
+		cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 	} else {
 		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
 		*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		e_cal_component_set_dtend (comp, &date);
+		cal_comp_set_dtend_with_oldzone (client, comp, &date);
 	}
 
 	e_cal_component_commit_sequence (comp);
@@ -4069,12 +4130,12 @@ e_day_view_finish_resize (EDayView *day_view)
 				*date.value = icaltime_from_timet_with_zone (
 					event->comp_data->instance_end, FALSE,
 					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtend (comp, &date);
+				cal_comp_set_dtend_with_oldzone (client, comp, &date);
 			} else {
 				*date.value = icaltime_from_timet_with_zone (
 					event->comp_data->instance_start, FALSE,
 					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-				e_cal_component_set_dtstart (comp, &date);
+				cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 			}
 
 			e_cal_component_set_rdate_list (comp, NULL);
@@ -4265,13 +4326,13 @@ e_day_view_add_event (ECalComponent *comp,
 	return TRUE;
 }
 
-
 /* This lays out the short (less than 1 day) events in the columns.
    Any long events are simply skipped. */
 void
 e_day_view_check_layout (EDayView *day_view)
 {
 	gint day, rows_in_top_display;
+	gint max_cols = -1;
 
 	/* Don't bother if we aren't visible. */
 	if (!E_CALENDAR_VIEW (day_view)->in_focus)
@@ -4281,11 +4342,17 @@ e_day_view_check_layout (EDayView *day_view)
 	e_day_view_ensure_events_sorted (day_view);
 
 	for (day = 0; day < day_view->days_shown; day++) {
-		if (day_view->need_layout[day])
-			e_day_view_layout_day_events (day_view->events[day],
+		if (day_view->need_layout[day]) {
+			gint cols;
+
+			cols = e_day_view_layout_day_events (day_view->events[day],
 						      day_view->rows,
 						      day_view->mins_per_row,
-						      day_view->cols_per_row[day]);
+						      day_view->cols_per_row[day],
+						      day_view->days_shown == 1 ? -1 : E_DAY_VIEW_MULTI_DAY_MAX_COLUMNS);
+
+			max_cols = MAX (cols, max_cols);
+		}
 
 		if (day_view->need_layout[day]
 		    || day_view->need_reshape[day]) {
@@ -4311,13 +4378,17 @@ e_day_view_check_layout (EDayView *day_view)
 		}
 	}
 
-
 	if (day_view->long_events_need_layout
 	    || day_view->long_events_need_reshape)
 		e_day_view_reshape_long_events (day_view);
 
 	day_view->long_events_need_layout = FALSE;
 	day_view->long_events_need_reshape = FALSE;
+
+	if (max_cols != -1 && max_cols != day_view->max_cols) {
+		day_view->max_cols = max_cols;
+		e_day_view_recalc_main_canvas_size (day_view);
+	}
 }
 
 
@@ -4930,13 +5001,6 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 	if (day_view->selection_start_day == -1)
 		return FALSE;
 
-	/* Check if there is room for a new event to be typed in. If there
-	   isn't we don't want to add an event as we will then add a new
-	   event for every key press. */
-	if (!e_day_view_check_if_new_event_fits (day_view)) {
-		return FALSE;
-	}
-
 	/* We only want to start an edit with a return key or a simple
 	   character. */
 	if ((keyval != GDK_Return) &&
@@ -5588,33 +5652,6 @@ e_day_view_top_scroll	(EDayView	*day_view,
 	gtk_adjustment_set_value (adj, new_value);
 }
 
-static gboolean
-e_day_view_check_if_new_event_fits (EDayView *day_view)
-{
-	gint day, start_row, end_row, row;
-
-	day = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_row = day_view->selection_end_row;
-
-	/* Long events always fit, since we keep adding rows to the top
-	   canvas. */
-	if (day != day_view->selection_end_day)
-		return TRUE;
-	if (start_row == 0 && end_row == day_view->rows)
-		return TRUE;
-
-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,
-	   return FALSE. */
-	for (row = start_row; row <= end_row; row++) {
-		if (day_view->cols_per_row[day][row] >= E_DAY_VIEW_MAX_COLUMNS)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-
 void
 e_day_view_ensure_rows_visible (EDayView *day_view,
 				gint start_row,
@@ -6073,10 +6110,10 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
 
 	*date.value = icaltime_from_timet_with_zone (start_dt, FALSE,
 						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtstart (comp, &date);
+	cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 	*date.value = icaltime_from_timet_with_zone (end_dt, FALSE,
 						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-	e_cal_component_set_dtend (comp, &date);
+	cal_comp_set_dtend_with_oldzone (client, comp, &date);
 
 	e_cal_component_commit_sequence (comp);
 
@@ -7449,7 +7486,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 				   the original start and end times. */
 				date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 			}
-			e_cal_component_set_dtstart (comp, &date);
+			cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 
 			if (end_offset == 0)
 				dt = day_view->day_starts[day + num_days];
@@ -7465,7 +7502,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 				   the original start and end times. */
 				date.tzid = icaltimezone_get_tzid (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 			}
-			e_cal_component_set_dtend (comp, &date);
+			cal_comp_set_dtend_with_oldzone (client, comp, &date);
 
 			gtk_drag_finish (context, TRUE, TRUE, time);
 
@@ -7662,11 +7699,11 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
 			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 								     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			e_cal_component_set_dtstart (comp, &date);
+			cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
 			*date.value = icaltime_from_timet_with_zone (dt, FALSE,
 								     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-			e_cal_component_set_dtend (comp, &date);
+			cal_comp_set_dtend_with_oldzone (client, comp, &date);
 			e_cal_component_abort_sequence (comp);
 
 			gtk_drag_finish (context, TRUE, TRUE, time);
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 6f4c0d7da1..1f518198fa 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -45,8 +45,11 @@ G_BEGIN_DECLS
    of a normal event. */
 #define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
 
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
+/* The maximum number of columns of appointments within a day in multi-day view. */
+#define E_DAY_VIEW_MULTI_DAY_MAX_COLUMNS 6
+
+/* minimum width of the event in one-day view in pixels */
+#define E_DAY_VIEW_MIN_DAY_COL_WIDTH	60
 
 /* The width of the gap between appointments. This should be at least
    E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
@@ -204,6 +207,9 @@ struct _EDayView
 	/* scrollbar for top_canvas */
 	GtkWidget *tc_vscrollbar;
 
+	/* horizontal scrollbar for main_canvas */
+	GtkWidget *mc_hscrollbar;
+
 	/* The main canvas where the rest of the appointments are shown. */
 	GtkWidget *main_canvas;
 	GnomeCanvasItem *main_canvas_item;
@@ -214,6 +220,11 @@ struct _EDayView
 
 	GtkWidget *vscrollbar;
 
+	/* label showing week number in upper-left corner */
+	GtkWidget *week_number_label;
+	/* option change notification id for week number */
+	guint wn_notif_id;
+
 	/* S-expression for query and the query object */
 	ECalView *query;
 
@@ -310,6 +321,8 @@ struct _EDayView
 	   Note that there are a maximum of 12 * 24 rows (when a row is 5 mins)
 	   but we don't always have that many rows. */
 	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
+	/* The maximum number of columns from all rows in cols_per_row */
+	gint max_cols;
 
 	/* Sizes of the various time strings. */
 	gint small_hour_widths[24];
@@ -599,9 +612,12 @@ void e_day_view_ensure_rows_visible (EDayView *day_view,
 				     gint start_row,
 				     gint end_row);
 
-
 void e_day_view_update_marcus_bains (EDayView *day_view);
 
+/* Week number in upper-left corner of the day view widget */
+gboolean e_day_view_get_show_week_number (EDayView *day_view);
+void e_day_view_set_show_week_number (EDayView *day_view, gboolean show);
+
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_H_ */
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index bf8ceec3be..ff6aeb92ba 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -2097,7 +2097,7 @@ send_item (EItipControl *itip)
 	comp = get_real_item (itip);
 
 	if (comp != NULL) {
-		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, priv->current_ecal, NULL, NULL, NULL);
+		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, priv->current_ecal, NULL, NULL, NULL, TRUE);
 		g_object_unref (comp);
 		dialog = gtk_message_dialog_new (
 			NULL, 0,
@@ -2152,7 +2152,7 @@ send_freebusy (EItipControl *itip)
 
 		for (l = comp_list; l; l = l->next) {
 			ECalComponent *comp = E_CAL_COMPONENT (l->data);
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, NULL, NULL, NULL);
+			itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, NULL, NULL, NULL, TRUE);
 
 			g_object_unref (comp);
 		}
@@ -2598,7 +2598,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data)
 		g_slist_free (list);
 
 		e_cal_component_rescan (comp);
-		itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, priv->top_level, NULL, NULL);
+		itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, priv->current_ecal, priv->top_level, NULL, NULL, TRUE);
 
 		g_object_unref (comp);
 	}
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index e531a133fa..7683f7a687 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3432,10 +3432,10 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
 
 	*date.value = icaltime_from_timet_with_zone (start_dt, is_all_day,
 						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtstart (comp, &date);
+	cal_comp_set_dtstart_with_oldzone (client, comp, &date);
 	*date.value = icaltime_from_timet_with_zone (end_dt, is_all_day,
 						     e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-	e_cal_component_set_dtend (comp, &date);
+	cal_comp_set_dtend_with_oldzone (client, comp, &date);
 
 	e_cal_component_commit_sequence (comp);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 3ff2944752..40b36aa154 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1328,6 +1328,20 @@ gnome_calendar_get_tag (GnomeCalendar *gcal)
 	return GTK_WIDGET (gcal->priv->date_navigator);
 }
 
+static time_t
+gc_get_default_time (ECalModel *model, gpointer user_data)
+{
+	GnomeCalendar *gcal = user_data;
+	time_t res = 0, end;
+
+	g_return_val_if_fail (model != NULL, 0);
+	g_return_val_if_fail (GNOME_IS_CALENDAR (user_data), 0);
+
+	gnome_calendar_get_current_time_range (gcal, &res, &end);
+
+	return res;
+}
+
 static void
 setup_widgets (GnomeCalendar *gcal)
 {
@@ -1511,6 +1525,8 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_widget_show (label);
 	gtk_widget_show (vbox);
 
+	e_cal_model_set_default_time_func (e_memo_table_get_model (E_MEMO_TABLE (priv->memo)), gc_get_default_time, gcal);
+
 	update_memo_view (gcal);
 }
 
@@ -2138,7 +2154,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	source = e_cal_get_source (ecal);
 	state = e_cal_get_load_state (ecal);
 
-	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
 		auth_cal_forget_password (ecal);
 
 	switch (status) {
@@ -2164,17 +2180,10 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 
 		status = E_CALENDAR_STATUS_OK;
 		break;
-	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED: 
-		{
-			const gchar *auth_domain = e_source_get_property (source, "auth-domain");
-			const gchar *component_name;
-			
-			component_name = auth_domain ? auth_domain : "Calendar";
-
-			/* Warn the user password is wrong */
-			e_passwords_forget_password (component_name, e_cal_get_uri(ecal));
-			return;
-		}
+	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+		/* try to reopen calendar - it'll ask for a password once again */
+		e_cal_open_async (ecal, FALSE);
+		return;
 	case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
 		/* check to see if we have dialog already running for this operation */
 		id = g_strdup ("calendar:unable-to-load-the-calendar");
@@ -2232,6 +2241,9 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 	source = e_cal_get_source (ecal);
 	state = e_cal_get_load_state (ecal);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (ecal);
+
 	switch (status) {
 	case E_CALENDAR_STATUS_OK:
 		break;
@@ -2239,13 +2251,18 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		if (state == E_CAL_LOAD_NOT_LOADED)
 			e_cal_open_async (ecal, FALSE);
 		return;
-	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION :
+	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+		/* try to reopen calendar - it'll ask for a password once again */
+		e_cal_open_async (ecal, FALSE);
+		return;
+	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
 		e_error_run (NULL, "calendar:server-version", NULL);
-		status = E_CALENDAR_STATUS_OK;
 	default:
 		/* Make sure the source doesn't disappear on us */
 		g_object_ref (source);
 
+		g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, gcal);
+
 		/* FIXME should we do this to prevent multiple error dialogs? */
 		priv->clients_list = g_list_remove (priv->clients_list, ecal);
 		g_hash_table_remove (priv->clients, e_source_peek_uid (source));
@@ -2265,7 +2282,6 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
 
-
 	e_cal_model_set_default_client (
 		e_calendar_view_get_model (
 		E_CALENDAR_VIEW (priv->views[priv->current_view_type])),
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index e879a9b440..17a5d97fb5 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1023,7 +1023,7 @@ comp_minimal (ECalComponent *comp, gboolean attendee)
 }
 
 static ECalComponent *
-comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones)
+comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones, gboolean strip_alarms)
 {
 	ECalComponent *clone, *temp_clone;
 	struct icaltimetype itt;
@@ -1080,8 +1080,31 @@ comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *clien
 		e_cal_component_free_recur_list (rrule_list);
 	}
 
-	/* We delete incoming alarms anyhow, and this helps with outlook */
-	e_cal_component_remove_all_alarms (clone);
+	/* We delete incoming alarms if requested, even this helps with outlook */
+	if (strip_alarms) {
+		e_cal_component_remove_all_alarms (clone);
+	} else {
+		/* Always strip procedure alarms, because of security */
+		GList *uids, *l;
+
+		uids = e_cal_component_get_alarm_uids (clone);
+
+		for (l = uids; l; l = l->next) {
+			ECalComponentAlarm *alarm;
+			ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN;
+
+			alarm = e_cal_component_get_alarm (clone, (const char *)l->data);
+			if (alarm) {
+				e_cal_component_alarm_get_action (alarm, &action);
+				e_cal_component_alarm_free (alarm);
+
+				if (action == E_CAL_COMPONENT_ALARM_PROCEDURE)
+					e_cal_component_remove_alarm (clone, (const char *)l->data);
+			}
+		}
+
+		cal_obj_uid_list_free (uids);
+	}
 
 	/* Strip X-LIC-ERROR stuff */
 	e_cal_component_strip_errors (clone);
@@ -1164,7 +1187,7 @@ append_cal_attachments (EMsgComposer *composer,
 
 gboolean
 itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
-		ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users)
+		ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users, gboolean strip_alarms)
 {
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
@@ -1197,7 +1220,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 	}
 
 	/* Tidy up the comp */
-	comp = comp_compliant (method, send_comp, client, zones);
+	comp = comp_compliant (method, send_comp, client, zones, strip_alarms);
 
 	if (comp == NULL)
 		goto cleanup;
@@ -1312,7 +1335,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	gboolean retval = FALSE;
 
 	/* Tidy up the comp */
-	comp = comp_compliant (method, send_comp, client, zones);
+	comp = comp_compliant (method, send_comp, client, zones, TRUE);
 	if (comp == NULL)
 		goto cleanup;
 
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index c41171cfe4..3c84af929f 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -58,7 +58,7 @@ const gchar *itip_strip_mailto (const gchar *address);
 char *itip_get_comp_attendee (ECalComponent *comp, ECal *client);
 
 gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp,
-			 ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users);
+			 ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users, gboolean strip_alarms);
 
 gboolean itip_publish_comp (ECal *client, gchar* uri, gchar* username,
 			    gchar* password, ECalComponent **pub_comp);
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index dcd9672ec7..f448b4704d 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1062,13 +1062,33 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *
 	return top;
 }
 
+static char *
+get_summary_with_location (icalcomponent *icalcomp)
+{
+	const gchar *summary, *location;
+	char *text;
+
+	g_return_val_if_fail (icalcomp != NULL, NULL);
+
+	summary = icalcomponent_get_summary (icalcomp);
+	text = summary ? (char*) summary : "";
+
+	location = icalcomponent_get_location (icalcomp);
+	if (location && *location) {
+		text = g_strdup_printf ("%s (%s)", text, location);
+	} else {
+		text = g_strdup (text);
+	}
+
+	return text;
+}
+
 static void
 print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		      double left, double right, double top, double bottom,
 		      double row_height, EDayViewEvent *event,
 		      struct pdinfo *pdi, ECalModel *model)
 {
-	const gchar *summary;
 	double x1, x2, y1, y2;
 	double left_triangle_width = -1.0, right_triangle_width = -1.0;
 	char *text;
@@ -1134,12 +1154,13 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 	}
 
 	/* Print the text. */
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
+	text = get_summary_with_location (event->comp_data->icalcomp);
 
 	x1 += 4;
 	x2 -= 4;
 	print_text (context, font, text, PANGO_ALIGN_CENTER, x1, x2, y1, y2);
+
+	g_free (text);
 }
 
 
@@ -1148,11 +1169,10 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		 double left, double right, double top, double bottom,
 		 EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
 {
-	const gchar *summary, *location;
 	double x1, x2, y1, y2, col_width, row_height;
 	int start_offset, end_offset, start_row, end_row;
 	char *text, start_buffer[32], end_buffer[32];
-	gboolean display_times = FALSE, free_text = FALSE;
+	gboolean display_times = FALSE;
 	struct tm date_tm;
 	double red, green, blue;
 
@@ -1188,14 +1208,7 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
 	print_border_rgb (context, x1, x2, y1, y2, 1.0, red, green, blue);
 
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
-
-	location = icalcomponent_get_location (event->comp_data->icalcomp);
-	if (location && *location) {
-		text = g_strdup_printf ("%s (%s)", text, location);
-		free_text = TRUE;
-	}
+	text = get_summary_with_location (event->comp_data->icalcomp);
 
 	if (display_times) {
 		gchar *t = NULL;
@@ -1217,22 +1230,16 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		e_time_format_time (&date_tm, pdi->use_24_hour_format, FALSE,
 				    end_buffer, sizeof (end_buffer));
 
-		if (free_text)
-			t = text;
-
+		t = text;
 		text = g_strdup_printf ("%s - %s %s ", start_buffer,
 					end_buffer, text);
 
-		free_text = TRUE;
-
-		if (t)
-			g_free (t);
+		g_free (t);
 	}
 
 	bound_text (context, font, text, -1, x1 + 2, y1, x2 - 2, y2, FALSE, NULL, NULL);
 
-	if (free_text)
-		g_free (text);
+	g_free (text);
 }
 
 
@@ -1337,7 +1344,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 
 	/* lay out the short events, within the day. */
 	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,
-				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row);
+				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row, -1);
 
 	/* print the short events. */
 	if (top > bottom )
@@ -1497,15 +1504,13 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 {
 	EWeekViewEventSpan *span;
 	gint span_num;
-	const gchar *summary;
 	char *text;
 	int num_days, start_x, start_y, start_h, end_x, end_y, end_h;
 	double x1, x2, y1, y2;
 	double red, green, blue;
 	GdkPixbuf *pixbuf = NULL;
 
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char*) summary : "";
+	text = get_summary_with_location (event->comp_data->icalcomp);
 
 	for (span_num = 0; span_num < event->num_spans; span_num++) {
 		span = &g_array_index (spans, EWeekViewEventSpan,
@@ -1610,6 +1615,8 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 
 	if (pixbuf)
 		g_object_unref (pixbuf);
+
+	g_free (text);
 }
 
 
diff --git a/calendar/modules/e-cal-shell-content.c b/calendar/modules/e-cal-shell-content.c
index cc1f1ca879..f0d2024f9b 100644
--- a/calendar/modules/e-cal-shell-content.c
+++ b/calendar/modules/e-cal-shell-content.c
@@ -473,7 +473,7 @@ cal_shell_content_constructed (GObject *object)
 	container = priv->vpaned;
 
 	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_paned_pack1 (GTK_PANED (container), widget, FALSE, FALSE);
 	gtk_widget_show (widget);
 
 	container = widget;
@@ -501,7 +501,7 @@ cal_shell_content_constructed (GObject *object)
 	container = priv->vpaned;
 
 	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, FALSE);
 	gtk_widget_show (widget);
 
 	container = widget;
diff --git a/calendar/modules/e-cal-shell-sidebar.c b/calendar/modules/e-cal-shell-sidebar.c
index 312cb8649c..ee887cecba 100644
--- a/calendar/modules/e-cal-shell-sidebar.c
+++ b/calendar/modules/e-cal-shell-sidebar.c
@@ -172,6 +172,10 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -186,6 +190,10 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
 				cal_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-cal-shell-view-actions.c b/calendar/modules/e-cal-shell-view-actions.c
index 8b0f0df65b..bc2f38e5bd 100644
--- a/calendar/modules/e-cal-shell-view-actions.c
+++ b/calendar/modules/e-cal-shell-view-actions.c
@@ -1038,6 +1038,9 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 	gtk_action_group_add_actions (
 		action_group, calendar_entries,
 		G_N_ELEMENTS (calendar_entries), cal_shell_view);
+	e_action_group_add_popup_actions (
+		action_group, calendar_popup_entries,
+		G_N_ELEMENTS (calendar_popup_entries));
 	gtk_action_group_add_radio_actions (
 		action_group, calendar_view_entries,
 		G_N_ELEMENTS (calendar_view_entries), GNOME_CAL_DAY_VIEW,
diff --git a/calendar/modules/e-cal-shell-view-memopad.c b/calendar/modules/e-cal-shell-view-memopad.c
index b78bdd1c50..c30d3cfa5c 100644
--- a/calendar/modules/e-cal-shell-view-memopad.c
+++ b/calendar/modules/e-cal-shell-view-memopad.c
@@ -88,7 +88,6 @@ action_calendar_memopad_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
@@ -102,9 +101,10 @@ action_calendar_memopad_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected memo. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-cal-shell-view-taskpad.c b/calendar/modules/e-cal-shell-view-taskpad.c
index 651cf1e878..c04ce2c6d1 100644
--- a/calendar/modules/e-cal-shell-view-taskpad.c
+++ b/calendar/modules/e-cal-shell-view-taskpad.c
@@ -111,7 +111,6 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
@@ -125,9 +124,10 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected task. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-memo-shell-sidebar.c b/calendar/modules/e-memo-shell-sidebar.c
index d676a9bf58..4dcff2ff35 100644
--- a/calendar/modules/e-memo-shell-sidebar.c
+++ b/calendar/modules/e-memo-shell-sidebar.c
@@ -194,6 +194,10 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -208,6 +212,10 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
 				memo_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-memo-shell-view-actions.c b/calendar/modules/e-memo-shell-view-actions.c
index 98f8569425..4f487b7e7d 100644
--- a/calendar/modules/e-memo-shell-view-actions.c
+++ b/calendar/modules/e-memo-shell-view-actions.c
@@ -109,7 +109,6 @@ action_memo_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	memo_shell_content = memo_shell_view->priv->memo_shell_content;
@@ -123,9 +122,10 @@ action_memo_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected memo. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-task-shell-sidebar.c b/calendar/modules/e-task-shell-sidebar.c
index 6f2f1bb409..9631321edb 100644
--- a/calendar/modules/e-task-shell-sidebar.c
+++ b/calendar/modules/e-task-shell-sidebar.c
@@ -167,6 +167,10 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -181,6 +185,10 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
 				task_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-task-shell-view-actions.c b/calendar/modules/e-task-shell-view-actions.c
index 8e1695afa2..c59c55bd17 100644
--- a/calendar/modules/e-task-shell-view-actions.c
+++ b/calendar/modules/e-task-shell-view-actions.c
@@ -156,7 +156,6 @@ action_task_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
@@ -170,9 +169,10 @@ action_task_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected task. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/configure.in b/configure.in
index 0ebb69820f..73867d042d 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ GTKHTML_PACKAGE=3.14
 # Required Packages
 m4_define([glib_minimum_version], [2.18.0])
 m4_define([gtk_minimum_version], [2.14.0])
-m4_define([eds_minimum_version], [2.25.5])
+m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libbonoboui_minimum_version], [2.4.2])
@@ -1763,7 +1763,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar copy-tool mail-to-task audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
+plugins_standard_always="bbdb subject-thread save-calendar copy-tool mail-to-task audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import"
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
@@ -1795,6 +1795,7 @@ dnl mark-all-read
 dnl mono
 dnl plugin-manager
 dnl prefer-plain
+dnl pst-import
 dnl publish-calendar
 dnl python
 dnl startup-wizard
@@ -1906,6 +1907,23 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
 	fi
 fi
 
+if echo ${plugins_enabled} | grep "pst-import" > /dev/null
+then
+	if ${PKG_CONFIG} --exists libpst
+	then
+		dnl *********************
+		dnl libpst
+		dnl *********************
+		PKG_CHECK_MODULES(LIBPST, libpst)
+		AC_SUBST(LIBPST_CFLAGS)
+		AC_SUBST(LIBPST_LIBS)
+	else
+		plugins_enabled=`echo $plugins_enabled | sed -e "s/pst-import//g"`
+		echo "warning: libpst was not found, pst-import plugin will not be built."
+		echo "you are probably missing libpst-devel package."
+	fi
+fi
+
 dnl ***********
 dnl GConf stuff
 dnl ***********
@@ -2109,6 +2127,7 @@ plugins/import-ics-attachments/Makefile
 plugins/imap-features/Makefile
 plugins/tnef-attachments/Makefile
 plugins/templates/Makefile
+plugins/pst-import/Makefile
 plugins/face/Makefile
 plugins/external-editor/Makefile
 plugins/webdav-account-setup/Makefile
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 365589f575..5fc6526a85 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-15  Milan Crha  <mcrha@redhat.com>
+
+	* e-plugin.c: (epl_construct): Compiler warning fix.
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-error.c (ee_response):
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 7d778b59e0..d43238be0a 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -1100,7 +1100,7 @@ epl_construct(EPlugin *ep, xmlNodePtr root)
 
 		tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup");
 		if (tmp) {
-			if (strcmp (tmp, "after-ui") == 0) {
+			if (strcmp ((const char *)tmp, "after-ui") == 0) {
 				missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep));
 			} else {
 				if (epl_loadmodule(ep, FALSE) != 0) {
diff --git a/help/C/figures/account_editor_a.png b/help/C/figures/account_editor_a.png
index 86ad827e0e..08e014df09 100644
--- a/help/C/figures/account_editor_a.png
+++ b/help/C/figures/account_editor_a.png
diff --git a/help/C/figures/attach_reminder_a.png b/help/C/figures/attach_reminder_a.png
index b04316b84e..ece72f24ee 100644
--- a/help/C/figures/attach_reminder_a.png
+++ b/help/C/figures/attach_reminder_a.png
diff --git a/help/C/figures/evo_newmess_a.png b/help/C/figures/evo_newmess_a.png
index 737cc29710..7c566cf631 100755
--- a/help/C/figures/evo_newmess_a.png
+++ b/help/C/figures/evo_newmess_a.png
diff --git a/help/C/figures/google_cal_view.png b/help/C/figures/google_cal_view.png
index 01c80e81f6..c468f29eb2 100644
--- a/help/C/figures/google_cal_view.png
+++ b/help/C/figures/google_cal_view.png
diff --git a/help/ChangeLog b/help/ChangeLog
index b30e516b6e..60da43a3fc 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation.
+
+2009-01-16  Johnny Jacob  <jjohnny@novell.com>
+	
+	** Committed on behalf of PC Radhika <pradhika@novell.com>
+	
+	* C/figures/account_editor_a.png:
+	* C/figures/attach_reminder_a.png:
+	* C/figures/evo_newmess_a.png:
+	* C/figures/google_cal_view.png: 
+	Updated screenshots.
+
 2009-01-11  Andre Klapper  <a9016009@gmx.de>
 
 	* C/evolution.xml: Sync two strings. Remove explicit mentioning
diff --git a/help/es/es.po b/help/es/es.po
index c2de7f4723..a8c03e7b3b 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.help.HEAD\n"
-"POT-Creation-Date: 2009-01-03 23:15+0000\n"
-"PO-Revision-Date: 2009-01-06 17:47+0100\n"
+"POT-Creation-Date: 2009-01-16 12:38+0000\n"
+"PO-Revision-Date: 2009-01-19 19:10+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:414(None)
+#: C/evolution.xml:428(None)
 msgid ""
 "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:424(None)
+#: C/evolution.xml:438(None)
 msgid ""
 "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 msgstr ""
@@ -55,7 +55,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:465(None)
+#: C/evolution.xml:479(None)
 msgid ""
 "@@image: 'figures/evo_imapreceive_a.png'; "
 "md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:508(None)
+#: C/evolution.xml:522(None)
 msgid ""
 "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:530(None)
+#: C/evolution.xml:544(None)
 msgid ""
 "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 msgstr ""
@@ -81,7 +81,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:580(None)
+#: C/evolution.xml:594(None)
 msgid ""
 "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 msgstr ""
@@ -89,7 +89,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:601(None)
+#: C/evolution.xml:615(None)
 msgid ""
 "@@image: 'figures/evo_maildirreceive_a.png'; "
 "md5=bdd9dfc00800338dc906e2fd12b07f62"
@@ -99,7 +99,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:623(None) C/evolution.xml:646(None)
+#: C/evolution.xml:637(None) C/evolution.xml:660(None)
 msgid ""
 "@@image: 'figures/evo_mboxreceive_a.png'; "
 "md5=a04753f7615eab6ac349f50caa39a7a8"
@@ -109,7 +109,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:674(None)
+#: C/evolution.xml:688(None)
 msgid ""
 "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 msgstr ""
@@ -117,7 +117,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:721(None)
+#: C/evolution.xml:735(None)
 msgid ""
 "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:749(None)
+#: C/evolution.xml:763(None)
 msgid ""
 "@@image: 'figures/evo_mail_callout_a.png'; "
 "md5=4fa6dda9663d554197736dd2feb79575"
@@ -135,14 +135,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:924(None)
+#: C/evolution.xml:938(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 msgstr ""
 "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:942(None)
+#: C/evolution.xml:956(None)
 msgid ""
 "@@image: 'figures/evo_cal_callout_a.png'; "
 "md5=6de000ad9c7b3fe42ed1996cad46432f"
@@ -152,7 +152,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:962(None)
+#: C/evolution.xml:976(None)
 msgid ""
 "@@image: 'figures/contacts_mainwindow_a.png'; "
 "md5=41335f17f056cb0b06e3df4900d08865"
@@ -162,14 +162,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:976(None)
+#: C/evolution.xml:990(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 msgstr ""
 "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:979(None)
+#: C/evolution.xml:993(None)
 msgid ""
 "@@image: 'figures/evo_backup_warning.png'; "
 "md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
@@ -179,7 +179,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:987(None)
+#: C/evolution.xml:1001(None)
 msgid ""
 "@@image: 'figures/evo_backup_prgsbar.png'; "
 "md5=046642d35e096154508269063d672b07"
@@ -189,7 +189,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1005(None)
+#: C/evolution.xml:1019(None)
 msgid ""
 "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 msgstr ""
@@ -197,7 +197,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1177(None)
+#: C/evolution.xml:1191(None)
 msgid ""
 "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1179(None)
+#: C/evolution.xml:1193(None)
 msgid ""
 "@@image: 'figures/evo_mailnotification.png'; "
 "md5=3ec09c3f9b49aee5be6f5fc2df69350d"
@@ -215,14 +215,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1249(None)
+#: C/evolution.xml:1263(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 msgstr ""
 "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1259(None)
+#: C/evolution.xml:1273(None)
 msgid ""
 "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 msgstr ""
@@ -230,15 +230,17 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1429(None)
+#: C/evolution.xml:1443(None)
+#| msgid ""
+#| "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 msgid ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+"@@image: 'figures/evo_newmess_a.png'; md5=7349234fd8d9d8085745b8c101e6e1ce"
 msgstr ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+"@@image: 'figures/evo_newmess_a.png'; md5=7349234fd8d9d8085745b8c101e6e1ce"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1487(None)
+#: C/evolution.xml:1501(None)
 msgid ""
 "@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
 msgstr ""
@@ -246,7 +248,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1495(None)
+#: C/evolution.xml:1509(None)
 msgid ""
 "@@image: 'figures/evo_custom_header.png'; "
 "md5=10dfa4db26e3354551653fffb9ec23de"
@@ -256,7 +258,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1541(None)
+#: C/evolution.xml:1555(None)
 msgid ""
 "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 msgstr ""
@@ -264,17 +266,20 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1585(None)
+#: C/evolution.xml:1599(None)
+#| msgid ""
+#| "@@image: 'figures/attach_reminder_a.png'; "
+#| "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 msgid ""
 "@@image: 'figures/attach_reminder_a.png'; "
-"md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
+"md5=e0c90f77e6df9ad52589af09fdbbfdd7"
 msgstr ""
 "@@image: 'figures/attach_reminder_a.png'; "
-"md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
+"md5=e0c90f77e6df9ad52589af09fdbbfdd7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1598(None)
+#: C/evolution.xml:1612(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -284,7 +289,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1926(None)
+#: C/evolution.xml:1940(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -294,15 +299,18 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1966(None)
+#: C/evolution.xml:1980(None)
+#| msgid ""
+#| "@@image: 'figures/account_editor_a.png'; "
+#| "md5=cd9c4e71a53f8f03424c1432d7d46e30"
 msgid ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+"@@image: 'figures/account_editor_a.png'; md5=9d0ad61b553325e9a85ea074fa091703"
 msgstr ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+"@@image: 'figures/account_editor_a.png'; md5=9d0ad61b553325e9a85ea074fa091703"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2511(None)
+#: C/evolution.xml:2525(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -312,7 +320,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2538(None)
+#: C/evolution.xml:2552(None)
 msgid ""
 "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 msgstr ""
@@ -320,7 +328,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2689(None)
+#: C/evolution.xml:2703(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -330,7 +338,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2706(None)
+#: C/evolution.xml:2720(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -340,7 +348,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2709(None)
+#: C/evolution.xml:2723(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -350,7 +358,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2872(None)
+#: C/evolution.xml:2886(None)
 msgid ""
 "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 msgstr ""
@@ -358,7 +366,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2902(None)
+#: C/evolution.xml:2916(None)
 msgid ""
 "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 msgstr ""
@@ -366,7 +374,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2908(None)
+#: C/evolution.xml:2922(None)
 msgid ""
 "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 msgstr ""
@@ -374,7 +382,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2935(None)
+#: C/evolution.xml:2949(None)
 msgid ""
 "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 msgstr ""
@@ -382,14 +390,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3183(None)
+#: C/evolution.xml:3197(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 msgstr ""
 "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3274(None)
+#: C/evolution.xml:3288(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -399,7 +407,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3364(None)
+#: C/evolution.xml:3378(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -409,7 +417,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3402(None)
+#: C/evolution.xml:3416(None)
 msgid ""
 "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 msgstr ""
@@ -417,7 +425,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3423(None)
+#: C/evolution.xml:3437(None)
 msgid ""
 "@@image: 'figures/evo_googlecontacts.png'; "
 "md5=2357233124d1191cdbb2279f6f998207"
@@ -427,7 +435,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3708(None)
+#: C/evolution.xml:3722(None)
 msgid ""
 "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 msgstr ""
@@ -435,13 +443,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3863(None)
+#: C/evolution.xml:3877(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 msgstr "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3886(None)
+#: C/evolution.xml:3900(None)
 msgid ""
 "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 msgstr ""
@@ -449,15 +457,18 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3918(None)
+#: C/evolution.xml:3932(None)
+#| msgid ""
+#| "@@image: 'figures/google_cal_view.png'; "
+#| "md5=6574c207d4b219a80da96982ee650ce2"
 msgid ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+"@@image: 'figures/google_cal_view.png'; md5=50704b4e631ffa57879880836f464a51"
 msgstr ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+"@@image: 'figures/google_cal_view.png'; md5=50704b4e631ffa57879880836f464a51"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4017(None)
+#: C/evolution.xml:4031(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -467,7 +478,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4085(None)
+#: C/evolution.xml:4099(None)
 msgid ""
 "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 msgstr ""
@@ -475,15 +486,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4281(None) C/evolution.xml:5556(None)
-#: C/evolution.xml:5942(None)
+#: C/evolution.xml:4295(None) C/evolution.xml:5568(None)
+#: C/evolution.xml:5954(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4377(None) C/evolution.xml:4691(None)
-#: C/evolution.xml:4929(None)
+#: C/evolution.xml:4391(None) C/evolution.xml:4705(None)
+#: C/evolution.xml:4943(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -493,14 +504,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4840(None)
+#: C/evolution.xml:4854(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 msgstr ""
 "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5236(None)
+#: C/evolution.xml:5250(None)
 msgid ""
 "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr ""
@@ -508,7 +519,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5241(None)
+#: C/evolution.xml:5255(None)
 msgid ""
 "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 msgstr ""
@@ -516,7 +527,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5248(None)
+#: C/evolution.xml:5262(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -526,7 +537,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5262(None)
+#: C/evolution.xml:5276(None)
 msgid ""
 "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 msgstr ""
@@ -534,7 +545,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5270(None)
+#: C/evolution.xml:5283(None)
 msgid ""
 "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 msgstr ""
@@ -542,7 +553,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5278(None)
+#: C/evolution.xml:5290(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -552,7 +563,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5311(None) C/evolution.xml:5548(None)
+#: C/evolution.xml:5323(None) C/evolution.xml:5560(None)
 msgid ""
 "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 msgstr ""
@@ -560,7 +571,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5353(None)
+#: C/evolution.xml:5365(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -570,13 +581,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5433(None)
+#: C/evolution.xml:5445(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5442(None)
+#: C/evolution.xml:5454(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -586,7 +597,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5477(None)
+#: C/evolution.xml:5489(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -596,7 +607,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5507(None)
+#: C/evolution.xml:5519(None)
 msgid ""
 "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 msgstr ""
@@ -604,7 +615,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5836(None)
+#: C/evolution.xml:5848(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -614,7 +625,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5844(None)
+#: C/evolution.xml:5856(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -624,7 +635,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5857(None)
+#: C/evolution.xml:5869(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -634,7 +645,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5903(None)
+#: C/evolution.xml:5915(None)
 msgid ""
 "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 msgstr ""
@@ -642,7 +653,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5935(None)
+#: C/evolution.xml:5947(None)
 msgid ""
 "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
@@ -651,7 +662,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6006(None)
+#: C/evolution.xml:6018(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -661,7 +672,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6061(None)
+#: C/evolution.xml:6072(None)
 msgid ""
 "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 msgstr ""
@@ -669,7 +680,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6119(None)
+#: C/evolution.xml:6131(None)
 msgid ""
 "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 msgstr ""
@@ -677,7 +688,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6260(None)
+#: C/evolution.xml:6272(None)
 msgid ""
 "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
@@ -686,7 +697,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6283(None)
+#: C/evolution.xml:6295(None)
 msgid ""
 "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 msgstr ""
@@ -694,13 +705,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6292(None)
+#: C/evolution.xml:6304(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6435(None)
+#: C/evolution.xml:6447(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
 "md5=ad0be84fb36edefd01851653b69b65bb"
@@ -710,7 +721,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6537(None)
+#: C/evolution.xml:6552(None)
 msgid ""
 "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 msgstr ""
@@ -718,7 +729,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6632(None)
+#: C/evolution.xml:6647(None)
 msgid ""
 "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 msgstr ""
@@ -726,7 +737,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6658(None)
+#: C/evolution.xml:6673(None)
 msgid ""
 "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 msgstr ""
@@ -734,14 +745,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6703(None)
+#: C/evolution.xml:6718(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 msgstr ""
 "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6894(None)
+#: C/evolution.xml:6909(None)
 msgid ""
 "@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
 msgstr ""
@@ -749,7 +760,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:7171(None)
+#: C/evolution.xml:7186(None)
 msgid ""
 "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 msgstr ""
@@ -757,7 +768,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:7323(None)
+#: C/evolution.xml:7337(None)
 msgid ""
 "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 msgstr ""
@@ -825,8 +836,8 @@ msgstr ""
 "Una guía de usuario para Evolution que explica como usar sus características "
 "de correo, calendario, libreta de direcciones y listas de tareas."
 
-#: C/evolution.xml:72(productname) C/evolution.xml:5740(para)
-#: C/evolution.xml:7522(glossterm)
+#: C/evolution.xml:72(productname) C/evolution.xml:5752(para)
+#: C/evolution.xml:7521(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -834,7 +845,7 @@ msgstr "Evolution"
 msgid "February 2008"
 msgstr "Febrero de 2008"
 
-#: C/evolution.xml:75(title) C/evolution.xml:7713(para)
+#: C/evolution.xml:75(title) C/evolution.xml:7712(para)
 msgid "Evolution 2.24 User Guide"
 msgstr "Guía de usuario de Evolution 2.24"
 
@@ -856,57 +867,57 @@ msgstr ""
 msgid "Getting Started"
 msgstr "Inicio"
 
-#: C/evolution.xml:87(link) C/evolution.xml:1103(title)
+#: C/evolution.xml:87(link) C/evolution.xml:1117(title)
 msgid "Sending and Receiving Email"
 msgstr "Enviar y recibir correo"
 
-#: C/evolution.xml:90(link) C/evolution.xml:2414(title)
+#: C/evolution.xml:90(link) C/evolution.xml:2428(title)
 msgid "Organizing Your Email"
 msgstr "Organizar su correo electrónico"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:93(link) C/evolution.xml:3305(title)
+#: C/evolution.xml:93(link) C/evolution.xml:3319(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Contactos de Evolution: la libreta de direcciones"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:96(link) C/evolution.xml:3764(title)
+#: C/evolution.xml:96(link) C/evolution.xml:3778(title)
 msgid "Evolution Calendar"
 msgstr "Calendario de Evolution"
 
-#: C/evolution.xml:99(link) C/evolution.xml:5057(title)
+#: C/evolution.xml:99(link) C/evolution.xml:5071(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Conexión a servidores Exchange"
 
-#: C/evolution.xml:102(link) C/evolution.xml:5612(title)
+#: C/evolution.xml:102(link) C/evolution.xml:5624(title)
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-#: C/evolution.xml:105(link) C/evolution.xml:6406(title)
+#: C/evolution.xml:105(link) C/evolution.xml:6418(title)
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: C/evolution.xml:108(link) C/evolution.xml:7185(title)
+#: C/evolution.xml:108(link) C/evolution.xml:7199(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Sincronización de Evolution con dispositivos portátiles"
 
-#: C/evolution.xml:111(link) C/evolution.xml:7242(title)
+#: C/evolution.xml:111(link) C/evolution.xml:7256(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migrar de Outlook a Evolution"
 
-#: C/evolution.xml:114(link) C/evolution.xml:7304(title)
+#: C/evolution.xml:114(link) C/evolution.xml:7318(title)
 msgid "Quick Reference"
 msgstr "Referencia rápida"
 
-#: C/evolution.xml:117(link) C/evolution.xml:7418(title)
+#: C/evolution.xml:117(link) C/evolution.xml:7432(title)
 msgid "Known Bugs and Limitations"
 msgstr "Fallos conocidos y limitaciones"
 
-#: C/evolution.xml:120(link) C/evolution.xml:7424(title)
+#: C/evolution.xml:120(link) C/evolution.xml:7438(title)
 msgid "Authors"
 msgstr "Autores"
 
-#: C/evolution.xml:123(link) C/evolution.xml:7483(title)
+#: C/evolution.xml:123(link) C/evolution.xml:7482(title)
 msgid "Glossary"
 msgstr "Glosario"
 
@@ -968,7 +979,7 @@ msgstr ""
 msgid "Starting Evolution for the First Time"
 msgstr "Inicio de Evolution por primera vez"
 
-#: C/evolution.xml:152(link) C/evolution.xml:747(title)
+#: C/evolution.xml:152(link) C/evolution.xml:761(title)
 msgid "Using Evolution: An Overview"
 msgstr "Uso de Evolution: Una vista general"
 
@@ -1055,21 +1066,21 @@ msgstr "Definición de su identidad"
 msgid "Receiving Mail"
 msgstr "Recepción de correo"
 
-#: C/evolution.xml:210(link) C/evolution.xml:349(title)
+#: C/evolution.xml:210(link) C/evolution.xml:363(title)
 msgid "Receiving Mail Options"
 msgstr "Opciones de recepción de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:213(link) C/evolution.xml:655(title)
+#: C/evolution.xml:213(link) C/evolution.xml:669(title)
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: C/evolution.xml:216(link) C/evolution.xml:709(title)
+#: C/evolution.xml:216(link) C/evolution.xml:723(title)
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: C/evolution.xml:219(link) C/evolution.xml:715(title)
+#: C/evolution.xml:219(link) C/evolution.xml:729(title)
 msgid "Time Zone"
 msgstr "Zona horaria"
 
@@ -1133,14 +1144,14 @@ msgstr ""
 "Esta es la compañía para la que trabaja o la organización a la que "
 "representa cuando escribe correo-e."
 
-#: C/evolution.xml:248(para) C/evolution.xml:335(para)
-#: C/evolution.xml:413(para) C/evolution.xml:456(para)
-#: C/evolution.xml:500(para) C/evolution.xml:522(para)
-#: C/evolution.xml:546(para) C/evolution.xml:561(para)
-#: C/evolution.xml:579(para) C/evolution.xml:600(para)
-#: C/evolution.xml:622(para) C/evolution.xml:645(para)
-#: C/evolution.xml:701(para) C/evolution.xml:2481(para)
-#: C/evolution.xml:2503(para)
+#: C/evolution.xml:248(para) C/evolution.xml:349(para)
+#: C/evolution.xml:427(para) C/evolution.xml:470(para)
+#: C/evolution.xml:514(para) C/evolution.xml:536(para)
+#: C/evolution.xml:560(para) C/evolution.xml:575(para)
+#: C/evolution.xml:593(para) C/evolution.xml:614(para)
+#: C/evolution.xml:636(para) C/evolution.xml:659(para)
+#: C/evolution.xml:715(para) C/evolution.xml:2495(para)
+#: C/evolution.xml:2517(para)
 msgid "Click Forward."
 msgstr "Pulse «Adelante»."
 
@@ -1175,169 +1186,204 @@ msgstr "Novell GroupWise:"
 
 #: C/evolution.xml:264(para)
 msgid ""
-"Select this option if you connect to Novell <trademark class=\"registered"
-"\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
-"contact information on the server. For configuration instructions, see <link "
-"linkend=\"bstfw13\">Remote Configuration Options</link>."
+"Select this option if you connect to a Novell <trademark class=\"registered"
+"\">GroupWise</trademark> server."
+msgstr ""
+"Seleccione esta opción si se conecta a un servidor Novell <trademark class="
+"\"registered\">GroupWise</trademark>."
+
+#: C/evolution.xml:265(para) C/evolution.xml:271(para)
+#| msgid ""
+#| "It fetches the remote calendar and contact information and stores it on "
+#| "your local drive."
+msgid "Email, calendar, and contact information are stored on the server."
+msgstr ""
+"Correo-e, calendario y la información de los contactos se almacenan en el "
+"servidor."
+
+#: C/evolution.xml:266(para) C/evolution.xml:272(para)
+#: C/evolution.xml:277(para) C/evolution.xml:282(para)
+#: C/evolution.xml:287(para)
+#| msgid ""
+#| "Connects to a news server and downloads a list of available news digests. "
+#| "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
+#| "Configuration Options</link>."
+msgid ""
+"For configuration instructions, see <link linkend=\"bstfw13\">Remote "
+"Configuration Options</link>."
 msgstr ""
-"Seleccione esta opción si se conecta a Novell <trademark class=\"registered"
-"\">GroupWise</trademark>. Novell GroupWise conserva la información de correo-"
-"e, calendario, y contactos en el servidor. Para las instrucciones de "
-"configuración, consulte <link linkend=\"bstfw13\">Opciones de configuración "
-"remotas</link>."
+"Para las opciones de configuración, vea <link linkend=\"bstfw13\">Opciones "
+"de configuración remota</link>."
 
-#: C/evolution.xml:267(title)
+#: C/evolution.xml:269(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft Exchange:"
 
-#: C/evolution.xml:268(para)
+#: C/evolution.xml:270(para)
 msgid ""
 "Available only if you have installed the Connector for Microsoft* Exchange. "
-"It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
-"stores email, calendar, and contact information on the server. For "
-"configuration instructions, see <link linkend=\"bstfw13\">Remote "
-"Configuration Options</link>."
+"Select this option if you connect to a Microsoft Exchange 2000 or 2003 "
+"server."
 msgstr ""
-"Sólo disponible si ha instalado el Conector para Microsoft* Exchange, "
-"permite conectarse a un servidor Microsoft* Exchange Server 2000 o 2003, que "
-"almacena la información de calendario, contacto y correo electrónico en el "
-"servidor. Para las instrucciones de configuración, consulte <link linkend="
-"\"bstfw13\">Opciones de configuración remota</link>."
+"Disponible sólo si ha instalado el Conector para Microsoft* Exchange. "
+"Seleccione esta opción si se conecta a servidores Microsoft Exchange 2000 o "
+"2003."
 
-#: C/evolution.xml:271(title)
+#: C/evolution.xml:275(title)
 msgid "IMAP:"
 msgstr "IMAP:"
 
-#: C/evolution.xml:272(para)
+#: C/evolution.xml:276(para)
+#| msgid ""
+#| "Keeps the email on your server so you can access your email from multiple "
+#| "systems. For configuration instructions, see <link linkend=\"bstfw13"
+#| "\">Remote Configuration Options</link>."
 msgid ""
 "Keeps the email on your server so you can access your email from multiple "
-"systems. For configuration instructions, see <link linkend=\"bstfw13"
-"\">Remote Configuration Options</link>."
+"systems."
 msgstr ""
 "Conserva su correo-e en el servidor para que pueda acceder a él con sistemas "
-"diferentes. Para las instrucciones de configuración, consulte <link linkend="
-"\"bstfw13\">Opciones de configuración remotas</link>."
+"diferentes."
 
-#: C/evolution.xml:275(title)
+#: C/evolution.xml:280(title)
 msgid "POP:"
 msgstr "POP:"
 
-#: C/evolution.xml:276(para)
+#: C/evolution.xml:281(para)
+#| msgid ""
+#| "Downloads your email to your hard disk for permanent storage, freeing up "
+#| "space on the email server. For configuration instructions, see <link "
+#| "linkend=\"bstfw13\">Remote Configuration Options</link>."
 msgid ""
 "Downloads your email to your hard disk for permanent storage, freeing up "
-"space on the email server. For configuration instructions, see <link linkend="
-"\"bstfw13\">Remote Configuration Options</link>."
+"space on the email server."
 msgstr ""
 "Descarga su correo-e en su disco duro para almacenarlo permanentemente, "
-"liberando espacio en el servidor de correo-e. Para las instrucciones de "
-"configuración, consulte <link linkend=\"bstfw13\">Opciones de configuración "
-"remota.</link>."
+"liberando espacio en el servidor de correo-e."
 
-#: C/evolution.xml:279(title)
+#: C/evolution.xml:285(title)
 msgid "USENET News:"
 msgstr "Noticias USENET:"
 
-#: C/evolution.xml:280(para)
+#: C/evolution.xml:286(para)
+#| msgid ""
+#| "Connects to a news server and downloads a list of available news digests. "
+#| "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
+#| "Configuration Options</link>."
 msgid ""
-"Connects to a news server and downloads a list of available news digests. "
-"For configuration instructions, see <link linkend=\"bstfw13\">Remote "
-"Configuration Options</link>."
+"Connects to a news server and downloads a list of available news digests."
 msgstr ""
 "Conecta con servidores de noticias y descarga una lista de los compendios de "
-"noticias disponibles. Para las opciones de configuración, vea <link linkend="
-"\"bstfw13\">Opciones de configuración remota</link>."
+"noticias disponibles."
 
-#: C/evolution.xml:283(title)
+#: C/evolution.xml:290(title)
 msgid "Local Delivery:"
 msgstr "Entrega local:"
 
-#: C/evolution.xml:284(para)
+#: C/evolution.xml:291(para)
+#| msgid ""
+#| "Choose this option if you want to move email from the spool (the location "
+#| "where mail waits for delivery) and store it in your home directory. You "
+#| "need to provide the path to the mail spool you want to use. If you want "
+#| "to leave email in your system's spool files, choose the Standard Unix "
+#| "Mbox Spool option instead. For configuration instructions, see <link "
+#| "linkend=\"bstgbqn\">Local Configuration Options</link>."
 msgid ""
 "Choose this option if you want to move email from the spool (the location "
 "where mail waits for delivery) and store it in your home directory. You need "
 "to provide the path to the mail spool you want to use. If you want to leave "
 "email in your system's spool files, choose the Standard Unix Mbox Spool "
-"option instead. For configuration instructions, see <link linkend=\"bstgbqn"
-"\">Local Configuration Options</link>."
+"option instead."
 msgstr ""
 "Elija esta opciones si quiere mover el correo desde el buzón local a su "
 "directorio de inicio. Necesita proporcionar la ruta al buzón de correo que "
 "quiere usar, Si quiere dejar el correo en los archivos de spools del "
-"sistema, elija la opción «Mbox estándar de Unix». Para las instrucciones de "
-"configuración , consulte <link linkend=\"bstgbqn\">Opciones de configuración "
-"local</link>."
+"sistema, elija la opción «Mbox estándar de Unix»."
+
+#: C/evolution.xml:292(para) C/evolution.xml:298(para)
+#: C/evolution.xml:304(para) C/evolution.xml:309(para)
+#: C/evolution.xml:314(para)
+#| msgid ""
+#| "For additional information, see <link linkend=\"more-mail-options"
+#| "\">Receiving Mail Options</link>."
+msgid ""
+"For configuration instructions, see <link linkend=\"bstgbqn\">Local "
+"Configuration Options</link>."
+msgstr ""
+"Para obtener información adicional, vea <link linkend=\"bstgbqn\">Opciones "
+"de configuración local</link>."
 
-#: C/evolution.xml:287(title)
+#: C/evolution.xml:295(title)
 msgid "MH Format Mail Directories:"
 msgstr "Directorios de correo en formato MH:"
 
-#: C/evolution.xml:288(para)
+#: C/evolution.xml:296(para)
 msgid ""
 "If you download your email using MH or another MH-style program, you should "
-"use this option. You need to provide the path to the mail directory you want "
-"to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local "
-"Configuration Options</link>."
+"use this option."
 msgstr ""
-"Si descarga el correo utilizando «mh» u otro programa tipo MH querrá utilizar "
-"esta opción. Debe escribir la ruta de acceso al directorio de correo que "
-"quiere usar. Para las instrucciones de configuración, consulte <link linkend="
-"\"bstgbqn\">Opciones de configuración local</link>."
+"Si descarga su correo-e usando MH u otro programa estilo MH debe usar esta "
+"opción."
+
+#: C/evolution.xml:297(para) C/evolution.xml:303(para)
+msgid "You need to provide the path to the mail directory you want to use."
+msgstr "Debe proporcionar la ruta al directorio de correo que quiere usar."
 
-#: C/evolution.xml:291(title)
+#: C/evolution.xml:301(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "Directorios de correo en formato Maildir:"
 
-#: C/evolution.xml:292(para)
+#: C/evolution.xml:302(para)
 msgid ""
 "If you download your email using Qmail or another Maildir-style program, you "
-"should use this option. You need to provide the path to the mail directory "
-"you want to use. For configuration instructions, see <link linkend=\"bstgbqn"
-"\">Local Configuration Options</link>."
+"should use this option."
 msgstr ""
-"Si descarga su correo usando Qmail u otro programa tipo Maildir, querrá usar "
-"esta opción. Debe escribir la ruta de acceso al directorio de correo que "
-"quiere usar. Para las instrucciones de configuración, consulte <link linkend="
-"\"bstgbqn\">Opciones de configuración local</link>."
+"Si descarga su correo-e usando Qmail u otro programa estilo Maildir debe "
+"usar esta opción."
 
-#: C/evolution.xml:295(title)
+#: C/evolution.xml:307(title)
 msgid "Standard Unix mbox Spool File:"
 msgstr "Archivo spool mbox estándar de Unix:"
 
-#: C/evolution.xml:296(para)
+#: C/evolution.xml:308(para)
+#| msgid ""
+#| "If you want to read and store email in the mail spool file on your local "
+#| "system, choose this option. You need to provide the path to the mail "
+#| "spool file you want to use. For configuration instructions, see <link "
+#| "linkend=\"bstgbqn\">Local Configuration Options</link>."
 msgid ""
 "If you want to read and store email in the mail spool file on your local "
 "system, choose this option. You need to provide the path to the mail spool "
-"file you want to use. For configuration instructions, see <link linkend="
-"\"bstgbqn\">Local Configuration Options</link>."
+"file you want to use."
 msgstr ""
 "Si desea leer y almacenar sus correos-e en un archivo de buzón de correo "
 "local en su sistema, elija esta opción. Necesita proporcionar la ruta de "
-"acceso al archivo de buzón que quiere usar. Para obtener instrucciones de "
-"configuración, consulte <link linkend=\"bstgbqn\">Opciones de configuración "
-"locales</link>."
+"acceso al archivo de buzón que quiere usar."
 
-#: C/evolution.xml:299(title)
+#: C/evolution.xml:312(title)
 msgid "Standard Unix mbox Spool Directory:"
 msgstr "Directorio spool mbox estándar de Unix:"
 
-#: C/evolution.xml:300(para)
+#: C/evolution.xml:313(para)
+#| msgid ""
+#| "If you want to read and store email in the mail spool directory on your "
+#| "local system, choose this option. You need to provide the path to the "
+#| "mail spool directory you want to use. For configuration instructions, see "
+#| "<link linkend=\"bstgbqn\">Local Configuration Options</link>."
 msgid ""
 "If you want to read and store email in the mail spool directory on your "
 "local system, choose this option. You need to provide the path to the mail "
-"spool directory you want to use. For configuration instructions, see <link "
-"linkend=\"bstgbqn\">Local Configuration Options</link>."
+"spool directory you want to use."
 msgstr ""
 "Si desea leer y almacenar su correo en un directorio de correo spool local "
 "en su sistema, elija esta opción. Necesita proporcionar la ruta de acceso al "
-"directorio del directorio de correo spool que quiere usar. Para obtener "
-"instrucciones de configuración, consulte <link linkend=\"bstgbqn\">Opciones "
-"de configuración locales</link>."
+"directorio del directorio de correo spool que quiere usar."
 
-#: C/evolution.xml:303(title) C/evolution.xml:5448(title)
+#: C/evolution.xml:317(title) C/evolution.xml:5460(title)
 msgid "None:"
 msgstr "Ninguno:"
 
-#: C/evolution.xml:304(para)
+#: C/evolution.xml:318(para)
 msgid ""
 "Select this if you do not plan to check email with this account. If you "
 "select this, there are no configuration options."
@@ -1345,11 +1391,11 @@ msgstr ""
 "Elija esta opción si no planea consultar correo electrónico con esta cuenta. "
 "Si selecciona esto, no hay opciones de configuración."
 
-#: C/evolution.xml:310(title)
+#: C/evolution.xml:324(title)
 msgid "Remote Configuration Options"
 msgstr "Opciones de configuración remotas"
 
-#: C/evolution.xml:311(para)
+#: C/evolution.xml:325(para)
 msgid ""
 "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
 "you need to specify additional information."
@@ -1357,12 +1403,12 @@ msgstr ""
 "Si ha elegido un servidor de correo Novell GroupWise, IMAP, POP o Noticias "
 "USENET es necesario especificar información adicional."
 
-#: C/evolution.xml:314(para) C/evolution.xml:677(para)
+#: C/evolution.xml:328(para) C/evolution.xml:691(para)
 msgid "Type the server name of your email server in the Server field."
 msgstr ""
 "Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
 
-#: C/evolution.xml:315(para) C/evolution.xml:678(para)
+#: C/evolution.xml:329(para) C/evolution.xml:692(para)
 msgid ""
 "If you are unsure what your server address is, contact your system "
 "administrator."
@@ -1370,19 +1416,19 @@ msgstr ""
 "Si no está seguro de cuál es la dirección de su servidor, contacte con su "
 "administrador."
 
-#: C/evolution.xml:318(para) C/evolution.xml:690(para)
+#: C/evolution.xml:332(para) C/evolution.xml:704(para)
 msgid "Type your username in the Username field."
 msgstr "Teclee el usuario en el campo Usuario."
 
-#: C/evolution.xml:321(para) C/evolution.xml:698(para)
+#: C/evolution.xml:335(para) C/evolution.xml:712(para)
 msgid "Select if you want to use a secure connection (SSL or TLS)."
 msgstr "Seleccione su quiere usar una conexión segura (SSL o TLS)."
 
-#: C/evolution.xml:322(para)
+#: C/evolution.xml:336(para)
 msgid "You should enable this option if your server supports it."
 msgstr "Debería activar esta opción si su servidor la soporta."
 
-#: C/evolution.xml:323(para) C/evolution.xml:329(para)
+#: C/evolution.xml:337(para) C/evolution.xml:343(para)
 msgid ""
 "Free webmail providers usually supply information about which of these "
 "options can be used. If you are in an organizational environment, you may "
@@ -1393,32 +1439,32 @@ msgstr ""
 "acontecimiento organizado puede que quiera contactar con el administrador de "
 "su sistema para obtener más información."
 
-#: C/evolution.xml:326(para) C/evolution.xml:685(para)
-#: C/evolution.xml:5277(para)
+#: C/evolution.xml:340(para) C/evolution.xml:699(para)
+#: C/evolution.xml:5289(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Seleccione su tipo de autenticación en la lista «Autenticación»."
 
-#: C/evolution.xml:327(para) C/evolution.xml:686(para)
-#: C/evolution.xml:719(para) C/evolution.xml:1992(para)
-#: C/evolution.xml:2217(para) C/evolution.xml:2225(para)
-#: C/evolution.xml:2395(para) C/evolution.xml:3173(para)
-#: C/evolution.xml:3178(para) C/evolution.xml:3658(para)
-#: C/evolution.xml:3673(para) C/evolution.xml:3681(para)
-#: C/evolution.xml:4007(para) C/evolution.xml:4009(para)
-#: C/evolution.xml:4011(para) C/evolution.xml:4031(para)
-#: C/evolution.xml:4042(para) C/evolution.xml:4047(para)
-#: C/evolution.xml:4068(para) C/evolution.xml:4076(para)
-#: C/evolution.xml:4192(para) C/evolution.xml:4203(para)
-#: C/evolution.xml:4208(para) C/evolution.xml:4219(para)
-#: C/evolution.xml:4227(para) C/evolution.xml:4232(para)
-#: C/evolution.xml:4578(para) C/evolution.xml:4597(para)
-#: C/evolution.xml:4629(para) C/evolution.xml:4642(para)
-#: C/evolution.xml:4864(para) C/evolution.xml:6306(para)
-#: C/evolution.xml:7089(para) C/evolution.xml:7155(para)
+#: C/evolution.xml:341(para) C/evolution.xml:700(para)
+#: C/evolution.xml:733(para) C/evolution.xml:2006(para)
+#: C/evolution.xml:2231(para) C/evolution.xml:2239(para)
+#: C/evolution.xml:2409(para) C/evolution.xml:3187(para)
+#: C/evolution.xml:3192(para) C/evolution.xml:3672(para)
+#: C/evolution.xml:3687(para) C/evolution.xml:3695(para)
+#: C/evolution.xml:4021(para) C/evolution.xml:4023(para)
+#: C/evolution.xml:4025(para) C/evolution.xml:4045(para)
+#: C/evolution.xml:4056(para) C/evolution.xml:4061(para)
+#: C/evolution.xml:4082(para) C/evolution.xml:4090(para)
+#: C/evolution.xml:4206(para) C/evolution.xml:4217(para)
+#: C/evolution.xml:4222(para) C/evolution.xml:4233(para)
+#: C/evolution.xml:4241(para) C/evolution.xml:4246(para)
+#: C/evolution.xml:4592(para) C/evolution.xml:4611(para)
+#: C/evolution.xml:4643(para) C/evolution.xml:4656(para)
+#: C/evolution.xml:4878(para) C/evolution.xml:6318(para)
+#: C/evolution.xml:7104(para) C/evolution.xml:7170(para)
 msgid "or"
 msgstr "o"
 
-#: C/evolution.xml:328(para)
+#: C/evolution.xml:342(para) C/evolution.xml:701(para)
 msgid ""
 "Click Check for Supported Types to have Evolution check for supported "
 "authentication mechanisms. Some servers do not announce the authentication "
@@ -1430,11 +1476,11 @@ msgstr ""
 "autenticación que soportan, así que pulsar este botón no garantiza que el "
 "mecanismo disponible funcione realmente."
 
-#: C/evolution.xml:332(para) C/evolution.xml:693(para)
+#: C/evolution.xml:346(para) C/evolution.xml:707(para)
 msgid "Select if you want Evolution to remember your password."
 msgstr "Marque si quiere que Evolution recuerde su contraseña."
 
-#: C/evolution.xml:338(para)
+#: C/evolution.xml:352(para)
 msgid ""
 "(Conditional) If you chose Microsoft Exchange as the server type, provide "
 "your username in the Username field and your Outlook Web Access (OWA) URL in "
@@ -1451,7 +1497,7 @@ msgstr ""
 "http://<varname>nombre del servidor</varname>/exchange/<varname>ruta del "
 "buzón</varname>."
 
-#: C/evolution.xml:339(para)
+#: C/evolution.xml:353(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -1459,11 +1505,11 @@ msgstr ""
 "Cuando haya terminado, continúe con las <link linkend=\"more-mail-options"
 "\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:343(title)
+#: C/evolution.xml:357(title)
 msgid "Local Configuration Options"
 msgstr "Opciones de configuración local"
 
-#: C/evolution.xml:344(para)
+#: C/evolution.xml:358(para)
 msgid ""
 "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
 "Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
@@ -1477,7 +1523,7 @@ msgstr ""
 "Continúe con <link linkend=\"more-mail-options\">Opciones de recepción de "
 "correo</link>."
 
-#: C/evolution.xml:350(para)
+#: C/evolution.xml:364(para)
 msgid ""
 "After you have selected a mail delivery mechanism, you can set some "
 "preferences for its behavior."
@@ -1485,66 +1531,66 @@ msgstr ""
 "Tras haber seleccionado un mecanismo de entrega de correo, puede establecer "
 "algunas preferencias para su comportamiento."
 
-#: C/evolution.xml:353(link) C/evolution.xml:382(title)
+#: C/evolution.xml:367(link) C/evolution.xml:396(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Opciones de recepción de Novell GroupWise"
 
-#: C/evolution.xml:356(link) C/evolution.xml:422(title)
+#: C/evolution.xml:370(link) C/evolution.xml:436(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Opciones de recepción de Microsoft Exchange"
 
-#: C/evolution.xml:359(link) C/evolution.xml:463(title)
+#: C/evolution.xml:373(link) C/evolution.xml:477(title)
 msgid "IMAP Receiving Options"
 msgstr "Opciones de recepción IMAP"
 
-#: C/evolution.xml:362(link) C/evolution.xml:507(title)
+#: C/evolution.xml:376(link) C/evolution.xml:521(title)
 msgid "POP Receiving Options"
 msgstr "Opciones de recepción POP"
 
-#: C/evolution.xml:365(link) C/evolution.xml:529(title)
+#: C/evolution.xml:379(link) C/evolution.xml:543(title)
 msgid "USENET News Receiving Options"
 msgstr "Opciones de recepción de Noticias USENET"
 
-#: C/evolution.xml:368(link) C/evolution.xml:553(title)
+#: C/evolution.xml:382(link) C/evolution.xml:567(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Opciones de recepción de entrega local"
 
-#: C/evolution.xml:371(link) C/evolution.xml:568(title)
+#: C/evolution.xml:385(link) C/evolution.xml:582(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Opciones de recepción para directorios de correo en formato MH"
 
-#: C/evolution.xml:374(link) C/evolution.xml:588(title)
+#: C/evolution.xml:388(link) C/evolution.xml:602(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Opciones de recepción para directorios de correo en formato Maildir"
 
-#: C/evolution.xml:377(link)
+#: C/evolution.xml:391(link)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
 
-#: C/evolution.xml:383(para)
-msgid ""
-"If you select Novell GroupWise as your receiving server type, you need to "
-"specify the following options:"
-msgstr ""
-"Si seleccione Novell GroupWise como su tipo de servidor para recepción, "
-"necesita especificar las opciones siguientes:"
-
-#: C/evolution.xml:386(para) C/evolution.xml:427(para)
-#: C/evolution.xml:468(para) C/evolution.xml:512(para)
-#: C/evolution.xml:534(para) C/evolution.xml:557(para)
-#: C/evolution.xml:572(para) C/evolution.xml:592(para)
-#: C/evolution.xml:612(para) C/evolution.xml:635(para)
-#: C/evolution.xml:5855(para)
+#: C/evolution.xml:397(para) C/evolution.xml:437(para)
+#: C/evolution.xml:478(para) C/evolution.xml:523(para)
+#: C/evolution.xml:545(para) C/evolution.xml:568(para)
+#: C/evolution.xml:583(para) C/evolution.xml:603(para)
+#: C/evolution.xml:646(para)
+msgid "You need to specify the following options for this server type:"
+msgstr "Debe especificar las siguientes opciones para este tipo de servidor:"
+
+#: C/evolution.xml:400(para) C/evolution.xml:441(para)
+#: C/evolution.xml:482(para) C/evolution.xml:526(para)
+#: C/evolution.xml:548(para) C/evolution.xml:571(para)
+#: C/evolution.xml:586(para) C/evolution.xml:606(para)
+#: C/evolution.xml:626(para) C/evolution.xml:649(para)
+#: C/evolution.xml:5867(para)
 msgid "Select if you want Evolution to automatically check for new mail."
 msgstr ""
 "Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
 
-#: C/evolution.xml:387(para) C/evolution.xml:428(para)
-#: C/evolution.xml:469(para) C/evolution.xml:513(para)
-#: C/evolution.xml:535(para) C/evolution.xml:558(para)
-#: C/evolution.xml:573(para) C/evolution.xml:593(para)
-#: C/evolution.xml:613(para) C/evolution.xml:636(para)
-#: C/evolution.xml:5856(para)
+#: C/evolution.xml:401(para) C/evolution.xml:442(para)
+#: C/evolution.xml:483(para) C/evolution.xml:527(para)
+#: C/evolution.xml:549(para) C/evolution.xml:572(para)
+#: C/evolution.xml:587(para) C/evolution.xml:607(para)
+#: C/evolution.xml:627(para) C/evolution.xml:650(para)
+#: C/evolution.xml:5868(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1552,16 +1598,16 @@ msgstr ""
 "Si selecciona esta opción, necesita especificar con qué frecuencia Evolution "
 "debe comprobar si hay mensajes nuevos."
 
-#: C/evolution.xml:390(para) C/evolution.xml:431(para)
-#: C/evolution.xml:5861(para)
+#: C/evolution.xml:404(para) C/evolution.xml:445(para)
+#: C/evolution.xml:5873(para)
 msgid "Select if you want to check for new messages in all folders."
 msgstr ""
 "Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
 
-#: C/evolution.xml:393(para) C/evolution.xml:449(para)
-#: C/evolution.xml:484(para) C/evolution.xml:596(para)
-#: C/evolution.xml:616(para) C/evolution.xml:639(para)
-#: C/evolution.xml:5864(para)
+#: C/evolution.xml:407(para) C/evolution.xml:463(para)
+#: C/evolution.xml:498(para) C/evolution.xml:610(para)
+#: C/evolution.xml:630(para) C/evolution.xml:653(para)
+#: C/evolution.xml:5876(para)
 msgid ""
 "Select Apply filters to new messages in inbox on this server if you want to "
 "apply filters."
@@ -1569,8 +1615,8 @@ msgstr ""
 "Seleccione Aplicar filtros a los mensajes nuevos en la Bandeja de entrada en "
 "este servidor si desea aplicar los filtros."
 
-#: C/evolution.xml:394(para) C/evolution.xml:485(para)
-#: C/evolution.xml:597(para) C/evolution.xml:5865(para)
+#: C/evolution.xml:408(para) C/evolution.xml:499(para)
+#: C/evolution.xml:611(para) C/evolution.xml:5877(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1578,13 +1624,13 @@ msgstr ""
 "Para información adicional para el filtrado, vea <link linkend=\"usage-mail-"
 "org-filters-new\">Creación de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:397(para) C/evolution.xml:452(para)
-#: C/evolution.xml:488(para) C/evolution.xml:5868(para)
+#: C/evolution.xml:411(para) C/evolution.xml:466(para)
+#: C/evolution.xml:502(para) C/evolution.xml:5880(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr "Seleccione si quiere comprobar si los mensajes nuevos son basura."
 
-#: C/evolution.xml:398(para) C/evolution.xml:453(para)
-#: C/evolution.xml:489(para)
+#: C/evolution.xml:412(para) C/evolution.xml:467(para)
+#: C/evolution.xml:503(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"usage-mail-"
 "organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
@@ -1594,13 +1640,13 @@ msgstr ""
 "linkend=\"usage-mail-organize-spam\">Parar el correo basura (SPAM)</link> y "
 "<link linkend=\"mail-prefs-junk\">SPAM</link>."
 
-#: C/evolution.xml:401(para) C/evolution.xml:5872(para)
+#: C/evolution.xml:415(para) C/evolution.xml:5884(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
 msgstr ""
 "Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
 
-#: C/evolution.xml:404(para) C/evolution.xml:446(para)
-#: C/evolution.xml:495(para)
+#: C/evolution.xml:418(para) C/evolution.xml:460(para)
+#: C/evolution.xml:509(para)
 msgid ""
 "Select Automatically synchronize remote mail locally to download the "
 "messages to your local system."
@@ -1608,7 +1654,7 @@ msgstr ""
 "Seleccione Sincronizar automáticamente el correo remoto localmente para "
 "descargar los correos a su sistema local."
 
-#: C/evolution.xml:405(para) C/evolution.xml:496(para)
+#: C/evolution.xml:419(para) C/evolution.xml:510(para)
 msgid ""
 "Evolution, by default, downloads only the header information such as From, "
 "Subject, and Date. The body of the message and the attachments are "
@@ -1622,7 +1668,7 @@ msgstr ""
 "tiempo y uso de la red. Esto es útil cuando no lee todos los mensajes que "
 "recibe."
 
-#: C/evolution.xml:406(para) C/evolution.xml:497(para)
+#: C/evolution.xml:420(para) C/evolution.xml:511(para)
 msgid ""
 "If you check this option, Evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
@@ -1635,7 +1681,7 @@ msgstr ""
 "descargar los correos para leerlos cuando esté desconectado, siempre que "
 "haya seleccionado esta opción."
 
-#: C/evolution.xml:409(para)
+#: C/evolution.xml:423(para)
 msgid ""
 "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -1643,7 +1689,7 @@ msgstr ""
 "Teclee su puerto de Agente SOAP de Oficina de correos en el campo Puerto del "
 "Agente SOAP de Oficina de Correos."
 
-#: C/evolution.xml:410(para) C/evolution.xml:5883(para)
+#: C/evolution.xml:424(para) C/evolution.xml:5895(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1651,11 +1697,11 @@ msgstr ""
 "Si no está seguro de qué puerto es para su Agente SOAP de Oficina de "
 "Correos, contacte con su administrador de sistemas."
 
-#: C/evolution.xml:418(para) C/evolution.xml:459(para)
-#: C/evolution.xml:503(para) C/evolution.xml:525(para)
-#: C/evolution.xml:549(para) C/evolution.xml:564(para)
-#: C/evolution.xml:584(para) C/evolution.xml:605(para)
-#: C/evolution.xml:627(para) C/evolution.xml:650(para)
+#: C/evolution.xml:432(para) C/evolution.xml:473(para)
+#: C/evolution.xml:517(para) C/evolution.xml:539(para)
+#: C/evolution.xml:563(para) C/evolution.xml:578(para)
+#: C/evolution.xml:598(para) C/evolution.xml:619(para)
+#: C/evolution.xml:641(para) C/evolution.xml:664(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
@@ -1663,15 +1709,7 @@ msgstr ""
 "Cuando haya terminado, continúe con <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
-#: C/evolution.xml:423(para)
-msgid ""
-"If you select Microsoft Exchange as your receiving server type, you need to "
-"specify the following options:"
-msgstr ""
-"Si ha elegido un servidor de correo Microsoft Exchange como su servidor para "
-"recepción, necesitará especificar la  siguiente información:"
-
-#: C/evolution.xml:434(para)
+#: C/evolution.xml:448(para)
 msgid ""
 "Specify the Global Catalog server name in the Global Catalog Server Name "
 "field."
@@ -1679,7 +1717,7 @@ msgstr ""
 "Especifique el nombre del servidor de Catálogo Global en el campo «Nombre del "
 "servidor de catálogo global»."
 
-#: C/evolution.xml:435(para)
+#: C/evolution.xml:449(para)
 msgid ""
 "The Global Catalog Server contains the user information for users. If you "
 "are unsure what your Global Catalog server name is, contact your system "
@@ -1689,7 +1727,7 @@ msgstr ""
 "Si no está seguro de cual es el nombre del servidor de «Catálogo Global», "
 "contacte con su administrador de sistemas."
 
-#: C/evolution.xml:438(para)
+#: C/evolution.xml:452(para)
 msgid ""
 "Select if you want to limit the number of Global Address List (GAL) "
 "responses."
@@ -1697,7 +1735,7 @@ msgstr ""
 "Seleccione si quiere limitar el número de «Listas de direcciones globales "
 "(GAL)»."
 
-#: C/evolution.xml:439(para)
+#: C/evolution.xml:453(para)
 msgid ""
 "The GAL contains a list of all email addresses. If you select this option, "
 "you need to specify the maximum number of responses."
@@ -1705,11 +1743,11 @@ msgstr ""
 "El GAL contiene una lista de todas las direcciones de correo-e. Si "
 "selecciona esta opción, necesita especificar el número máximo de respuestas."
 
-#: C/evolution.xml:442(para)
+#: C/evolution.xml:456(para)
 msgid "Select if you want to use a password expiry warning time period."
 msgstr "Marque si quiere usar una advertencia de expiración de contraseña."
 
-#: C/evolution.xml:443(para)
+#: C/evolution.xml:457(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "send the password expire message."
@@ -1717,15 +1755,7 @@ msgstr ""
 "Si selecciona esta opción, necesita especificar la frecuencia con que "
 "Evolution envía un mensaje de contraseña caducada."
 
-#: C/evolution.xml:464(para)
-msgid ""
-"If you select IMAP as your receiving server type, you need to specify the "
-"following options:"
-msgstr ""
-"Si selecciona IMAP como su tipo de servidor de recepción, necesita "
-"especificar las siguientes opciones:"
-
-#: C/evolution.xml:472(para)
+#: C/evolution.xml:486(para)
 msgid ""
 "Select if you want Evolution to use custom commands to connect to the IMAP "
 "server."
@@ -1733,7 +1763,7 @@ msgstr ""
 "Seleccione si quiere que Evolution use comandos personalizados para "
 "conectarse al servidor IMAP."
 
-#: C/evolution.xml:473(para)
+#: C/evolution.xml:487(para)
 msgid ""
 "If you select this option, specify the custom command you want Evolution to "
 "use."
@@ -1741,11 +1771,11 @@ msgstr ""
 "Si selecciona esta opción, especifique el comando personalizado que quiere "
 "que Evolution use."
 
-#: C/evolution.xml:476(para)
+#: C/evolution.xml:490(para)
 msgid "Select if you want Evolution to show only subscribed folders."
 msgstr "Marque si quiere que Evolution sólo muestre las carpetas suscritas."
 
-#: C/evolution.xml:477(para)
+#: C/evolution.xml:491(para)
 msgid ""
 "Subscribed folders are folders that you have chosen to receive mail from by "
 "subscribing to them."
@@ -1753,14 +1783,14 @@ msgstr ""
 "Las carpetas suscritas son carpetas que ha elegido para recibir el correo "
 "suscribiéndose a ellas."
 
-#: C/evolution.xml:480(para)
+#: C/evolution.xml:494(para)
 msgid ""
 "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Marque si quiere que Evolution no haga caso de los espacios de nombres de "
 "carpetas suministrados por el servidor."
 
-#: C/evolution.xml:481(para)
+#: C/evolution.xml:495(para)
 msgid ""
 "By choosing this option you can rename the folders that the server provides. "
 "If you select this option, you need to specify the namespace to use."
@@ -1769,46 +1799,30 @@ msgstr ""
 "servidos. Si selecciona esta opción, necesita especificar el espacio de "
 "nombres a usar."
 
-#: C/evolution.xml:492(para)
+#: C/evolution.xml:506(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr ""
 "Marque si quiere comprobar si el los mensajes de la Bandeja de entrada son "
 "spam."
 
-#: C/evolution.xml:509(para)
-msgid ""
-"If you select POP as your receiving server type, you need to specify the "
-"following options:"
-msgstr ""
-"Si selecciona POP como su tipo de servidor de recepción, necesita "
-"especificar las opciones siguientes:"
-
-#: C/evolution.xml:516(para)
+#: C/evolution.xml:530(para)
 msgid "Select if you want to leave messages on the server."
 msgstr "Marque si quiere dejar los mensajes en el servidor."
 
-#: C/evolution.xml:519(para)
+#: C/evolution.xml:533(para)
 msgid "Select if you want to disable support for all POP3 extensions."
 msgstr ""
 "Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
 
-#: C/evolution.xml:531(para)
-msgid ""
-"If you select USENET News as your receiving server type, you need to specify "
-"the following options:"
-msgstr ""
-"Si selecciona noticias USENET como si tipo de servidor, entonces necesita "
-"especificar las siguientes opciones:"
-
-#: C/evolution.xml:538(para)
+#: C/evolution.xml:552(para)
 msgid "Select if you want to show folders in short notation."
 msgstr "Seleccione si quiere mostrar las carpetas en notación corta."
 
-#: C/evolution.xml:539(para)
+#: C/evolution.xml:553(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Por ejemplo, com.os.linux aparecería como c.o.linux."
 
-#: C/evolution.xml:542(para)
+#: C/evolution.xml:556(para)
 msgid ""
 "Select if you want to show relative folder names in the subscription dialog "
 "box."
@@ -1816,7 +1830,7 @@ msgstr ""
 "Seleccione si quiere mostrar los nombres de carpetas relativos en la caja de "
 "suscripción del diálogo."
 
-#: C/evolution.xml:543(para)
+#: C/evolution.xml:557(para)
 msgid ""
 "If you select to show relative folder names in the subscription page, only "
 "the name of the folder is displayed. For example the folder evolution.mail "
@@ -1826,63 +1840,31 @@ msgstr ""
 "suscripción, se muestra sólo el nombre de la carpeta. Por ejemplo, la "
 "carpeta evolution.mail aparecería como evolution."
 
-#: C/evolution.xml:554(para)
-msgid ""
-"If you select Local Delivery as your receiving server type, you need to "
-"specify the following options:"
-msgstr ""
-"Si selecciona «Entrega local» como su tipo de servidor de recepción, necesita "
-"especificar las siguientes opciones:"
-
-#: C/evolution.xml:569(para)
-msgid ""
-"If you select MH-Format Mail Directories as your receiving server type, you "
-"need to specify the following options:"
-msgstr ""
-"Si selecciona directorios en formato MH como su tipo de servidor de "
-"recepción, necesita especificar las opciones siguientes:"
-
-#: C/evolution.xml:576(para)
+#: C/evolution.xml:590(para)
 msgid ""
 "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Seleccione si quiere usar el archivo de resumen <emphasis>.folders</"
 "emphasis>."
 
-#: C/evolution.xml:589(para)
-msgid ""
-"If you select Maildir-Format Mail Directories as your receiving server type, "
-"you need to specify the following options:"
-msgstr ""
-"Si selecciona directorios en formato Maildir como su tipo de servidor de "
-"recepción, necesita especificar las opciones siguientes:"
-
-#: C/evolution.xml:609(title)
+#: C/evolution.xml:623(title)
 msgid "Standard Unix mbox Spool File Receiving Options"
 msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
 
-#: C/evolution.xml:619(para) C/evolution.xml:642(para)
+#: C/evolution.xml:633(para) C/evolution.xml:656(para)
 msgid ""
 "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Seleccione si quiere almacenar las cabeceras de estado en los formatos Elm, "
 "Pine y Mutt."
 
-#: C/evolution.xml:631(title)
+#: C/evolution.xml:645(title)
 msgid "Standard Unix mbox Spool Directory Receiving Options"
 msgstr ""
 "Opciones de recepción para directorios de correo mbox en formato estándar de "
 "Unix"
 
-#: C/evolution.xml:632(para)
-msgid ""
-"If you select Standard Unix mbox Spool Directory as your receiving server "
-"type, you need to specify the following options:"
-msgstr ""
-"Si selecciona directorios mbox estándar de Unix de correo como su tipo de "
-"servidor de recepción, necesita especificar las opciones siguientes:"
-
-#: C/evolution.xml:656(para)
+#: C/evolution.xml:670(para)
 msgid ""
 "Now that you have entered information about how you plan to get mail, "
 "Evolution needs to know about how you want to send it."
@@ -1890,19 +1872,19 @@ msgstr ""
 "Ahora que ha introducido la información acerca de cómo planea obtener el "
 "correo, Evolution necesita saber cómo quiere enviarlo."
 
-#: C/evolution.xml:659(para)
+#: C/evolution.xml:673(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Seleccione un tipo de servidor de la lista de tipos de servidores."
 
-#: C/evolution.xml:660(para)
+#: C/evolution.xml:674(para)
 msgid "The following server types are available:"
 msgstr "Están disponibles los siguientes tipos de servidores:"
 
-#: C/evolution.xml:662(title)
+#: C/evolution.xml:676(title)
 msgid "Sendmail:"
 msgstr "Sendmail:"
 
-#: C/evolution.xml:663(para)
+#: C/evolution.xml:677(para)
 msgid ""
 "Uses the Sendmail program to send mail from your system. Sendmail is more "
 "flexible, but is not as easy to configure, so you should select this option "
@@ -1912,11 +1894,11 @@ msgstr ""
 "Sendmail es muy flexible pero no es tan fácil de configurar por lo que sólo "
 "debería elegir esta opción si sabe cómo poner en marcha un servicio Sendmail."
 
-#: C/evolution.xml:666(title)
+#: C/evolution.xml:680(title)
 msgid "SMTP:"
 msgstr "SMTP:"
 
-#: C/evolution.xml:667(para)
+#: C/evolution.xml:681(para)
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail. If you choose SMTP, there are additional configuration "
@@ -1928,15 +1910,15 @@ msgstr ""
 "adicionales. Vea <link linkend=\"bsthwzo\">Configuración SMTP</link> para "
 "más información."
 
-#: C/evolution.xml:673(title)
+#: C/evolution.xml:687(title)
 msgid "SMTP Configuration"
 msgstr "Configuración SMTP"
 
-#: C/evolution.xml:681(para)
+#: C/evolution.xml:695(para)
 msgid "Select if your server requires authentication."
 msgstr "Seleccione si su servidor requiere autenticación."
 
-#: C/evolution.xml:682(para)
+#: C/evolution.xml:696(para)
 msgid ""
 "If you selected that your server requires authentication, you need to "
 "provide the following information:"
@@ -1944,23 +1926,11 @@ msgstr ""
 "Si seleccionó que su servidor requiere autenticación, necesita proporcionar "
 "la siguiente información:"
 
-#: C/evolution.xml:687(para)
-msgid ""
-"Click Check for Supported Types to have Evolution check for supported types. "
-"Some servers do not announce the authentication mechanisms they support, so "
-"clicking this button is not a guarantee that available mechanisms actually "
-"work."
-msgstr ""
-"Pulse «Comprobar tipos soportados» para que Evolution compruebe qué tipos "
-"están soportados. Algunos servidores no anuncian los mecanismos de "
-"autenticación que soportan, así que pulsar este botón no garantiza que el "
-"mecanismo disponible funcione realmente."
-
-#: C/evolution.xml:704(para)
+#: C/evolution.xml:718(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Continúe con <link linkend=\"bsti1ty\">Gestión de cuentas</link>."
 
-#: C/evolution.xml:710(para)
+#: C/evolution.xml:724(para)
 msgid ""
 "Now that you have finished the email configuration process you need to give "
 "the account a name. The name can be any name you prefer. Type your account "
@@ -1970,7 +1940,7 @@ msgstr ""
 "a la cuenta un nombre. El nombre puede ser cualquiera que prefiera. Teclee "
 "su nombre de cuenta en el campo Nombre, después pulse Adelante."
 
-#: C/evolution.xml:711(para)
+#: C/evolution.xml:725(para)
 msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
@@ -1978,23 +1948,23 @@ msgstr ""
 "Continúe con la <link linkend=\"step-three-b\">Zona horaria</link><link "
 "linkend=\"step-three-b\"/>."
 
-#: C/evolution.xml:718(para)
+#: C/evolution.xml:732(para)
 msgid "Select your time zone on the map."
 msgstr "Seleccione su zona horaria en el mapa."
 
-#: C/evolution.xml:720(para)
+#: C/evolution.xml:734(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Seleccione de la lista despegable de zonas horarias."
 
-#: C/evolution.xml:725(para)
+#: C/evolution.xml:739(para)
 msgid "Click OK, then click Apply."
 msgstr "Pulse Aceptar, después pulse Aplicar."
 
-#: C/evolution.xml:726(para)
+#: C/evolution.xml:740(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution se abre con su cuenta nueva creada."
 
-#: C/evolution.xml:729(para)
+#: C/evolution.xml:743(para)
 msgid ""
 "If you want to import email from another email client, continue with <link "
 "linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
@@ -2004,11 +1974,11 @@ msgstr ""
 "linkend=\"fourth-step\">Importar de correo (opcional)</link>. Si no, salte a "
 "<link linkend=\"ui-intro\">Uso de Evolution: Una vista general</link>."
 
-#: C/evolution.xml:733(title)
+#: C/evolution.xml:747(title)
 msgid "Importing Mail (Optional)"
 msgstr "Importar correo (opcional)"
 
-#: C/evolution.xml:734(para)
+#: C/evolution.xml:748(para)
 msgid ""
 "After selecting your time zone, if Evolution finds email or address files "
 "from another application, it offers to import them. For a full description "
@@ -2020,7 +1990,7 @@ msgstr ""
 "descripción de la característica de importación, consulte <link linkend="
 "\"importing-mail\">Importación de archivos aislados</link>."
 
-#: C/evolution.xml:735(para) C/evolution.xml:2512(para)
+#: C/evolution.xml:749(para) C/evolution.xml:2526(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
 "proprietary formats that Evolution cannot read or import."
@@ -2028,7 +1998,7 @@ msgstr ""
 "Microsoft Outlook* y versiones de Outlook Express después de la versión 4 "
 "usan formatos propietarios que Evolution no puede leer o importar."
 
-#: C/evolution.xml:736(para)
+#: C/evolution.xml:750(para)
 msgid ""
 "To import information, you might want to use the Export tool under Windows*. "
 "See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
@@ -2038,7 +2008,7 @@ msgstr ""
 "bajo Windows*. Vea las instrucciones en <link linkend=\"outlook-migration-"
 "mail\">Migrar carpetas de correo locales de Outlook</link>."
 
-#: C/evolution.xml:737(para) C/evolution.xml:2517(para)
+#: C/evolution.xml:751(para) C/evolution.xml:2531(para)
 msgid ""
 "Before importing email from Netscape*, Mozilla and Netscape users need to "
 "click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
@@ -2050,7 +2020,7 @@ msgstr ""
 "la herramienta de correo de Netscape o Mozilla. De otra forma Evolution "
 "importa y recupera los mensajes en sus carpetas de papelera."
 
-#: C/evolution.xml:739(para)
+#: C/evolution.xml:753(para)
 msgid ""
 "Evolution uses standard file types for email and calendar information, so "
 "you can copy those files from your <command>~/.evolution</command> "
@@ -2063,7 +2033,7 @@ msgstr ""
 "<command>mbox</command> para el correo-e e <emphasis>iCal</emphasis> para la "
 "información de calendario."
 
-#: C/evolution.xml:740(para)
+#: C/evolution.xml:754(para)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a standard "
 "vCard*. To export an address book, click File &gt; Save Address Book As VCard"
@@ -2076,7 +2046,7 @@ msgstr ""
 "Si sólo quiere exportar un contacto, pulse Archivo &gt; Guardar contacto "
 "como VCard."
 
-#: C/evolution.xml:748(para)
+#: C/evolution.xml:762(para)
 msgid ""
 "Now that the first-run configuration has finished, you're ready to begin "
 "using Evolution. Here's a quick explanation of what's happening in your main "
@@ -2087,11 +2057,11 @@ msgstr ""
 "explicación rápida de qué es lo que está ocurriendo en su ventana principal "
 "de Evolution."
 
-#: C/evolution.xml:751(title)
+#: C/evolution.xml:765(title)
 msgid "Menu Bar:"
 msgstr "Barra del menú:"
 
-#: C/evolution.xml:752(para)
+#: C/evolution.xml:766(para)
 msgid ""
 "The menu bar gives you access to most Evolution features. For additional "
 "information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
@@ -2101,11 +2071,11 @@ msgstr ""
 "Evolution. Para información adicional, vea <link linkend=\"usage-mainwindow-"
 "menubar\">La barra de menú</link>."
 
-#: C/evolution.xml:755(title)
+#: C/evolution.xml:769(title)
 msgid "Folder List:"
 msgstr "Lista de carpetas:"
 
-#: C/evolution.xml:756(para)
+#: C/evolution.xml:770(para)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and the contents are "
@@ -2115,11 +2085,11 @@ msgstr ""
 "para cada cuenta. Para ver el contenido de una carpeta, pulse el nombre de "
 "la carpeta y el contenido se mostrará en la lista de correo-e."
 
-#: C/evolution.xml:759(title)
+#: C/evolution.xml:773(title)
 msgid "Toolbar:"
 msgstr "Barra de herramientas:"
 
-#: C/evolution.xml:760(para)
+#: C/evolution.xml:774(para)
 msgid ""
 "The toolbar gives you fast and easy access to the frequently used features "
 "in each component."
@@ -2127,11 +2097,11 @@ msgstr ""
 "La barra de herramientas da acceso fácil y rápido a las características más "
 "usadas de cada componente."
 
-#: C/evolution.xml:763(title)
+#: C/evolution.xml:777(title)
 msgid "Search Tool:"
 msgstr "Herramienta de búsqueda:"
 
-#: C/evolution.xml:764(para)
+#: C/evolution.xml:778(para)
 msgid ""
 "The search tool lets you search your email, contacts, calendar, and tasks to "
 "easily find what you're looking for."
@@ -2139,11 +2109,11 @@ msgstr ""
 "La herramienta de búsqueda permite hacer búsquedas en el correo, contactos, "
 "calendario y tareas para encontrar fácilmente lo que está buscando."
 
-#: C/evolution.xml:767(title) C/evolution.xml:926(title)
+#: C/evolution.xml:781(title) C/evolution.xml:940(title)
 msgid "Message List:"
 msgstr "Lista de mensajes:"
 
-#: C/evolution.xml:768(para)
+#: C/evolution.xml:782(para)
 msgid ""
 "The message list displays a list of email that you have received. To view an "
 "email in the preview pane, click the email in the message list."
@@ -2152,11 +2122,11 @@ msgstr ""
 "un correo-e en el panel de vista previa, pulse en correo-e en la lista de "
 "mensajes."
 
-#: C/evolution.xml:771(title)
+#: C/evolution.xml:785(title)
 msgid "Side Bar:"
 msgstr "Barra lateral:"
 
-#: C/evolution.xml:772(para)
+#: C/evolution.xml:786(para)
 msgid ""
 "The side bar lets you switch between folders and between Evolution tools. At "
 "the bottom of the side bar is the switcher that lets you switch Evolution "
@@ -2171,11 +2141,11 @@ msgstr ""
 "información adicional, consulte <link linkend=\"usage-mainwindow-shortcutbar"
 "\">La barra lateral</link>."
 
-#: C/evolution.xml:775(title)
+#: C/evolution.xml:789(title)
 msgid "Switcher:"
 msgstr "Selector:"
 
-#: C/evolution.xml:776(para)
+#: C/evolution.xml:790(para)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
 "Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
@@ -2184,11 +2154,11 @@ msgstr ""
 "entre las herramientas de Evolution: correo, contactos, calendarios, notas y "
 "tareas."
 
-#: C/evolution.xml:779(title)
+#: C/evolution.xml:793(title)
 msgid "Status Bar:"
 msgstr "Barra de estado:"
 
-#: C/evolution.xml:780(para)
+#: C/evolution.xml:794(para)
 msgid ""
 "The status bar periodically displays a message, or tells you the progress of "
 "a task. This most often happens when you're checking or sending email. These "
@@ -2201,11 +2171,11 @@ msgstr ""
 "de Conectado/Desconectado está aquí también, en la esquina inferior "
 "izquierda de la ventana."
 
-#: C/evolution.xml:783(title) C/evolution.xml:930(title)
+#: C/evolution.xml:797(title) C/evolution.xml:944(title)
 msgid "Preview Pane:"
 msgstr "Panel de vista previa:"
 
-#: C/evolution.xml:784(para)
+#: C/evolution.xml:798(para)
 msgid ""
 "The preview pane displays the contents of the email that is selected in the "
 "message list."
@@ -2213,11 +2183,11 @@ msgstr ""
 "El panel de vista previa muestra el contenido del correo-e que está "
 "seleccionado en la lista de mensajes."
 
-#: C/evolution.xml:788(title)
+#: C/evolution.xml:802(title)
 msgid "The Menu Bar"
 msgstr "La barra del menú"
 
-#: C/evolution.xml:789(para)
+#: C/evolution.xml:803(para)
 msgid ""
 "The menu bar's contents always provide all the possible actions for any "
 "given view of your data. If you're looking at your Inbox, most of the menu "
@@ -2231,11 +2201,11 @@ msgstr ""
 "especialmente los del menú Archivo, lo estarán con la aplicación como un "
 "todo."
 
-#: C/evolution.xml:791(title)
+#: C/evolution.xml:805(title)
 msgid "File:"
 msgstr "Archivo:"
 
-#: C/evolution.xml:792(para)
+#: C/evolution.xml:806(para)
 msgid ""
 "Anything related to a file or to the operations of the application is listed "
 "in this menu, such as creating things, saving them to disk, printing them, "
@@ -2245,11 +2215,11 @@ msgstr ""
 "en este menú, como crear cosas, guardarlas en el disco, imprimirlas o salir "
 "del propio programa."
 
-#: C/evolution.xml:795(title)
+#: C/evolution.xml:809(title)
 msgid "Edit:"
 msgstr "Editar:"
 
-#: C/evolution.xml:796(para)
+#: C/evolution.xml:810(para)
 msgid ""
 "Holds useful tools that help you edit text and move it around. Also lets you "
 "access the settings and configuration options."
@@ -2257,11 +2227,11 @@ msgstr ""
 "Contiene herramientas útiles que le ayudan a editar texto y moverlo. También "
 "le permite acceder a los ajustes y a las opciones de configuración."
 
-#: C/evolution.xml:799(title)
+#: C/evolution.xml:813(title)
 msgid "View:"
 msgstr "Ver:"
 
-#: C/evolution.xml:800(para)
+#: C/evolution.xml:814(para)
 msgid ""
 "Lets you decide how Evolution should look. Some of the features control the "
 "appearance of Evolution as a whole, and others the way a particular kind of "
@@ -2271,11 +2241,11 @@ msgstr ""
 "opciones afectan la apariencia de todo Evolution, mientras otras sólo "
 "afectan a la forma en que aparece determinado tipo de información."
 
-#: C/evolution.xml:803(title)
+#: C/evolution.xml:817(title)
 msgid "Folder:"
 msgstr "Carpeta:"
 
-#: C/evolution.xml:804(para)
+#: C/evolution.xml:818(para)
 msgid ""
 "Holds actions that can be performed on folders. You can find things like "
 "copy, rename, delete, and so on."
@@ -2283,11 +2253,11 @@ msgstr ""
 "Contiene acciones que se pueden realizar en carpetas. Puede encontrar cosas "
 "como copiar, renombrar, borrar, y demás."
 
-#: C/evolution.xml:807(title)
+#: C/evolution.xml:821(title)
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: C/evolution.xml:808(para)
+#: C/evolution.xml:822(para)
 msgid ""
 "Holds actions that can be applied to a message. If there is only one target "
 "for the action, such as replying to a message, you can normally find it in "
@@ -2297,11 +2267,11 @@ msgstr ""
 "acción sólo tiene un objetivo, como responder a un mensaje, la encontrará en "
 "el menú Mensaje."
 
-#: C/evolution.xml:811(title)
+#: C/evolution.xml:825(title)
 msgid "Search:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:812(para)
+#: C/evolution.xml:826(para)
 msgid ""
 "Lets you search for messages, or for phrases within a message. You can also "
 "see previous searches you have made. In addition to the Search menu, there "
@@ -2313,19 +2283,19 @@ msgstr ""
 "una caja de entrada en la barra de herramientas que puede usar para buscar "
 "mensajes. Puede también crear una carpeta de búsqueda desde una búsqueda."
 
-#: C/evolution.xml:815(title)
+#: C/evolution.xml:829(title)
 msgid "Help:"
 msgstr "Ayuda:"
 
-#: C/evolution.xml:816(para)
+#: C/evolution.xml:830(para)
 msgid "Opens the Evolution help files."
 msgstr "Abre los archivos de ayuda de Evolution."
 
-#: C/evolution.xml:821(title)
+#: C/evolution.xml:835(title)
 msgid "The Sidebar"
 msgstr "La barra lateral"
 
-#: C/evolution.xml:822(para)
+#: C/evolution.xml:836(para)
 msgid ""
 "The Sidebar is the vertical panel on the left side of the Evolution main "
 "window. At the bottom of the Sidebar is the Switcher. This lets you switch "
@@ -2339,7 +2309,7 @@ msgstr ""
 "Correo y Contactos que son atajos. Sobre ellos hay una lista de carpetas "
 "para la herramienta actual de Evolution."
 
-#: C/evolution.xml:823(para)
+#: C/evolution.xml:837(para)
 msgid ""
 "The folder list organizes your email, calendars, address books, task lists "
 "and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
@@ -2360,7 +2330,7 @@ msgstr ""
 "carpetas de búsqueda, de las cuales se habla en <link linkend=\"usage-mail-"
 "organize-vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:824(para)
+#: C/evolution.xml:838(para)
 msgid ""
 "If you get large amounts of email, you might want more folders than just "
 "your Inbox. You can also create multiple calendar, task, or contacts folders."
@@ -2369,55 +2339,55 @@ msgstr ""
 "la «Bandeja de entrada».Puede crear varias carpetas de calendarios, tareas o "
 "contactos."
 
-#: C/evolution.xml:825(para)
+#: C/evolution.xml:839(para)
 msgid "To create a new folder:"
 msgstr "Para crear una carpeta nueva:"
 
-#: C/evolution.xml:828(para)
+#: C/evolution.xml:842(para)
 msgid "Click Folder &gt; New."
 msgstr "Pulse en Carpeta &gt; Nueva."
 
-#: C/evolution.xml:831(para)
+#: C/evolution.xml:845(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 
-#: C/evolution.xml:834(para)
+#: C/evolution.xml:848(para)
 msgid "Select the location of the new folder."
 msgstr "Seleccione la ubicación de la carpeta nueva."
 
-#: C/evolution.xml:837(para) C/evolution.xml:1294(para)
-#: C/evolution.xml:1320(para) C/evolution.xml:1332(para)
-#: C/evolution.xml:1502(para) C/evolution.xml:1576(para)
-#: C/evolution.xml:1858(para) C/evolution.xml:1960(para)
-#: C/evolution.xml:1976(para) C/evolution.xml:2294(para)
-#: C/evolution.xml:2336(para) C/evolution.xml:2402(para)
-#: C/evolution.xml:2882(para) C/evolution.xml:2915(para)
-#: C/evolution.xml:3111(para) C/evolution.xml:3153(para)
-#: C/evolution.xml:3283(para) C/evolution.xml:3377(para)
-#: C/evolution.xml:3392(para) C/evolution.xml:3410(para)
-#: C/evolution.xml:3468(para) C/evolution.xml:3514(para)
-#: C/evolution.xml:3721(para) C/evolution.xml:3725(para)
-#: C/evolution.xml:3952(para) C/evolution.xml:4321(para)
-#: C/evolution.xml:4387(para) C/evolution.xml:4509(para)
-#: C/evolution.xml:4552(para) C/evolution.xml:4884(para)
-#: C/evolution.xml:4939(para) C/evolution.xml:5390(para)
-#: C/evolution.xml:5465(para) C/evolution.xml:5487(para)
-#: C/evolution.xml:5511(para) C/evolution.xml:5545(para)
-#: C/evolution.xml:5889(para) C/evolution.xml:6024(para)
-#: C/evolution.xml:6051(para) C/evolution.xml:6071(para)
-#: C/evolution.xml:6086(para) C/evolution.xml:6109(para)
-#: C/evolution.xml:6135(para) C/evolution.xml:6267(para)
-#: C/evolution.xml:6290(para) C/evolution.xml:6368(para)
-#: C/evolution.xml:6398(para) C/evolution.xml:7061(para)
-#: C/evolution.xml:7159(para) C/evolution.xml:7294(para)
+#: C/evolution.xml:851(para) C/evolution.xml:1308(para)
+#: C/evolution.xml:1334(para) C/evolution.xml:1346(para)
+#: C/evolution.xml:1516(para) C/evolution.xml:1590(para)
+#: C/evolution.xml:1872(para) C/evolution.xml:1974(para)
+#: C/evolution.xml:1990(para) C/evolution.xml:2308(para)
+#: C/evolution.xml:2350(para) C/evolution.xml:2416(para)
+#: C/evolution.xml:2896(para) C/evolution.xml:2929(para)
+#: C/evolution.xml:3125(para) C/evolution.xml:3167(para)
+#: C/evolution.xml:3297(para) C/evolution.xml:3391(para)
+#: C/evolution.xml:3406(para) C/evolution.xml:3424(para)
+#: C/evolution.xml:3482(para) C/evolution.xml:3528(para)
+#: C/evolution.xml:3735(para) C/evolution.xml:3739(para)
+#: C/evolution.xml:3966(para) C/evolution.xml:4335(para)
+#: C/evolution.xml:4401(para) C/evolution.xml:4523(para)
+#: C/evolution.xml:4566(para) C/evolution.xml:4898(para)
+#: C/evolution.xml:4953(para) C/evolution.xml:5402(para)
+#: C/evolution.xml:5477(para) C/evolution.xml:5499(para)
+#: C/evolution.xml:5523(para) C/evolution.xml:5557(para)
+#: C/evolution.xml:5901(para) C/evolution.xml:6035(para)
+#: C/evolution.xml:6062(para) C/evolution.xml:6082(para)
+#: C/evolution.xml:6097(para) C/evolution.xml:6120(para)
+#: C/evolution.xml:6147(para) C/evolution.xml:6279(para)
+#: C/evolution.xml:6302(para) C/evolution.xml:6380(para)
+#: C/evolution.xml:6410(para) C/evolution.xml:7076(para)
+#: C/evolution.xml:7174(para) C/evolution.xml:7308(para)
 msgid "Click OK."
 msgstr "Pulse «Aceptar»."
 
-#: C/evolution.xml:842(title)
+#: C/evolution.xml:856(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Cambiar la apariencia del selector:"
 
-#: C/evolution.xml:843(para)
+#: C/evolution.xml:857(para)
 msgid ""
 "To change the appearance of your switcher click <emphasis>View &gt; Switcher "
 "Appearance</emphasis> from the Menu Bar. Under Switcher Appearance you can "
@@ -2427,53 +2397,53 @@ msgstr ""
 "Apariencia del selector</emphasis> desde la barra de menú. Bajo Apariencia "
 "del selector puede seleccionar:"
 
-#: C/evolution.xml:845(title)
+#: C/evolution.xml:859(title)
 msgid "Icons and Text:"
 msgstr "Iconos y texto:"
 
-#: C/evolution.xml:846(para)
+#: C/evolution.xml:860(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Muestra botones con la etiqueta y el icono correspondiente en él."
 
-#: C/evolution.xml:849(title)
+#: C/evolution.xml:863(title)
 msgid "Icons Only:"
 msgstr "Sólo iconos:"
 
-#: C/evolution.xml:850(para)
+#: C/evolution.xml:864(para)
 msgid "Shows only the icons."
 msgstr "Muestra sólo los iconos."
 
-#: C/evolution.xml:853(title)
+#: C/evolution.xml:867(title)
 msgid "Texts Only:"
 msgstr "Sólo texto:"
 
-#: C/evolution.xml:854(para)
+#: C/evolution.xml:868(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Muestra botones con la etiqueta, pero no iconos."
 
-#: C/evolution.xml:857(title)
+#: C/evolution.xml:871(title)
 msgid "Toolbar Style:"
 msgstr "Estilo de barra de herramientas:"
 
-#: C/evolution.xml:858(para)
+#: C/evolution.xml:872(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr ""
 "Muestra los botones usando los ajustes de barra de herramienta del "
 "escritorio."
 
-#: C/evolution.xml:861(title)
+#: C/evolution.xml:875(title)
 msgid "Hide Buttons:"
 msgstr "Ocultar botones:"
 
-#: C/evolution.xml:862(para)
+#: C/evolution.xml:876(para)
 msgid "This option hides all the shortcut buttons of switcher."
 msgstr "Esta opción oculta todos los botones de atajo del selector."
 
-#: C/evolution.xml:867(title)
+#: C/evolution.xml:881(title)
 msgid "Folder Management"
 msgstr "Gestión de carpetas"
 
-#: C/evolution.xml:868(para)
+#: C/evolution.xml:882(para)
 msgid ""
 "Right-click a folder or subfolder to display a menu with the following "
 "options:"
@@ -2481,11 +2451,11 @@ msgstr ""
 "Pulse con el botón derecho en una carpeta o subcarpeta para mostrar un menú "
 "con las siguientes opciones:"
 
-#: C/evolution.xml:870(title)
+#: C/evolution.xml:884(title)
 msgid "Copy:"
 msgstr "Copiar:"
 
-#: C/evolution.xml:871(para)
+#: C/evolution.xml:885(para)
 msgid ""
 "Copies the folder to a different location. When you select this item, "
 "Evolution offers a choice of locations to copy the folder to."
@@ -2493,11 +2463,11 @@ msgstr ""
 "Copia la carpeta a un lugar diferente. Cuando seleccione este elemento, "
 "Evolution ofrece una selección de lugares donde copiar la carpeta."
 
-#: C/evolution.xml:874(title)
+#: C/evolution.xml:888(title)
 msgid "Move:"
 msgstr "Mover:"
 
-#: C/evolution.xml:875(para)
+#: C/evolution.xml:889(para)
 msgid ""
 "Moves the folder to another location. When you select this item, Evolution "
 "offers a choice of locations to move the folder to."
@@ -2505,51 +2475,51 @@ msgstr ""
 "Mueve la carpeta a un lugar diferente. Cuando seleccione este elemento, "
 "Evolution ofrece una selección de lugares donde mover la carpeta."
 
-#: C/evolution.xml:878(title)
+#: C/evolution.xml:892(title)
 msgid "Mark Messages As Read:"
 msgstr "Marcar los mensajes como leídos:"
 
-#: C/evolution.xml:879(para)
+#: C/evolution.xml:893(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Marca todos los mensajes en la carpeta como leídos."
 
-#: C/evolution.xml:882(title)
+#: C/evolution.xml:896(title)
 msgid "New Folder:"
 msgstr "Carpeta nueva:"
 
-#: C/evolution.xml:883(para)
+#: C/evolution.xml:897(para)
 msgid "Creates another folder in the same location."
 msgstr "Crea otra carpeta en el mismo lugar."
 
-#: C/evolution.xml:886(title) C/evolution.xml:3041(title)
+#: C/evolution.xml:900(title) C/evolution.xml:3055(title)
 msgid "Delete:"
 msgstr "Borrar:"
 
-#: C/evolution.xml:887(para)
+#: C/evolution.xml:901(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Borra la carpeta y todo su contenido."
 
-#: C/evolution.xml:890(title)
+#: C/evolution.xml:904(title)
 msgid "Rename:"
 msgstr "Renombrar:"
 
-#: C/evolution.xml:891(para)
+#: C/evolution.xml:905(para)
 msgid "Lets you change the name of the folder."
 msgstr "Le permite cambiar el nombre de la carpeta."
 
-#: C/evolution.xml:894(title)
+#: C/evolution.xml:908(title)
 msgid "Disable:"
 msgstr "Desactivar:"
 
-#: C/evolution.xml:895(para)
+#: C/evolution.xml:909(para)
 msgid "Disables the account."
 msgstr "Desactiva la cuenta."
 
-#: C/evolution.xml:898(title)
+#: C/evolution.xml:912(title)
 msgid "Properties:"
 msgstr "Propiedades:"
 
-#: C/evolution.xml:899(para)
+#: C/evolution.xml:913(para)
 msgid ""
 "Checks the number of total and unread messages in a folder, and, for remote "
 "folders, lets you select whether to copy the folder to your local system for "
@@ -2559,14 +2529,14 @@ msgstr ""
 "las carpetas remotas, le permite seleccionar si se copia la carpeta a su "
 "sistema local para operación desconectada."
 
-#: C/evolution.xml:901(para)
+#: C/evolution.xml:915(para)
 msgid ""
 "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "También puede reorganizar las carpetas y los mensajes arrastrándolos y "
 "soltándolos donde desee."
 
-#: C/evolution.xml:902(para)
+#: C/evolution.xml:916(para)
 msgid ""
 "Any time new email arrives in a email folder, that folder label is displayed "
 "in bold text, along with the number of new messages in that folder."
@@ -2574,15 +2544,15 @@ msgstr ""
 "Siempre que llegue un mensaje nuevo a una carpeta de correo, su nombre se "
 "mostrará en negrita junto al número de mensajes nuevos en esa carpeta."
 
-#: C/evolution.xml:907(title)
+#: C/evolution.xml:921(title)
 msgid "Email"
 msgstr "Correo-e"
 
-#: C/evolution.xml:908(para)
+#: C/evolution.xml:922(para)
 msgid "Evolution email is like other email programs in several ways:"
 msgstr "Evolution es como cualquier otro programa de correo electrónico:"
 
-#: C/evolution.xml:911(para)
+#: C/evolution.xml:925(para)
 msgid ""
 "It can send and receive email in HTML or as plain text, and makes it easy to "
 "send and receive multiple file attachments."
@@ -2590,7 +2560,7 @@ msgstr ""
 "Permite enviar y recibir mensajes en HTML o en texto sencillo, y facilita el "
 "envío y recepción de múltiples archivos adjuntos."
 
-#: C/evolution.xml:914(para)
+#: C/evolution.xml:928(para)
 msgid ""
 "It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, and local mbox or MH spools and "
@@ -2600,7 +2570,7 @@ msgstr ""
 "link>, <link linkend=\"pop\">POP3</link>, y archivos locales mbox o spool MH "
 "y archivos creados por otros programas de correo."
 
-#: C/evolution.xml:917(para)
+#: C/evolution.xml:931(para)
 msgid ""
 "It can sort and organize your email in a wide variety of ways with folders, "
 "searches, and filters."
@@ -2608,11 +2578,11 @@ msgstr ""
 "Puede ordenar y organizar su correo en una amplia gama de maneras con "
 "carpetas, búsquedas y filtros."
 
-#: C/evolution.xml:920(para)
+#: C/evolution.xml:934(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr "Permite proteger su privacidad utilizando cifrado."
 
-#: C/evolution.xml:923(para)
+#: C/evolution.xml:937(para)
 msgid ""
 "However, Evolution has some important differences from other email programs. "
 "First, it is built to handle very large amounts of email. The <link linkend="
@@ -2639,7 +2609,7 @@ msgstr ""
 "todos sus mensajes para poder referirse a ellos posteriormente. Aquí hay una "
 "explicación de qué es lo que hay en su ventana de correo-e de Evolution."
 
-#: C/evolution.xml:927(para)
+#: C/evolution.xml:941(para)
 msgid ""
 "The message list displays all the messages that you have. This includes all "
 "your read and unread messages, and email that is flagged to be deleted."
@@ -2647,7 +2617,7 @@ msgstr ""
 "La lista de mensajes muestra todos los mensajes que tiene. Esto incluye "
 "todos sus mensajes leídos y no leídos, y el correo marcado para borrar."
 
-#: C/evolution.xml:931(para)
+#: C/evolution.xml:945(para)
 msgid ""
 "The preview pane displays the message that is currently chosen in the "
 "message list."
@@ -2655,7 +2625,7 @@ msgstr ""
 "El panel de vista previa muestra el mensaje actualmente seleccionado en la "
 "lista de mensajes."
 
-#: C/evolution.xml:933(para)
+#: C/evolution.xml:947(para)
 msgid ""
 "If you find the preview pane too small, you can resize the pane, enlarge the "
 "whole window, or double-click the message in the message list to have it "
@@ -2668,7 +2638,7 @@ msgstr ""
 "cambiar los tamaños de un panel sólo hay que pulsar en la línea divisoria y "
 "arrastrarla arriba y abajo hasta la posición deseada."
 
-#: C/evolution.xml:934(para)
+#: C/evolution.xml:948(para)
 msgid ""
 "As with folders, you can right-click messages in the message list and get a "
 "menu of possible actions, including moving or deleting them, creating "
@@ -2679,7 +2649,7 @@ msgstr ""
 "o recuperarlo, crear carpetas de búsqueda y filtros basados en ellos y "
 "marcarlos como spam."
 
-#: C/evolution.xml:935(para)
+#: C/evolution.xml:949(para)
 msgid ""
 "Most of the email-related actions you want to perform are listed in the "
 "Message menu and Folder menu in the menu bar. The most frequently used ones, "
@@ -2692,7 +2662,7 @@ msgstr ""
 "herramientas. La mayoría de ellos también aparecen también en el menú "
 "contextual (con el botón derecho) y como atajos de teclado."
 
-#: C/evolution.xml:936(para)
+#: C/evolution.xml:950(para)
 msgid ""
 "For an in-depth guide to the email capabilities of Evolution, read <link "
 "linkend=\"usage-mail\">Sending and Receiving Email</link>."
@@ -2701,11 +2671,11 @@ msgstr ""
 "Evolution, lea <link linkend=\"usage-mail\">Envío y recepción de correo-e</"
 "link>."
 
-#: C/evolution.xml:940(title)
+#: C/evolution.xml:954(title)
 msgid "The Calendar"
 msgstr "El calendario"
 
-#: C/evolution.xml:941(para)
+#: C/evolution.xml:955(para)
 msgid ""
 "To begin using the calendar, click Calendar in the Switcher. By default, the "
 "calendar shows today's schedule on a ruled background. At the left bottom, "
@@ -2720,19 +2690,19 @@ msgstr ""
 "tareas, donde puede mantener una lista de tareas separada de sus citas de "
 "calendario. Debajo hay una lista de notas."
 
-#: C/evolution.xml:944(title)
+#: C/evolution.xml:958(title)
 msgid "Appointment List:"
 msgstr "Lista de citas:"
 
-#: C/evolution.xml:945(para)
+#: C/evolution.xml:959(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr "La lista de citas muestra todas sus citas programadas."
 
-#: C/evolution.xml:948(title)
+#: C/evolution.xml:962(title)
 msgid "Month Pane:"
 msgstr "Panel del mes:"
 
-#: C/evolution.xml:949(para)
+#: C/evolution.xml:963(para)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -2744,11 +2714,11 @@ msgstr ""
 "rango de días en el panel del mes para mostrar un rango de días en la lista "
 "de citas."
 
-#: C/evolution.xml:952(title)
+#: C/evolution.xml:966(title)
 msgid "Task List:"
 msgstr "Lista de tareas:"
 
-#: C/evolution.xml:953(para)
+#: C/evolution.xml:967(para)
 msgid ""
 "Tasks are distinct from appointments because they generally don't have times "
 "associated with them. You can use the list in a larger window by clicking "
@@ -2758,7 +2728,7 @@ msgstr ""
 "asociadas con ellas. Puede usar la lista en una vista más grande pulsando el "
 "botón Tareas en la barra lateral."
 
-#: C/evolution.xml:955(para)
+#: C/evolution.xml:969(para)
 msgid ""
 "For more information about the calendar, see <link linkend=\"usage-calendar"
 "\">Evolution Calendar</link>."
@@ -2766,11 +2736,11 @@ msgstr ""
 "Para saber más acerca del calendario lea <link linkend=\"usage-calendar"
 "\">Calendario de Evolution</link>."
 
-#: C/evolution.xml:959(title)
+#: C/evolution.xml:973(title)
 msgid "The Contacts"
 msgstr "Los contactos"
 
-#: C/evolution.xml:960(para)
+#: C/evolution.xml:974(para)
 msgid ""
 "The Evolution contacts can handle all of the functions of an address book or "
 "phone book. However, it is easier to update Evolution than it is to change "
@@ -2784,7 +2754,7 @@ msgstr ""
 "porque Evolution puede sincronizarse con dispositivos Palm OS* y usar "
 "directorios <link linkend=\"ldap\">LDAP</link> conectados a una red."
 
-#: C/evolution.xml:961(para)
+#: C/evolution.xml:975(para)
 msgid ""
 "To use the contacts tool, click Contacts in the Switcher. By default, the "
 "display shows all your contacts in alphabetical order, in a minicard view. "
@@ -2797,7 +2767,7 @@ msgstr ""
 "ajustar la anchura de las columnas pulsando y arrastrando los divisores de "
 "columnas grises."
 
-#: C/evolution.xml:963(para)
+#: C/evolution.xml:977(para)
 msgid ""
 "Another advantage of the Evolution contacts is its integration with the rest "
 "of the application. For example, you can right-click an email address in "
@@ -2808,11 +2778,11 @@ msgstr ""
 "un mensaje de correo sólo pulsando con el botón derecho sobre una dirección "
 "de correo-e."
 
-#: C/evolution.xml:964(emphasis)
+#: C/evolution.xml:978(emphasis)
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: C/evolution.xml:965(para)
+#: C/evolution.xml:979(para)
 msgid ""
 "The largest section of the contacts display shows a list of individual "
 "contacts. You can also search the contacts in the same way that you search "
@@ -2823,7 +2793,7 @@ msgstr ""
 "que con las carpetas de correo, usando la barra de búsqueda que está en el "
 "lado derecho de la barra de herramientas."
 
-#: C/evolution.xml:966(para)
+#: C/evolution.xml:980(para)
 msgid ""
 "For detailed instructions on how to use the address book, read <link linkend="
 "\"usage-contact\">Evolution Contacts: the Address Book</link>."
@@ -2832,11 +2802,11 @@ msgstr ""
 "lea <link linkend=\"usage-contact\">Contactos de Evolution: La libreta de "
 "direcciones</link>."
 
-#: C/evolution.xml:971(title)
+#: C/evolution.xml:985(title)
 msgid "Backing Up and Restoring Evolution"
 msgstr "Respaldar y restaurar Evolution"
 
-#: C/evolution.xml:972(para)
+#: C/evolution.xml:986(para)
 msgid ""
 "With the Backup and Restore plugin enabled, you can successfully back up "
 "Evolution to your machine and restore it whenever it is required. The backup "
@@ -2848,7 +2818,7 @@ msgstr ""
 "guarda sus ajustes, correos, contactos, tareas, notas y calendarios de "
 "Evolution y crea un archivador."
 
-#: C/evolution.xml:975(para)
+#: C/evolution.xml:989(para)
 msgid ""
 "Select File &gt; Backup Settings to select the folder where you want to save "
 "the backup."
@@ -2856,11 +2826,11 @@ msgstr ""
 "Seleccione Archivo &gt; Configuración del respaldo para seleccionar la "
 "carpeta donde guardar el respaldo."
 
-#: C/evolution.xml:977(para)
+#: C/evolution.xml:991(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr "Evolution siempre se respalda como evolution-backup.tar.gz."
 
-#: C/evolution.xml:978(para)
+#: C/evolution.xml:992(para)
 msgid ""
 "Before the backup process starts, it asks you to close Evolution and "
 "displays a warning as shown below:"
@@ -2868,7 +2838,7 @@ msgstr ""
 "Antes de que comience el proceso de respaldo, se le preguntará para que "
 "cierre Evolution y se mostrará un mensaje de advertencia como el de abajo:"
 
-#: C/evolution.xml:983(para)
+#: C/evolution.xml:997(para)
 msgid ""
 "Select Restart Evolution after backup to restart Evolution immediately after "
 "the backup process."
@@ -2877,23 +2847,23 @@ msgstr ""
 "inmediatamente después del proceso de respaldo."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:986(para)
+#: C/evolution.xml:1000(para)
 msgid "Click Yes to close Evolution and start the backup."
 msgstr "Pulse Sí para cerrar Evolution e iniciar el respaldo."
 
-#: C/evolution.xml:988(para) C/evolution.xml:1006(para)
+#: C/evolution.xml:1002(para) C/evolution.xml:1020(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution se iniciará automáticamente después del proceso."
 
-#: C/evolution.xml:993(title)
+#: C/evolution.xml:1007(title)
 msgid "Restoring Evolution"
 msgstr "Restaurar Evolution"
 
-#: C/evolution.xml:994(para)
+#: C/evolution.xml:1008(para)
 msgid "This feature restores your settings from the archive."
 msgstr "Esta característica restaura sus ajustes desde el archivo."
 
-#: C/evolution.xml:997(para)
+#: C/evolution.xml:1011(para)
 msgid ""
 "Select File &gt; Restore Settings to open the available evolution-backup.tar."
 "gz files."
@@ -2901,11 +2871,11 @@ msgstr ""
 "Seleccione Archivo &gt; Restaurar ajustes... para abrir los archivos "
 "evolution-backup.tar.gz disponibles."
 
-#: C/evolution.xml:1000(para)
+#: C/evolution.xml:1014(para)
 msgid "Select the evolution-backup.tar.gz and click Save."
 msgstr "Seleccione el archivo evolution-backup.tar.gz y pulse Guardar."
 
-#: C/evolution.xml:1001(para)
+#: C/evolution.xml:1015(para)
 msgid ""
 "Before the process starts, a pop-up window appears and asks you to close "
 "Evolution. Close all the windows and then click Restore in the pop-up window."
@@ -2914,7 +2884,7 @@ msgstr ""
 "preguntándole para que cierre Evolution. Cierre las ventanas y pulse "
 "Restaurar en la ventana emergente."
 
-#: C/evolution.xml:1003(para)
+#: C/evolution.xml:1017(para)
 msgid ""
 "If you are creating your first account via the Startup Wizard, you can use "
 "the option to restore from the archive if it is available locally."
@@ -2922,11 +2892,11 @@ msgstr ""
 "Si está creando su primera cuenta a través del asistente, tiene una opción "
 "para restaurar desde el archivador si está disponible localmente."
 
-#: C/evolution.xml:1013(title)
+#: C/evolution.xml:1027(title)
 msgid "Command Line Options"
 msgstr "Opciones de la línea de órdenes"
 
-#: C/evolution.xml:1014(para)
+#: C/evolution.xml:1028(para)
 msgid ""
 "Evolution has a number of command line options that you can use. For more "
 "information about command line options, open a terminal window and type "
@@ -2937,37 +2907,37 @@ msgstr ""
 "comandos, abra una ventana de terminal y teclee <command>evolution --help</"
 "command>."
 
-#: C/evolution.xml:1015(para)
+#: C/evolution.xml:1029(para)
 msgid "The most important command line options are:"
 msgstr "Las opciones para la línea de comandos más importantes son:"
 
-#: C/evolution.xml:1023(para)
+#: C/evolution.xml:1037(para)
 msgid "Command"
 msgstr "Orden"
 
-#: C/evolution.xml:1026(para) C/evolution.xml:1763(para)
-#: C/evolution.xml:6921(para)
+#: C/evolution.xml:1040(para) C/evolution.xml:1777(para)
+#: C/evolution.xml:6936(para)
 msgid "Description"
 msgstr "Descripción"
 
-#: C/evolution.xml:1033(para)
+#: C/evolution.xml:1047(para)
 msgid "evolution --offline"
 msgstr "evolution --offline"
 
-#: C/evolution.xml:1036(para)
+#: C/evolution.xml:1050(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Inicia Evolution en modo desconectado."
 
-#: C/evolution.xml:1041(para)
+#: C/evolution.xml:1055(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: C/evolution.xml:1044(para)
+#: C/evolution.xml:1058(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr ""
 "Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
 
-#: C/evolution.xml:1045(para)
+#: C/evolution.xml:1059(para)
 msgid ""
 "This prevents Evolution from opening the most recently selected message, "
 "task or contact, thus providing a way to avoid an application crash caused "
@@ -2978,56 +2948,56 @@ msgstr ""
 "evitar otro cuelgue causado por la vista preliminar de un mensaje, tarea o "
 "contacto."
 
-#: C/evolution.xml:1050(para)
+#: C/evolution.xml:1064(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
-#: C/evolution.xml:1053(para)
+#: C/evolution.xml:1067(para)
 msgid ""
 "Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Inicia Evolution y empieza redactando un mensaje a la dirección de correo "
 "listada."
 
-#: C/evolution.xml:1058(para)
+#: C/evolution.xml:1072(para)
 msgid "evolution -c mail"
 msgstr "evolution -c mail"
 
-#: C/evolution.xml:1061(para)
+#: C/evolution.xml:1075(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Inicia Evolution en modo correo."
 
-#: C/evolution.xml:1066(para)
+#: C/evolution.xml:1080(para)
 msgid "evolution -c calendar"
 msgstr "evolution -c calendar"
 
-#: C/evolution.xml:1069(para)
+#: C/evolution.xml:1083(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Inicia Evolution en modo calendario."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1074(para)
+#: C/evolution.xml:1088(para)
 msgid "evolution -c contacts"
 msgstr "evolution -c contacts"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1077(para)
+#: C/evolution.xml:1091(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Inicia Evolution en modo contactos."
 
-#: C/evolution.xml:1082(para)
+#: C/evolution.xml:1096(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution --force-shutdown"
 
-#: C/evolution.xml:1085(para)
+#: C/evolution.xml:1099(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Fuerza cada componente de Evolution a terminar inmediatamente."
 
-#: C/evolution.xml:1090(para)
+#: C/evolution.xml:1104(para)
 msgid "evolution <quote>%s</quote>"
 msgstr "evolution <quote>%s</quote>"
 
-#: C/evolution.xml:1093(para)
+#: C/evolution.xml:1107(para)
 msgid ""
 "Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
@@ -3035,7 +3005,7 @@ msgstr ""
 "Hace de Evolution su manipulador de correo-e predeterminado para su "
 "navegador web y en el centro de control de GNOME*."
 
-#: C/evolution.xml:1104(para)
+#: C/evolution.xml:1118(para)
 msgid ""
 "This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
 "Email</link>, provide you with an in-depth guide to the capabilities of "
@@ -3051,33 +3021,33 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1107(link) C/evolution.xml:1127(title)
+#: C/evolution.xml:1121(link) C/evolution.xml:1141(title)
 msgid "Reading Mail"
 msgstr "Lectura de correo"
 
-#: C/evolution.xml:1110(link) C/evolution.xml:1425(title)
+#: C/evolution.xml:1124(link) C/evolution.xml:1439(title)
 msgid "Composing New Email Messages"
 msgstr "Redacción de mensajes de correo-e nuevos"
 
-#: C/evolution.xml:1113(link) C/evolution.xml:2035(title)
+#: C/evolution.xml:1127(link) C/evolution.xml:2049(title)
 msgid "Templates"
 msgstr "Plantillas"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1116(link) C/evolution.xml:2136(title)
+#: C/evolution.xml:1130(link) C/evolution.xml:2150(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envío de invitaciones por correo"
 
-#: C/evolution.xml:1119(link) C/evolution.xml:2159(title)
+#: C/evolution.xml:1133(link) C/evolution.xml:2173(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestor de suscripciones IMAP"
 
-#: C/evolution.xml:1122(link) C/evolution.xml:2183(title)
+#: C/evolution.xml:1136(link) C/evolution.xml:2197(title)
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: C/evolution.xml:1128(para)
+#: C/evolution.xml:1142(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -3089,7 +3059,7 @@ msgstr ""
 "la lista de mensajes, si quiere verlo en su propia ventana, puede o bien "
 "pulsar dos veces en él, pulsar Intro o pulsar Ctrl+O."
 
-#: C/evolution.xml:1130(para)
+#: C/evolution.xml:1144(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
 "press Backspace to page up while reading an email. Ensure that you use the "
@@ -3100,7 +3070,7 @@ msgstr ""
 "lee un correo-e. Asegúrese de que usa las teclas cuando la lista de mensajes "
 "está activada."
 
-#: C/evolution.xml:1131(para)
+#: C/evolution.xml:1145(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
@@ -3118,11 +3088,11 @@ msgstr ""
 "corchete derecho (]) para el siguiente mensaje no leído y el corchete "
 "izquierdo ([) para el mensaje anterior no leído."
 
-#: C/evolution.xml:1135(title)
+#: C/evolution.xml:1149(title)
 msgid "Magic Spacebar for Reading Mail"
 msgstr "Barra espaciadora mágica para leer correos"
 
-#: C/evolution.xml:1136(para)
+#: C/evolution.xml:1150(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
 "folders. You can read mail, scroll through mail and switch folders by using "
@@ -3132,29 +3102,29 @@ msgstr ""
 "en todas las carpetas de correo. Puede leer correo, deslizar el correo y "
 "cambiar entre las carpetas usando la barra espaciadora de su teclado."
 
-#: C/evolution.xml:1137(para)
+#: C/evolution.xml:1151(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Activar la Barra espaciadora mágica:"
 
-#: C/evolution.xml:1140(para) C/evolution.xml:1287(para)
-#: C/evolution.xml:2282(para) C/evolution.xml:2324(para)
-#: C/evolution.xml:2385(para) C/evolution.xml:5257(para)
-#: C/evolution.xml:5530(para) C/evolution.xml:5813(para)
-#: C/evolution.xml:5829(para) C/evolution.xml:6247(para)
+#: C/evolution.xml:1154(para) C/evolution.xml:1301(para)
+#: C/evolution.xml:2296(para) C/evolution.xml:2338(para)
+#: C/evolution.xml:2399(para) C/evolution.xml:5271(para)
+#: C/evolution.xml:5542(para) C/evolution.xml:5825(para)
+#: C/evolution.xml:5841(para) C/evolution.xml:6259(para)
 msgid "Select Edit &gt; Preferences, then select Mail Accounts."
 msgstr "Pulse Editar &gt; Preferencias, después seleccione Cuentas de correo."
 
-#: C/evolution.xml:1143(para)
+#: C/evolution.xml:1157(para)
 msgid "Select the Enable Magic Spacebar check box."
 msgstr "Activar la casilla de verificación de la Barra espaciadora mágica."
 
-#: C/evolution.xml:1146(para)
+#: C/evolution.xml:1160(para)
 msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Cuando esté en la vista de correo, la barra espaciadora se comportará de la "
 "siguiente manera:"
 
-#: C/evolution.xml:1149(para)
+#: C/evolution.xml:1163(para)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -3162,7 +3132,7 @@ msgstr ""
 "Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
 "correo no leído."
 
-#: C/evolution.xml:1152(para)
+#: C/evolution.xml:1166(para)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as Page Down "
 "key."
@@ -3170,7 +3140,7 @@ msgstr ""
 "Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
 "como avance de página."
 
-#: C/evolution.xml:1155(para)
+#: C/evolution.xml:1169(para)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -3178,7 +3148,7 @@ msgstr ""
 "Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
 "lleva al siguiente mensaje no leído."
 
-#: C/evolution.xml:1158(para)
+#: C/evolution.xml:1172(para)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -3186,7 +3156,7 @@ msgstr ""
 "Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
 "le lleva al siguiente mensaje sin leer en la siguiente carpeta."
 
-#: C/evolution.xml:1161(para)
+#: C/evolution.xml:1175(para)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -3197,11 +3167,11 @@ msgstr ""
 "siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
 "sobre la carpeta."
 
-#: C/evolution.xml:1167(title)
+#: C/evolution.xml:1181(title)
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: C/evolution.xml:1168(para)
+#: C/evolution.xml:1182(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
@@ -3215,7 +3185,7 @@ msgstr ""
 "información acerca de crear cuentas de correo consulte <link linkend=\"usage-"
 "mainwindow-starting\">Iniciar Evolution por primera vez</link>."
 
-#: C/evolution.xml:1169(para)
+#: C/evolution.xml:1183(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
@@ -3225,7 +3195,7 @@ msgstr ""
 "Evolution que almacena su contraseña, se le pedirá la contraseña. Introduzca "
 "su contraseña para descargar su correo."
 
-#: C/evolution.xml:1170(para)
+#: C/evolution.xml:1184(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3236,11 +3206,11 @@ msgstr ""
 "linkend=\"mail-prefs-headers\">Opciones de las cabeceras del correo</link> o "
 "pregunte al administrador del sistema."
 
-#: C/evolution.xml:1174(title)
+#: C/evolution.xml:1188(title)
 msgid "New Mail Notification"
 msgstr "Notificaciones de correo nuevo"
 
-#: C/evolution.xml:1175(para)
+#: C/evolution.xml:1189(para)
 msgid ""
 "Evolution can notify you of new messages. When you receive a new message in "
 "your inbox, a blinking icon appears on the Switcher."
@@ -3248,7 +3218,7 @@ msgstr ""
 "Evolution puede notificarle la llegada de nuevo correo-e. Cuando reciba un "
 "nuevo correo en su buzón aparecerá un icono parpadeante en el Selector."
 
-#: C/evolution.xml:1176(para)
+#: C/evolution.xml:1190(para)
 msgid ""
 "You can also view a blinking icon (<inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/>) in the notification area that disappears when "
@@ -3260,7 +3230,7 @@ msgstr ""
 "desaparece cuando abre el correo nuevo. Mantener el ratón sobre el icono "
 "mostrará el mensaje de notificación."
 
-#: C/evolution.xml:1178(para)
+#: C/evolution.xml:1192(para)
 msgid ""
 "To enable this feature, select Edit &gt; Plugins, then select the Mail "
 "Notification check box. You can configure the plugin by specifing the "
@@ -3271,11 +3241,11 @@ msgstr ""
 "configurar el complemento especificando lo siguiente en el Gestor de "
 "complementos."
 
-#: C/evolution.xml:1181(title)
+#: C/evolution.xml:1195(title)
 msgid "Notify new messages for Inbox only:"
 msgstr "Notificar nuevos mensajes sólo para la bandeja de entrada:"
 
-#: C/evolution.xml:1182(para)
+#: C/evolution.xml:1196(para)
 msgid ""
 "Select this option to restrict the mail notification to Inbox. With this "
 "option enabled, you are notified of each new message arrival in the Inbox."
@@ -3284,11 +3254,11 @@ msgstr ""
 "bandeja de entrada. Con esta opción activada se le notificará cada mensaje "
 "nuevo que llegue a la bandeja de entrada."
 
-#: C/evolution.xml:1185(title)
+#: C/evolution.xml:1199(title)
 msgid "Generate D-Bus message:"
 msgstr "Generar un mensaje D-Bus:"
 
-#: C/evolution.xml:1186(para)
+#: C/evolution.xml:1200(para)
 msgid ""
 "D-Bus is a fast, lightweight message bus system that allows applications to "
 "communicate with each other. Select this option to generate a D-Bus message "
@@ -3298,11 +3268,11 @@ msgstr ""
 "aplicaciones comunicarse entre ellas. Seleccione esta opción para generar un "
 "mensaje D-Bus en el bus de sesión siempre que llegue un mensaje nuevo."
 
-#: C/evolution.xml:1189(title)
+#: C/evolution.xml:1203(title)
 msgid "Show icon in the notification area:"
 msgstr "Mostrar icono en el área de notificación:"
 
-#: C/evolution.xml:1190(para)
+#: C/evolution.xml:1204(para)
 msgid ""
 "Select this option to display a new mail icon in the notification area when "
 "a new message arrives. You have two options to select from:"
@@ -3311,11 +3281,11 @@ msgstr ""
 "notificación cuando llegue un mensaje nuevo. Tiene dos opciones para "
 "seleccionar:"
 
-#: C/evolution.xml:1195(title)
+#: C/evolution.xml:1209(title)
 msgid "Blinking icon in the notification area:"
 msgstr "Icono parpadeante en el área de notificación:"
 
-#: C/evolution.xml:1196(para)
+#: C/evolution.xml:1210(para)
 msgid ""
 "Select this option to make the new mail icon blink in the notification area "
 "on arrival of a new message."
@@ -3323,11 +3293,11 @@ msgstr ""
 "Seleccione esta opción para hacer que el icono de correo nuevo parpadee en "
 "el área de notificación al llegar un mensaje nuevo."
 
-#: C/evolution.xml:1201(title)
+#: C/evolution.xml:1215(title)
 msgid "Popup message together with the icon:"
 msgstr "Mensaje emergente junto con el icono:"
 
-#: C/evolution.xml:1202(para)
+#: C/evolution.xml:1216(para)
 msgid ""
 "Select this option to make the new message pop up along with the new mail "
 "icon."
@@ -3335,30 +3305,30 @@ msgstr ""
 "Seleccione esta opción para hacer que aparezca un mensaje emergente junto "
 "con el icono de correo nuevo."
 
-#: C/evolution.xml:1207(title)
+#: C/evolution.xml:1221(title)
 msgid "Play sound when new messages arrive:"
 msgstr "Reproducir un sonido cuando llegue correo nuevo:"
 
-#: C/evolution.xml:1208(para)
+#: C/evolution.xml:1222(para)
 msgid "You have two options to select from:"
 msgstr "Hay dos opciones que puede seleccionar:"
 
-#: C/evolution.xml:1213(title) C/evolution.xml:3083(title)
+#: C/evolution.xml:1227(title) C/evolution.xml:3097(title)
 msgid "Beep:"
 msgstr "Pitar:"
 
-#: C/evolution.xml:1214(para)
+#: C/evolution.xml:1228(para)
 msgid ""
 "Select this option to play a beep sound on the arrival of a new message."
 msgstr ""
 "Seleccione esta opción para reproducir un pitido cuando llegue un mensaje de "
 "correo nuevo."
 
-#: C/evolution.xml:1219(title)
+#: C/evolution.xml:1233(title)
 msgid "Play sound file:"
 msgstr "Reproducir un archivo de sonido:"
 
-#: C/evolution.xml:1220(para)
+#: C/evolution.xml:1234(para)
 msgid ""
 "Select this option to play a sound file of your choice on the arrival of a "
 "new message."
@@ -3366,33 +3336,33 @@ msgstr ""
 "Seleccione esta opción para reproducir un archivo de sonido a su elección "
 "cuando llegue un mensaje de coreo nuevo."
 
-#: C/evolution.xml:1224(para)
+#: C/evolution.xml:1238(para)
 msgid "To specify the sound file you want to play:"
 msgstr "Para especificar el archivo de sonido que quiere reproducir:"
 
-#: C/evolution.xml:1227(para)
+#: C/evolution.xml:1241(para)
 msgid "Click None to open the Select Sound File browser window."
 msgstr ""
 "Pulse Ninguno para abrir la ventana del explorador para Seleccionar un "
 "archivo de sonido."
 
-#: C/evolution.xml:1230(para)
+#: C/evolution.xml:1244(para)
 msgid "Browse to find the sound file of your choice."
 msgstr "Examine para buscar el archivo de sonido a su elección."
 
-#: C/evolution.xml:1233(para)
+#: C/evolution.xml:1247(para)
 msgid "Click Open to select the sound file."
 msgstr "Pulse Abrir para seleccionar el archivo de sonido."
 
-#: C/evolution.xml:1236(para)
+#: C/evolution.xml:1250(para)
 msgid "Click Play to listen to the file."
 msgstr "Pulse Reproducir para escuchar el archivo de sonido."
 
-#: C/evolution.xml:1242(title)
+#: C/evolution.xml:1256(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Vista vertical y vista clásica"
 
-#: C/evolution.xml:1243(para)
+#: C/evolution.xml:1257(para)
 msgid ""
 "Evolution provides a vertical view in addition to the classical view. In the "
 "vertical view, the message preview pane is located at the right side of the "
@@ -3407,17 +3377,17 @@ msgstr ""
 "vista vertical le permite usar la anchura adicional en los monitores de "
 "pantalla panorámica."
 
-#: C/evolution.xml:1245(title)
+#: C/evolution.xml:1259(title)
 msgid "Vertical View:"
 msgstr "Vista vertical:"
 
-#: C/evolution.xml:1246(para)
+#: C/evolution.xml:1260(para)
 msgid "To switch to vertical view, click View &gt; Preview &gt; Vertical View."
 msgstr ""
 "Para cambiar a la vista vertical, pulse Ver &gt; Vista previa &gt; Vista "
 "vertical."
 
-#: C/evolution.xml:1248(para)
+#: C/evolution.xml:1262(para)
 msgid ""
 "In vertical view, the message list contains double lines of compressed "
 "headers, which enables you to consume the extra width in the preview column. "
@@ -3430,22 +3400,22 @@ msgstr ""
 "correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
 "en la segunda línea."
 
-#: C/evolution.xml:1251(title)
+#: C/evolution.xml:1265(title)
 msgid "Classical View:"
 msgstr "Vista clásica:"
 
-#: C/evolution.xml:1252(para)
+#: C/evolution.xml:1266(para)
 msgid ""
 "To switch to classical view, click View &gt; Preview &gt; Classical View."
 msgstr ""
 "Para cambiar a la vista clásica, pulse Ver &gt; Vista previa &gt; Vista "
 "clásica."
 
-#: C/evolution.xml:1257(title)
+#: C/evolution.xml:1271(title)
 msgid "Collapsible Message Headers"
 msgstr "Cabeceras de mensajes contraíbles"
 
-#: C/evolution.xml:1258(para)
+#: C/evolution.xml:1272(para)
 msgid ""
 "Evolution compresses the TO, CC and BCC headers of received mail and shows "
 "only limited addresses. You can set the limit of the number of addresses to "
@@ -3455,24 +3425,24 @@ msgstr ""
 "muestra sólo direcciones limitadas. Puede establecer un límite en el número "
 "de direcciones para mostrar en el panel de vista previa."
 
-#: C/evolution.xml:1260(para)
+#: C/evolution.xml:1274(para)
 msgid ""
 "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Use el siguiente procedimiento para establecer el límite de direcciones para "
 "mostrar:"
 
-#: C/evolution.xml:1263(para) C/evolution.xml:1930(para)
-#: C/evolution.xml:2361(para) C/evolution.xml:5232(para)
-#: C/evolution.xml:5426(para) C/evolution.xml:6530(para)
+#: C/evolution.xml:1277(para) C/evolution.xml:1944(para)
+#: C/evolution.xml:2375(para) C/evolution.xml:5246(para)
+#: C/evolution.xml:5438(para) C/evolution.xml:6544(para)
 msgid "Select Edit &gt; Preferences."
 msgstr "Seleccione Editar &gt; Preferencias."
 
-#: C/evolution.xml:1266(para)
+#: C/evolution.xml:1280(para)
 msgid "Select Mail Preferences."
 msgstr "Seleccione Opciones de correo."
 
-#: C/evolution.xml:1269(para)
+#: C/evolution.xml:1283(para)
 msgid ""
 "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
 "address."
@@ -3480,11 +3450,11 @@ msgstr ""
 "Marque la columna <guilabel>Reducir las cabeceras Para / Cc / Cco a</"
 "guilabel> para limitar las direcciones"
 
-#: C/evolution.xml:1272(para)
+#: C/evolution.xml:1286(para)
 msgid "Enter the limit in the field."
 msgstr "Introduzca el límite en el campo."
 
-#: C/evolution.xml:1275(para)
+#: C/evolution.xml:1289(para)
 msgid ""
 "You can expand the message headers by clicking the <inlinegraphic format="
 "\"PNG\" fileref=\"figures/plus.png\"/> icon or the ellipsis (<guilabel>...</"
@@ -3498,11 +3468,11 @@ msgstr ""
 "mensaje, pulse el icono <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "minus.png\"/> en el panel de vista previa."
 
-#: C/evolution.xml:1279(title)
+#: C/evolution.xml:1293(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Compartir buzones con otros programas de correo"
 
-#: C/evolution.xml:1280(para)
+#: C/evolution.xml:1294(para)
 msgid ""
 "If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
@@ -3510,15 +3480,15 @@ msgstr ""
 "Si quiere usar Evolution y además otro cliente de correo electrónico, como "
 "Mutt, al mismo tiempo, use el siguiente procedimiento:"
 
-#: C/evolution.xml:1283(para)
+#: C/evolution.xml:1297(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Descargue su correo en la otra aplicación como haría con normalidad."
 
-#: C/evolution.xml:1286(para)
+#: C/evolution.xml:1300(para)
 msgid "In Evolution:"
 msgstr "En Evolution:"
 
-#: C/evolution.xml:1288(para)
+#: C/evolution.xml:1302(para)
 msgid ""
 "Select the account you want to use to share mail and click Edit. Instead of "
 "Edit, you might want to create a new account just for this source of mail by "
@@ -3528,7 +3498,7 @@ msgstr ""
 "En lugar de Editar, quizá quiera crear una cuenta nueva sólo para esta "
 "fuente de correo pulsando Nuevo."
 
-#: C/evolution.xml:1291(para)
+#: C/evolution.xml:1305(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3540,7 +3510,7 @@ msgstr ""
 "lugar. Una elección habitual son los archivos mbox, con la ruta «/home/"
 "<varname>nombresdelusuario</varname>/Mail»."
 
-#: C/evolution.xml:1297(para)
+#: C/evolution.xml:1311(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3550,11 +3520,11 @@ msgstr ""
 "bloquean por el programa de correo que los esté usando en ese momento, así "
 "que los archivos no pueden accederse por otro programa de correo."
 
-#: C/evolution.xml:1301(title)
+#: C/evolution.xml:1315(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Trabajar con adjuntos y correo HTML"
 
-#: C/evolution.xml:1302(para)
+#: C/evolution.xml:1316(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3573,11 +3543,11 @@ msgstr ""
 "de adjuntos. Para abrir un adjunto, pulse dos veces en él. pulse el botón "
 "Guardar todo para guardar todos los adjuntos."
 
-#: C/evolution.xml:1305(title)
+#: C/evolution.xml:1319(title)
 msgid "Saving or Opening Attachments"
 msgstr "Guardar o abrir adjuntos"
 
-#: C/evolution.xml:1306(para)
+#: C/evolution.xml:1320(para)
 msgid ""
 "If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
@@ -3585,7 +3555,7 @@ msgstr ""
 "Si recibe un adjunto dentro de un mensaje de correo electrónico, Evolution "
 "le ayuda a guardarlo o a abrirlo con las aplicaciones adecuadas."
 
-#: C/evolution.xml:1307(para)
+#: C/evolution.xml:1321(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3596,11 +3566,11 @@ msgstr ""
 "adjuntos. Pulse en el icono de la flecha derecha para mostrar la barra de "
 "adjuntos."
 
-#: C/evolution.xml:1308(para)
+#: C/evolution.xml:1322(para)
 msgid "To save an attachment to disk:"
 msgstr "Para guardar un adjunto en el disco:"
 
-#: C/evolution.xml:1311(para) C/evolution.xml:1326(para)
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
 msgid ""
 "Click the down-arrow on the attachment icon or right-click the attachment "
 "icon in the attachment bar."
@@ -3608,23 +3578,23 @@ msgstr ""
 "Pulse la flecha hacia abajo en el icono de adjunto o pulse con el botón "
 "derecho sobre el icono del adjunto en la barra de adjuntos."
 
-#: C/evolution.xml:1314(para)
+#: C/evolution.xml:1328(para)
 msgid "Click Save As."
 msgstr "Pulse Guardar como."
 
-#: C/evolution.xml:1317(para)
+#: C/evolution.xml:1331(para)
 msgid "Select a location and name for the file."
 msgstr "Seleccione una ubicación y un nombre para el archivo."
 
-#: C/evolution.xml:1323(para)
+#: C/evolution.xml:1337(para)
 msgid "To open an attachment using another application:"
 msgstr "Para abrir un adjunto usando otra aplicación:"
 
-#: C/evolution.xml:1329(para)
+#: C/evolution.xml:1343(para)
 msgid "Select the application to open the attachment."
 msgstr "Seleccione la aplicación para abrir el adjunto."
 
-#: C/evolution.xml:1335(para)
+#: C/evolution.xml:1349(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3638,11 +3608,11 @@ msgstr ""
 "org y cualquier otro procesador de textos, y archivos comprimidos se pueden "
 "abrir con la aplicación File Roller."
 
-#: C/evolution.xml:1339(title)
+#: C/evolution.xml:1353(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Imágenes dentro de correos HTML"
 
-#: C/evolution.xml:1340(para)
+#: C/evolution.xml:1354(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3657,7 +3627,7 @@ msgstr ""
 "compositor. Alternativamente, sólo arrastre una imagen dentro del área de "
 "composición del mensaje."
 
-#: C/evolution.xml:1341(para)
+#: C/evolution.xml:1355(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
@@ -3673,24 +3643,24 @@ msgstr ""
 "lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
 "privacidad."
 
-#: C/evolution.xml:1342(para)
+#: C/evolution.xml:1356(para)
 msgid "To load the images for one message, click View &gt; Load Images."
 msgstr ""
 "Para cargar las imágenes de un mensaje, pulse Ver &gt; Cargar imágenes."
 
-#: C/evolution.xml:1343(para)
+#: C/evolution.xml:1357(para)
 msgid "To set the default action for loading images:"
 msgstr "Para establecer la acción predeterminada para cargar imágenes:"
 
-#: C/evolution.xml:1346(para)
+#: C/evolution.xml:1360(para)
 msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr "Seleccione Editar &gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:1349(para)
+#: C/evolution.xml:1363(para)
 msgid "Click the HTML Mail tab."
 msgstr "Pulse sobre la solapa Correo en HTML."
 
-#: C/evolution.xml:1352(para)
+#: C/evolution.xml:1366(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3699,28 +3669,28 @@ msgstr ""
 "Cargar imágenes en el correo de los contactos o Siempre cargar las imágenes "
 "desde internet."
 
-#: C/evolution.xml:1355(para) C/evolution.xml:1403(para)
-#: C/evolution.xml:1608(para) C/evolution.xml:1843(para)
-#: C/evolution.xml:1877(para) C/evolution.xml:1900(para)
-#: C/evolution.xml:2297(para) C/evolution.xml:2339(para)
-#: C/evolution.xml:2373(para) C/evolution.xml:2405(para)
-#: C/evolution.xml:5890(para) C/evolution.xml:6268(para)
+#: C/evolution.xml:1369(para) C/evolution.xml:1417(para)
+#: C/evolution.xml:1622(para) C/evolution.xml:1857(para)
+#: C/evolution.xml:1891(para) C/evolution.xml:1914(para)
+#: C/evolution.xml:2311(para) C/evolution.xml:2353(para)
+#: C/evolution.xml:2387(para) C/evolution.xml:2419(para)
+#: C/evolution.xml:5902(para) C/evolution.xml:6280(para)
 msgid "Click Close."
 msgstr "Pulse Cerrar."
 
-#: C/evolution.xml:1358(para)
+#: C/evolution.xml:1372(para)
 msgid "To set your proxy in KDE:"
 msgstr "Para establecer su proxy en KDE:"
 
-#: C/evolution.xml:1361(para)
+#: C/evolution.xml:1375(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Pulse el icono de menú &gt; Sistema &gt; Configuración &gt; Yast."
 
-#: C/evolution.xml:1364(para) C/evolution.xml:1379(para)
+#: C/evolution.xml:1378(para) C/evolution.xml:1393(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Pulse Servicios de red, después Proxy."
 
-#: C/evolution.xml:1367(para) C/evolution.xml:1382(para)
+#: C/evolution.xml:1381(para) C/evolution.xml:1396(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3728,15 +3698,15 @@ msgstr ""
 "Especifique la configuración de su proxy (si no conoce los ajustes de su "
 "proxy, contacte con su ISP o el administrador de su sistema)."
 
-#: C/evolution.xml:1370(para) C/evolution.xml:1385(para)
+#: C/evolution.xml:1384(para) C/evolution.xml:1399(para)
 msgid "Click Finish, then click Close."
 msgstr "Pulse Finalizar, después Cerrar."
 
-#: C/evolution.xml:1373(para)
+#: C/evolution.xml:1387(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Para establecer su proxy en GNOME:"
 
-#: C/evolution.xml:1376(para)
+#: C/evolution.xml:1390(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3744,11 +3714,11 @@ msgstr ""
 "Pulse Sistema &gt; Preferencias &gt; Proxy de la red (si es necesario "
 "introduzca su contraseña de superusuario)."
 
-#: C/evolution.xml:1392(title)
+#: C/evolution.xml:1406(title)
 msgid "Using Evolution for News"
 msgstr "Usar Evolution para noticias"
 
-#: C/evolution.xml:1393(para)
+#: C/evolution.xml:1407(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
@@ -3766,7 +3736,7 @@ msgstr ""
 "una carpeta IMAP. Cuando pulse Enviar/Recibir, Evolution también comprueba "
 "mensajes de noticias."
 
-#: C/evolution.xml:1394(para)
+#: C/evolution.xml:1408(para)
 msgid ""
 "When you create a newsgroup account, you are not subscribed to any groups. "
 "To subscribe to a newsgroup:"
@@ -3774,11 +3744,11 @@ msgstr ""
 "Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
 "grupo. Para suscribirse a un grupo de noticias:"
 
-#: C/evolution.xml:1397(para) C/evolution.xml:5500(para)
+#: C/evolution.xml:1411(para) C/evolution.xml:5512(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Pulse Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:1400(para)
+#: C/evolution.xml:1414(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3786,11 +3756,11 @@ msgstr ""
 "Seleccione su cuenta NNTP, seleccione los grupos a los que quiere "
 "suscribirse, después pulse Subscribir."
 
-#: C/evolution.xml:1409(title)
+#: C/evolution.xml:1423(title)
 msgid "Deleting Mail"
 msgstr "Borrado de correo"
 
-#: C/evolution.xml:1410(para)
+#: C/evolution.xml:1424(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the Delete button in the "
@@ -3801,7 +3771,7 @@ msgstr ""
 "de herramientas, pulse Ctrl+D o pulse con el botón derecho del ratón sobre "
 "el mensaje y después pulse Borrar."
 
-#: C/evolution.xml:1411(para)
+#: C/evolution.xml:1425(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. Your email is recoverable until you "
@@ -3819,7 +3789,7 @@ msgstr ""
 "Ver. Puede ver los mensajes marcados para ser borrados posteriormente. Puede "
 "además encontrar los mensajes borrados en la carpeta Papelera."
 
-#: C/evolution.xml:1412(para)
+#: C/evolution.xml:1426(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3827,7 +3797,7 @@ msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
 "pulse Carpeta &gt; Compactar o pulse Ctrl+E."
 
-#: C/evolution.xml:1413(para)
+#: C/evolution.xml:1427(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
@@ -3839,7 +3809,7 @@ msgstr ""
 "para un borrado posterior. De tal manera que vaciar la Papelera no es otra "
 "cosa que purgar los correos borrados de todas sus carpetas en la cuenta."
 
-#: C/evolution.xml:1414(para)
+#: C/evolution.xml:1428(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3852,11 +3822,11 @@ msgstr ""
 "acerca de carpetas de búsquedas, vea <link linkend=\"usage-mail-organize-"
 "vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:1418(title)
+#: C/evolution.xml:1432(title)
 msgid "Undeleting Messages"
 msgstr "Recuperar mensajes"
 
-#: C/evolution.xml:1419(para)
+#: C/evolution.xml:1433(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
 "undelete a message, select the message, click Edit &gt; Undelete. Note that "
@@ -3867,7 +3837,7 @@ msgstr ""
 "Note que Ver &gt; Ocultar mensajes borrados en la barra de menú debe estar "
 "desactivado para esto."
 
-#: C/evolution.xml:1420(para)
+#: C/evolution.xml:1434(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3875,7 +3845,7 @@ msgstr ""
 "Si ha marcado un mensaje para su eliminación, recuperándolo eliminará la "
 "marca y el mensaje se borrará de la carpeta Papelera."
 
-#: C/evolution.xml:1426(para)
+#: C/evolution.xml:1440(para)
 msgid ""
 "You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking New "
@@ -3885,7 +3855,7 @@ msgstr ""
 "Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la herramienta "
 "de correo o pulsando Nuevo en la barra de herramientas."
 
-#: C/evolution.xml:1427(para)
+#: C/evolution.xml:1441(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
 "addresses, type in the addresses separated by comma. You can also use a "
@@ -3900,65 +3870,65 @@ msgstr ""
 "la parte inferior, el texto del mensaje. Una vez que haya escrito su mensaje "
 "pulse Enviar."
 
-#: C/evolution.xml:1428(para)
+#: C/evolution.xml:1442(para)
 msgid "New mail message window look like this:"
 msgstr "La ventana de mensaje de correo nuevo es así:"
 
-#: C/evolution.xml:1430(para) C/evolution.xml:6148(para)
+#: C/evolution.xml:1444(para) C/evolution.xml:6160(para)
 msgid "This section contains the following topics:"
 msgstr "Esta sección contiene los siguientes temas:"
 
-#: C/evolution.xml:1433(link) C/evolution.xml:1471(title)
+#: C/evolution.xml:1447(link) C/evolution.xml:1485(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII, y alfabetos no latinos"
 
-#: C/evolution.xml:1436(link) C/evolution.xml:1507(title)
+#: C/evolution.xml:1450(link) C/evolution.xml:1521(title)
 msgid "Sending Composed Messages Later"
 msgstr "Enviar los mensajes nuevos más tarde"
 
-#: C/evolution.xml:1439(link) C/evolution.xml:1523(title)
+#: C/evolution.xml:1453(link) C/evolution.xml:1537(title)
 msgid "Working Offline"
 msgstr "Trabar desconectado"
 
-#: C/evolution.xml:1442(link) C/evolution.xml:1566(title)
+#: C/evolution.xml:1456(link) C/evolution.xml:1580(title)
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: C/evolution.xml:1445(link) C/evolution.xml:1613(title)
+#: C/evolution.xml:1459(link) C/evolution.xml:1627(title)
 msgid "Specifying Additional Recipients for Email"
 msgstr "Especificar destinatarios adicioneles para correo electrónico"
 
-#: C/evolution.xml:1448(link) C/evolution.xml:1638(title)
+#: C/evolution.xml:1462(link) C/evolution.xml:1652(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Eligiendo los destinatarios rápidamente"
 
-#: C/evolution.xml:1451(link) C/evolution.xml:1646(title)
+#: C/evolution.xml:1465(link) C/evolution.xml:1660(title)
 msgid "Replying to Email Messages"
 msgstr "Responder a mensajes de correo-e"
 
-#: C/evolution.xml:1454(link) C/evolution.xml:1712(title)
+#: C/evolution.xml:1468(link) C/evolution.xml:1726(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Buscar y sustituir en el editor de mensajes"
 
-#: C/evolution.xml:1457(link) C/evolution.xml:1734(title)
+#: C/evolution.xml:1471(link) C/evolution.xml:1748(title)
 msgid "Enhancing Your Email with HTML"
 msgstr "Mejorar su correo electrónico con HTML"
 
-#: C/evolution.xml:1460(link) C/evolution.xml:1908(title)
+#: C/evolution.xml:1474(link) C/evolution.xml:1922(title)
 msgid "Mail Send Options"
 msgstr "Opciones de envío de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1463(link) C/evolution.xml:1986(title)
+#: C/evolution.xml:1477(link) C/evolution.xml:2000(title)
 msgid "Forwarding Mail"
 msgstr "Reenviar correo"
 
-#: C/evolution.xml:1466(link) C/evolution.xml:2007(title)
+#: C/evolution.xml:1480(link) C/evolution.xml:2021(title)
 msgid "Tips for Email Courtesy"
 msgstr "Consejos para correo electrónico de cortesía"
 
-#: C/evolution.xml:1472(para)
+#: C/evolution.xml:1486(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3981,7 +3951,7 @@ msgstr ""
 "cirílicas apropiadas, y la comilla simple (‘) proporciona un carácter de "
 "signo suave."
 
-#: C/evolution.xml:1473(para)
+#: C/evolution.xml:1487(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3995,11 +3965,11 @@ msgstr ""
 "seguro de cuáles usar, seleccione UTF-8, que ofrece el mayor rango de "
 "caracteres disponibles en el mayor número de idiomas."
 
-#: C/evolution.xml:1476(title)
+#: C/evolution.xml:1490(title)
 msgid "Using Character Sets"
 msgstr "Usar los juegos de codificaciones"
 
-#: C/evolution.xml:1477(para)
+#: C/evolution.xml:1491(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -4022,7 +3992,7 @@ msgstr ""
 "de estándares desarrollaron el juego de caracteres UTF-8 Unicode* para "
 "proporcionar un juego de caracteres único para todo el mundo."
 
-#: C/evolution.xml:1478(para)
+#: C/evolution.xml:1492(para)
 msgid ""
 "Most email messages state in advance which character set they use, so "
 "Evolution usually can display those messages correctly. However, if you find "
@@ -4046,19 +4016,19 @@ msgstr ""
 "mayoría de usuarios es UTF-8, que ofrece el rango más grande de caracteres "
 "para el rango más grande de idiomas."
 
-#: C/evolution.xml:1483(title)
+#: C/evolution.xml:1497(title)
 msgid "Custom Header"
 msgstr "Cabecera personalizada"
 
-#: C/evolution.xml:1484(para)
+#: C/evolution.xml:1498(para)
 msgid "To enable the Custom Header plugin:"
 msgstr "Para activar el complemento Cabecera personalizada:"
 
-#: C/evolution.xml:1485(para) C/evolution.xml:6681(para)
+#: C/evolution.xml:1499(para) C/evolution.xml:6696(para)
 msgid "Select Edit &gt; Plugins."
 msgstr "Seleccione Editar &gt; Complementos."
 
-#: C/evolution.xml:1486(para)
+#: C/evolution.xml:1500(para)
 msgid ""
 "Then select Custom Header. You can configure custom headers to set "
 "sensitivity and caveats to the outgoing messages."
@@ -4067,7 +4037,7 @@ msgstr ""
 "personalizadas para ajustar la sensibilidad y advertencias para los mensajes "
 "salientes."
 
-#: C/evolution.xml:1488(para)
+#: C/evolution.xml:1502(para)
 msgid ""
 "In the Plugin Manager, select the Configuration tab to customize your header "
 "fields. You can add, edit, or remove the header fields. For every header "
@@ -4082,7 +4052,7 @@ msgstr ""
 "personalizada. Puede introducir múltiples valores para las claves. Debe usar "
 "un punto y coma para separar cada valor que introduzca."
 
-#: C/evolution.xml:1491(para)
+#: C/evolution.xml:1505(para)
 msgid ""
 "Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message "
 "window."
@@ -4090,14 +4060,14 @@ msgstr ""
 "Seleccione Nuevo &gt; Mensaje de correo o Mayús+Ctrl+M para abrir una "
 "ventana del Editor de mensajes."
 
-#: C/evolution.xml:1494(para)
+#: C/evolution.xml:1508(para)
 msgid ""
 "Select Insert &gt; Custom Header to open the Email Custom Header window."
 msgstr ""
 "Seleccione Insertar &gt; Cabecera personalizada para abrir la ventana "
 "Cabeceras personalizadas del correo-e."
 
-#: C/evolution.xml:1496(para)
+#: C/evolution.xml:1510(para)
 msgid ""
 "In the Email Custom Header window, you can view all the header fields and "
 "values you add."
@@ -4105,14 +4075,14 @@ msgstr ""
 "En la ventana Cabeceras personalizadas del correo-e puede ver todos campos "
 "de cabeceras y valores que puede añadir."
 
-#: C/evolution.xml:1499(para)
+#: C/evolution.xml:1513(para)
 msgid ""
 "Set the values for the header fields by using the respective drop-down list."
 msgstr ""
 "Establezca los valores para los campos de cabecera usando la lista "
 "desplegable respectiva."
 
-#: C/evolution.xml:1508(para)
+#: C/evolution.xml:1522(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -4121,7 +4091,7 @@ msgstr ""
 "Sin embargo hay unas cuantas maneras de guardar un mensaje para enviarlo más "
 "tarde:"
 
-#: C/evolution.xml:1511(para)
+#: C/evolution.xml:1525(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -4131,7 +4101,7 @@ msgstr ""
 "mensajes en la carpeta «Bandeja de salida». El mensaje se enviará la próxima "
 "vez que se conecte a Internet y envíe o reciba correo."
 
-#: C/evolution.xml:1514(para)
+#: C/evolution.xml:1528(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the Drafts folder for "
 "later revision."
@@ -4139,7 +4109,7 @@ msgstr ""
 "Pulse Archivo &gt; Guardar borrador para guardar sus mensajes en la carpeta "
 "Borradores y poder revisarlos después."
 
-#: C/evolution.xml:1517(para)
+#: C/evolution.xml:1531(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -4147,7 +4117,7 @@ msgstr ""
 "Si prefiere guardar el mensaje como un archivo de texto pulse Archivo &gt; "
 "Guardar como, y después especifique un nombre de archivo."
 
-#: C/evolution.xml:1524(para)
+#: C/evolution.xml:1538(para)
 msgid ""
 "Offline mode helps you communicate with remote mail storage systems like "
 "<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
@@ -4162,7 +4132,7 @@ msgstr ""
 "permite crear nuevos mensajes, guardarlos en la Bandeja de salida y enviarlo "
 "en cuanto vuelva a conectarse."
 
-#: C/evolution.xml:1525(para)
+#: C/evolution.xml:1539(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -4175,22 +4145,22 @@ msgstr ""
 "descargará todos los mensajes sin leer desde las carpetas que haya elegido "
 "almacenar."
 
-#: C/evolution.xml:1526(para)
+#: C/evolution.xml:1540(para)
 msgid "To mark a folder for offline use,"
 msgstr "Para marcar una carpeta para su uso desconectado,"
 
-#: C/evolution.xml:1529(para)
+#: C/evolution.xml:1543(para)
 msgid "Right-click the folder, then click Properties."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la carpeta, después elija "
 "Propiedades."
 
-#: C/evolution.xml:1532(para)
+#: C/evolution.xml:1546(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr ""
 "Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
 
-#: C/evolution.xml:1535(para)
+#: C/evolution.xml:1549(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left corner "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -4201,11 +4171,11 @@ msgstr ""
 "mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
 "desenchufados."
 
-#: C/evolution.xml:1536(para)
+#: C/evolution.xml:1550(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr "Para cachear las carpetas seleccionadas y desconectar de la red,"
 
-#: C/evolution.xml:1539(para)
+#: C/evolution.xml:1553(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -4213,7 +4183,7 @@ msgstr ""
 "Pulse Archivo &gt; Trabajar desconectado o pulse el icono de estado de la "
 "conexión en la esquina inferior izquierda de la pantalla."
 
-#: C/evolution.xml:1540(para)
+#: C/evolution.xml:1554(para)
 msgid ""
 "A message pops up and asks you whether you want to go offline immediately or "
 "synchronize folders locally before you go offline."
@@ -4221,7 +4191,7 @@ msgstr ""
 "Un mensaje emergerá y le preguntará si quiere desconectarse inmediatamente o "
 "quiere sincronizar las carpetas localmente antes de desconectarse."
 
-#: C/evolution.xml:1545(para)
+#: C/evolution.xml:1559(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -4229,11 +4199,11 @@ msgstr ""
 "Pulse Sincronizar para descargar todos los mensajes en las carpetas marcadas "
 "para trabajar desconectado."
 
-#: C/evolution.xml:1546(para) C/evolution.xml:3900(para)
+#: C/evolution.xml:1560(para) C/evolution.xml:3914(para)
 msgid "Or"
 msgstr "O"
 
-#: C/evolution.xml:1547(para)
+#: C/evolution.xml:1561(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -4241,7 +4211,7 @@ msgstr ""
 "Pulse No sincronizar para desconectarse inmediatamente, sin descargar los "
 "mensajes localmente para trabajar desconectado."
 
-#: C/evolution.xml:1548(para)
+#: C/evolution.xml:1562(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -4249,7 +4219,7 @@ msgstr ""
 "Seleccione No mostrar otra vez este mensaje para desactivar este mensaje "
 "emergente. Lo predeterminado es no sincronizar al desconectar."
 
-#: C/evolution.xml:1551(para)
+#: C/evolution.xml:1565(para)
 msgid ""
 "When you want to reconnect, click File &gt; Work Online, or click the "
 "connection status icon again."
@@ -4257,11 +4227,11 @@ msgstr ""
 "Cuando quiera reconectarse, pulse Archivo &gt; Trabajar conectado o pulse el "
 "icono de estado de la conexión de nuevo."
 
-#: C/evolution.xml:1554(title)
+#: C/evolution.xml:1568(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Descargar los mensajes para trabajar desconectado"
 
-#: C/evolution.xml:1555(para)
+#: C/evolution.xml:1569(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -4273,7 +4243,7 @@ msgstr ""
 "De otra manera y de forma predeterminada, se desconecta cuando pulsa el "
 "botón de desconexión sin descargar los mensajes."
 
-#: C/evolution.xml:1556(para)
+#: C/evolution.xml:1570(para)
 msgid ""
 "To download messages for offline operations, select File &gt; Download "
 "messages for offline."
@@ -4281,11 +4251,11 @@ msgstr ""
 "Para descargar los mensajes para operaciones en modo desconectado, "
 "seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
 
-#: C/evolution.xml:1560(title)
+#: C/evolution.xml:1574(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestión automática del estado de la red"
 
-#: C/evolution.xml:1561(para)
+#: C/evolution.xml:1575(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -4298,19 +4268,19 @@ msgstr ""
 "esta característica, asegúrese de que su sistema tiene instalado Network "
 "Manager."
 
-#: C/evolution.xml:1567(para)
+#: C/evolution.xml:1581(para)
 msgid "To attach a file to your email:"
 msgstr "Para adjuntar un archivo a su correo-e:"
 
-#: C/evolution.xml:1570(para)
+#: C/evolution.xml:1584(para)
 msgid "Click the Attach button in the composer toolbar."
 msgstr "Pulse el botón Adjuntar en la barra de herramientas del editor."
 
-#: C/evolution.xml:1573(para)
+#: C/evolution.xml:1587(para)
 msgid "Select the file you want to attach."
 msgstr "Seleccione el archivo que quiere adjuntar."
 
-#: C/evolution.xml:1579(para)
+#: C/evolution.xml:1593(para)
 msgid ""
 "You can also drag a file to the attachment bar of the composer window. If "
 "you want to send it as an inline attachment, right-click the attachment and "
@@ -4321,7 +4291,7 @@ msgstr ""
 "derecho del ratón sobre el adjunto y puse Propiedades, después seleccione "
 "Mostrado automático de los adjuntos."
 
-#: C/evolution.xml:1580(para)
+#: C/evolution.xml:1594(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -4330,11 +4300,11 @@ msgstr ""
 "presente que los adjuntos de gran tamaño pueden tomar mucho tiempo al ser "
 "enviados y recibidos."
 
-#: C/evolution.xml:1583(title)
+#: C/evolution.xml:1597(title)
 msgid "Attachment Reminder"
 msgstr "Recuerdo de adjuntos"
 
-#: C/evolution.xml:1584(para)
+#: C/evolution.xml:1598(para)
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
 "to attach a file to an email. If it determines that you have not attached "
@@ -4344,7 +4314,7 @@ msgstr ""
 "recordarle que adjunte un archivo en un correo-e. Si determina que el "
 "archivo no está adjuntado, muestra el siguiente mensaje:"
 
-#: C/evolution.xml:1588(para)
+#: C/evolution.xml:1602(para)
 msgid ""
 "Click Continue Editing to attach the missing file, or click Send to send the "
 "message without any attachment."
@@ -4352,15 +4322,15 @@ msgstr ""
 "Pulse Continuar editando para adjuntar el archivo que se le está recordando "
 "que falta o pulse Enviar para enviar el mensaje sin ningún adjunto."
 
-#: C/evolution.xml:1591(para)
+#: C/evolution.xml:1605(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Para activar el Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1594(para)
+#: C/evolution.xml:1608(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Seleccione Editar &gt; Complementos &gt; Recuerdo de adjuntos."
 
-#: C/evolution.xml:1597(para)
+#: C/evolution.xml:1611(para)
 msgid ""
 "Click Configuration, then make sure that Remind Missing Attachments is "
 "selected."
@@ -4368,7 +4338,7 @@ msgstr ""
 "Pulse Configuración, después asegúrese de que Recordar los adjuntos "
 "faltantes está seleccionado."
 
-#: C/evolution.xml:1601(para)
+#: C/evolution.xml:1615(para)
 msgid ""
 "Click Add, then enter keywords such as <quote>Attach</quote> or "
 "<quote>Attachment</quote>."
@@ -4376,7 +4346,7 @@ msgstr ""
 "Pulse Añadir, después introduzca las palabras clave tales como "
 "<quote>Adjuntar</quote> o <quote>Adjunto</quote>."
 
-#: C/evolution.xml:1602(para)
+#: C/evolution.xml:1616(para)
 msgid ""
 "Based on the keywords you have added here, it searches every mail you are "
 "sending. If it finds the keywords such as <quote>attach</quote> in your mail "
@@ -4388,7 +4358,7 @@ msgstr ""
 "tales como <quote>adjuntar</quote> y no hay un archivo adjunto, se le "
 "recuerda que faltan adjuntos."
 
-#: C/evolution.xml:1605(para)
+#: C/evolution.xml:1619(para)
 msgid ""
 "To edit any of the existing keywords, select the keyword, click Edit, then "
 "modify the word as desired."
@@ -4396,7 +4366,7 @@ msgstr ""
 "Para editar cualquiera de las palabras clave existentes, seleccione la "
 "palabra clave y pulse Editar, después modifique la palabra como desee."
 
-#: C/evolution.xml:1614(para)
+#: C/evolution.xml:1628(para)
 msgid ""
 "<trademark>Evolution</trademark>, like most email programs, recognizes three "
 "types of addresses: primary recipients, secondary recipients, and hidden "
@@ -4411,7 +4381,7 @@ msgstr ""
 "electrónico en el campo Para:, que denota los destinatarios primarios. Use "
 "el campo Cc: para enviar un mensaje de correo a destinatarios secundarios."
 
-#: C/evolution.xml:1615(para)
+#: C/evolution.xml:1629(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4423,7 +4393,7 @@ msgstr ""
 "especialmente si no se conocen entre sí o si es importante mantener la "
 "privacidad. Si el campo Cco: no está a la vista pulse Ver &gt; Campo Cco."
 
-#: C/evolution.xml:1616(para)
+#: C/evolution.xml:1630(para)
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
@@ -4436,22 +4406,22 @@ msgstr ""
 "cómo hacerlo consulte <link linkend=\"usage-contact-organize-group-list"
 "\">Crear una lista de contactos</link>."
 
-#: C/evolution.xml:1617(para)
+#: C/evolution.xml:1631(para)
 msgid ""
 "Evolution allows you to specify the Reply-To header in an email. To do this:"
 msgstr ""
 "Evolution le permite especificar el campo Responder a: en un correo-e. Para "
 "ello haga:"
 
-#: C/evolution.xml:1620(para)
+#: C/evolution.xml:1634(para)
 msgid "Open a compose window."
 msgstr "Abra una ventana del editor."
 
-#: C/evolution.xml:1623(para)
+#: C/evolution.xml:1637(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr "Abra el campo Responder a pulsando en Ver &gt; Responder a."
 
-#: C/evolution.xml:1626(para)
+#: C/evolution.xml:1640(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
@@ -4459,17 +4429,17 @@ msgstr ""
 "Especifique la dirección a la que quiere que le respondan en el nuevo campo "
 "«Responder a»."
 
-#: C/evolution.xml:1629(para)
+#: C/evolution.xml:1643(para)
 msgid "Complete the rest of your message."
 msgstr "Complete el resto de su mensaje."
 
-#: C/evolution.xml:1632(para) C/evolution.xml:2000(para)
-#: C/evolution.xml:2108(para) C/evolution.xml:2315(para)
-#: C/evolution.xml:5410(para)
+#: C/evolution.xml:1646(para) C/evolution.xml:2014(para)
+#: C/evolution.xml:2122(para) C/evolution.xml:2329(para)
+#: C/evolution.xml:5422(para)
 msgid "Click Send."
 msgstr "Pulse Enviar."
 
-#: C/evolution.xml:1639(para)
+#: C/evolution.xml:1653(para)
 msgid ""
 "Address auto-completion is enabled in Evolution by default when you create "
 "contacts. Evolution makes it easy for you to quickly fill in the address "
@@ -4489,7 +4459,7 @@ msgstr ""
 "tarjeta, Evolution abrirá una caja de diálogo para preguntarle a qué persona "
 "se refiere."
 
-#: C/evolution.xml:1640(para)
+#: C/evolution.xml:1654(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
 "Preferences, then click Autocompletion. Then, select the address book you "
@@ -4500,7 +4470,7 @@ msgstr ""
 "direcciones que quiere usar para el autocompletado de direcciones en el "
 "correo."
 
-#: C/evolution.xml:1641(para)
+#: C/evolution.xml:1655(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
 "the email addresses in your contacts. Select addresses and click the arrows "
@@ -4511,7 +4481,7 @@ msgstr ""
 "Seleccione las direcciones y pulse las flechas para moverlas entre las "
 "columnas de direcciones apropiadas."
 
-#: C/evolution.xml:1642(para)
+#: C/evolution.xml:1656(para)
 msgid ""
 "For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
@@ -4524,7 +4494,7 @@ msgstr ""
 "link> y <link linkend=\"usage-calendar-apts\">Planificación con el "
 "calendario de Evolution</link>."
 
-#: C/evolution.xml:1647(para)
+#: C/evolution.xml:1661(para)
 msgid ""
 "To reply to a message, select the message to reply to in the message list "
 "and click the Reply button in the toolbar, or right-click within the message "
@@ -4545,7 +4515,7 @@ msgstr ""
 "antes de cada línea (para el modo texto plano), para indicar que es parte "
 "del mensaje anterior."
 
-#: C/evolution.xml:1648(para)
+#: C/evolution.xml:1662(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4555,11 +4525,11 @@ msgstr ""
 "Responder a todos en lugar de Responder. Si hay un gran número de personas "
 "en los campos Para: o Cc: esto puede ahorrar mucho tiempo."
 
-#: C/evolution.xml:1651(title)
+#: C/evolution.xml:1665(title)
 msgid "Using the Reply To All Feature"
 msgstr "Uso de la característica de Responder a todos"
 
-#: C/evolution.xml:1652(para)
+#: C/evolution.xml:1666(para)
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
@@ -4575,7 +4545,7 @@ msgstr ""
 "respuesta no la recibirá nadie a quien Susana haya incluido en la lista de "
 "Cco: de su mensaje original porque tal lista no ha sido compartida con nadie."
 
-#: C/evolution.xml:1653(para)
+#: C/evolution.xml:1667(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list rather than to the sender, select Reply to List instead of Reply or "
@@ -4585,72 +4555,72 @@ msgstr ""
 "la misma en lugar de al remitente pulse en Responder la lista en lugar de "
 "Responder o de Responder a todos."
 
-#: C/evolution.xml:1657(title)
+#: C/evolution.xml:1671(title)
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:1665(para)
+#: C/evolution.xml:1679(para)
 msgid "Tools"
 msgstr "Herramientas"
 
-#: C/evolution.xml:1668(para)
+#: C/evolution.xml:1682(para)
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: C/evolution.xml:1675(para)
+#: C/evolution.xml:1689(para)
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
-#: C/evolution.xml:1678(para)
+#: C/evolution.xml:1692(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: C/evolution.xml:1683(para)
+#: C/evolution.xml:1697(para)
 msgid "Reply to List"
 msgstr "Responder a la lista"
 
-#: C/evolution.xml:1686(para)
+#: C/evolution.xml:1700(para)
 msgid "Clrl+L"
 msgstr "Ctrl+L"
 
-#: C/evolution.xml:1691(para)
+#: C/evolution.xml:1705(para)
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: C/evolution.xml:1694(para)
+#: C/evolution.xml:1708(para)
 msgid "Shift+Ctrl+R"
 msgstr "Shift+Ctrl+R"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1699(para)
+#: C/evolution.xml:1713(para)
 msgid "Forward"
 msgstr "Reenviar"
 
-#: C/evolution.xml:1702(para)
+#: C/evolution.xml:1716(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: C/evolution.xml:1713(para)
+#: C/evolution.xml:1727(para)
 msgid ""
 "The message composer makes several text searching features available to you."
 msgstr ""
 "El editor de mensajes le proporciona varias características de búsqueda de "
 "texto."
 
-#: C/evolution.xml:1715(title)
+#: C/evolution.xml:1729(title)
 msgid "Find:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:1716(para)
+#: C/evolution.xml:1730(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
 
-#: C/evolution.xml:1719(title)
+#: C/evolution.xml:1733(title)
 msgid "Find Regex:"
 msgstr "Buscar expresión regular:"
 
-#: C/evolution.xml:1720(para)
+#: C/evolution.xml:1734(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
 "\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
@@ -4662,24 +4632,24 @@ msgstr ""
 "ventana de su editor. Si no está seguro de lo que es una expresión regular, "
 "debería ignorar esta característica."
 
-#: C/evolution.xml:1723(title)
+#: C/evolution.xml:1737(title)
 msgid "Find Again:"
 msgstr "Buscar de nuevo:"
 
-#: C/evolution.xml:1724(para)
+#: C/evolution.xml:1738(para)
 msgid "Select this item to repeat the last search you performed."
 msgstr ""
 "Seleccione este elemento para repetir la última búsqueda que haya realizado."
 
-#: C/evolution.xml:1727(title)
+#: C/evolution.xml:1741(title)
 msgid "Replace:"
 msgstr "Reemplazar:"
 
-#: C/evolution.xml:1728(para)
+#: C/evolution.xml:1742(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr "Buscar una palabra o una frase y sustituirla por otra cosa."
 
-#: C/evolution.xml:1730(para)
+#: C/evolution.xml:1744(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4689,7 +4659,7 @@ msgstr ""
 "punto el que se encuentra el cursor. También puede determinar si quiere que "
 "la búsqueda sea sensible a mayúsculas o no."
 
-#: C/evolution.xml:1735(para)
+#: C/evolution.xml:1749(para)
 msgid ""
 "Normally, you can't set text styles or insert pictures in email. However, "
 "most newer email programs can display images and text styles in addition to "
@@ -4702,7 +4672,7 @@ msgstr ""
 "básico y formateo de párrafos. Esto es posible al usar <glossterm linkend="
 "\"html\">HTML</glossterm> al igual que las páginas web."
 
-#: C/evolution.xml:1736(para)
+#: C/evolution.xml:1750(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4713,11 +4683,11 @@ msgstr ""
 "descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
 "texto plano a menos que le pida explícitamenteque los componga con HTML."
 
-#: C/evolution.xml:1739(title)
+#: C/evolution.xml:1753(title)
 msgid "Basic HTML Formatting"
 msgstr "Formateo básico de HTML"
 
-#: C/evolution.xml:1740(para)
+#: C/evolution.xml:1754(para)
 msgid ""
 "You can change the format of an email message from plain text to HTML by "
 "choosing Format &gt; HTML from the menu bar."
@@ -4725,7 +4695,7 @@ msgstr ""
 "Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
 "a HTML eligiendo Formato &gt; HTML desde la barra de menú."
 
-#: C/evolution.xml:1741(para)
+#: C/evolution.xml:1755(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4736,7 +4706,7 @@ msgstr ""
 "de configuración del correo. Para obtener más información consulte la <xref "
 "linkend=\"config-prefs-mail-composer\"/>."
 
-#: C/evolution.xml:1742(para)
+#: C/evolution.xml:1756(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4746,7 +4716,7 @@ msgstr ""
 "justo encima del espacio en el que realmente compone su mensaje y también "
 "aparecen en los menús Insertar y Formato."
 
-#: C/evolution.xml:1743(para)
+#: C/evolution.xml:1757(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4756,11 +4726,11 @@ msgstr ""
 "\"tooltip\">consejos</glossterm> que aparecen cuando mantiene el ratón sobre "
 "los botones. Estos se clasifican en cuatro categorías:"
 
-#: C/evolution.xml:1745(title)
+#: C/evolution.xml:1759(title)
 msgid "Headers and Lists:"
 msgstr "Cabeceras y listas:"
 
-#: C/evolution.xml:1746(para)
+#: C/evolution.xml:1760(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4773,7 +4743,7 @@ msgstr ""
 "pequeño). Otros estilos disponibles para los más organizados son Preformato, "
 "la lista de puntos o los tres tipos de listas numeradas."
 
-#: C/evolution.xml:1748(para)
+#: C/evolution.xml:1762(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4785,11 +4755,11 @@ msgstr ""
 "distintos estilos para las listas de topos y maneja varios niveles de "
 "sangría y de ajuste para las palabras."
 
-#: C/evolution.xml:1750(title)
+#: C/evolution.xml:1764(title)
 msgid "Text Styles:"
 msgstr "Estilos de texto:"
 
-#: C/evolution.xml:1751(para)
+#: C/evolution.xml:1765(para)
 msgid ""
 "Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
@@ -4799,15 +4769,15 @@ msgstr ""
 "seleccionado un texto, el estilo se aplicará sobre él. Si no, el estilo se "
 "aplicará a lo próximo que escriba."
 
-#: C/evolution.xml:1760(para)
+#: C/evolution.xml:1774(para)
 msgid "Button"
 msgstr "Botón"
 
-#: C/evolution.xml:1770(para)
+#: C/evolution.xml:1784(para)
 msgid "TT"
 msgstr "TT"
 
-#: C/evolution.xml:1773(para)
+#: C/evolution.xml:1787(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4815,43 +4785,43 @@ msgstr ""
 "Texto de máquina de escribir, es aproximadamente igual a la tipografía "
 "monoespaciadia Courier."
 
-#: C/evolution.xml:1778(para)
+#: C/evolution.xml:1792(para)
 msgid "Bold A"
 msgstr "A en negrita"
 
-#: C/evolution.xml:1781(para)
+#: C/evolution.xml:1795(para)
 msgid "Bolds the text."
 msgstr "Pone el texto en negrita."
 
-#: C/evolution.xml:1786(para)
+#: C/evolution.xml:1800(para)
 msgid "Italic A"
 msgstr "A en cursiva"
 
-#: C/evolution.xml:1789(para)
+#: C/evolution.xml:1803(para)
 msgid "Italicizes the text."
 msgstr "Pone el texto en cursiva."
 
-#: C/evolution.xml:1794(para)
+#: C/evolution.xml:1808(para)
 msgid "Underlined A"
 msgstr "A subrayada"
 
-#: C/evolution.xml:1797(para)
+#: C/evolution.xml:1811(para)
 msgid "Underlines the text."
 msgstr "Subraya el texto."
 
-#: C/evolution.xml:1802(para)
+#: C/evolution.xml:1816(para)
 msgid "Strike through A"
 msgstr "A tachada"
 
-#: C/evolution.xml:1805(para)
+#: C/evolution.xml:1819(para)
 msgid "Marks a line through the text."
 msgstr "Tacha el texto."
 
-#: C/evolution.xml:1812(title)
+#: C/evolution.xml:1826(title)
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: C/evolution.xml:1813(para)
+#: C/evolution.xml:1827(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left-most button "
@@ -4863,11 +4833,11 @@ msgstr ""
 "El que está más a la izquierda alinea el texto a la izquierda, el del "
 "centro, lo centra y el de la derecha lo alinea hacia el lado derecho."
 
-#: C/evolution.xml:1816(title)
+#: C/evolution.xml:1830(title)
 msgid "Indentation Rules:"
 msgstr "Reglas de sangrado:"
 
-#: C/evolution.xml:1817(para)
+#: C/evolution.xml:1831(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4875,11 +4845,11 @@ msgstr ""
 "El botón con la flecha que apunta a la izquierda reducirá la sangría de un "
 "párrafo y el de la derecha la aumentará."
 
-#: C/evolution.xml:1820(title)
+#: C/evolution.xml:1834(title)
 msgid "Color Selection:"
 msgstr "Selección de color:"
 
-#: C/evolution.xml:1821(para)
+#: C/evolution.xml:1835(para)
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
@@ -4896,11 +4866,11 @@ msgstr ""
 "fondo pulsando con el botón derecho del ratón sobre el fondo del mensaje, "
 "para después seleccionar Estilo &gt; Estilo de la página."
 
-#: C/evolution.xml:1826(title)
+#: C/evolution.xml:1840(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formato HTML avanzado"
 
-#: C/evolution.xml:1827(para)
+#: C/evolution.xml:1841(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
 "your email. To use these and other HTML formatting tools, make sure you have "
@@ -4910,11 +4880,11 @@ msgstr ""
 "estilo a su correo-e. Para usar éstas y otras herramientas de formato HTML , "
 "asegúrese de que ha activado el modo HTML usando Formato &gt; HTML."
 
-#: C/evolution.xml:1830(title)
+#: C/evolution.xml:1844(title)
 msgid "Inserting a Link"
 msgstr "Insertar un enlace"
 
-#: C/evolution.xml:1831(para)
+#: C/evolution.xml:1845(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4924,79 +4894,79 @@ msgstr ""
 "HTML. Si no quiere escribir ningún texto en particular, sólo tiene que "
 "escribir la dirección directamente y Evolution la reconocerá como un enlace."
 
-#: C/evolution.xml:1834(para)
+#: C/evolution.xml:1848(para)
 msgid "Select the text you want to link from."
 msgstr "Seleccione el texto en el que quiere poner el enlace."
 
-#: C/evolution.xml:1837(para)
+#: C/evolution.xml:1851(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el texto, después elija Insertar "
 "enlace."
 
-#: C/evolution.xml:1840(para)
+#: C/evolution.xml:1854(para)
 msgid "Type the URL in the URL field."
 msgstr "Escriba el URL en el campo URL."
 
-#: C/evolution.xml:1849(title)
+#: C/evolution.xml:1863(title)
 msgid "Inserting an Image"
 msgstr "Insertar una imagen"
 
-#: C/evolution.xml:1852(para)
+#: C/evolution.xml:1866(para)
 msgid "Click Insert &gt; Image in the menubar."
 msgstr "Pulse Insertar &gt; Imagen en la barra del menú,"
 
-#: C/evolution.xml:1855(para)
+#: C/evolution.xml:1869(para)
 msgid "Browse to and select the image file."
 msgstr "Navegue y seleccione el archivo de la imagen."
 
-#: C/evolution.xml:1864(title)
+#: C/evolution.xml:1878(title)
 msgid "Inserting a Rule"
 msgstr "Insertar una regla"
 
-#: C/evolution.xml:1865(para)
+#: C/evolution.xml:1879(para)
 msgid ""
 "You can insert a horizontal line into the text to help divide two sections:"
 msgstr ""
 "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/evolution.xml:1868(para)
+#: C/evolution.xml:1882(para)
 msgid "Click Insert &gt; Rule in the menubar."
 msgstr "Pulse Insertar &gt; Regla en la barra de menú."
 
-#: C/evolution.xml:1871(para)
+#: C/evolution.xml:1885(para)
 msgid "Select the width, size, and alignment."
 msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/evolution.xml:1874(para)
+#: C/evolution.xml:1888(para)
 msgid "Select Shade if necessary."
 msgstr "Si es necesario, seleccione el sombreado."
 
-#: C/evolution.xml:1883(title)
+#: C/evolution.xml:1897(title)
 msgid "Inserting a Table"
 msgstr "Insertar una tabla"
 
-#: C/evolution.xml:1884(para)
+#: C/evolution.xml:1898(para)
 msgid "You can insert a table into the text:"
 msgstr "Para insertar una tabla en el texto:"
 
-#: C/evolution.xml:1887(para)
+#: C/evolution.xml:1901(para)
 msgid "Click Insert &gt; Table in the menubar."
 msgstr "Pulse Insertar &gt; Tabla en la barra de menú."
 
-#: C/evolution.xml:1890(para)
+#: C/evolution.xml:1904(para)
 msgid "Select the number of rows and columns."
 msgstr "Seleccione el número de filas y columnas."
 
-#: C/evolution.xml:1893(para)
+#: C/evolution.xml:1907(para)
 msgid "Select the type of layout for the table."
 msgstr "Seleccione el tipo de disposición para la tabla."
 
-#: C/evolution.xml:1896(para)
+#: C/evolution.xml:1910(para)
 msgid "Select a background for the table."
 msgstr "Seleccione un fondo para la tabla."
 
-#: C/evolution.xml:1897(para)
+#: C/evolution.xml:1911(para)
 msgid ""
 "To insert a picture for the background, click the filechooser button and "
 "select the desired image."
@@ -5004,16 +4974,16 @@ msgstr ""
 "Para introducir una imagen para el fondo de pantalla, pulse el botón del "
 "selector de archivos y seleccione la imagen que desee."
 
-#: C/evolution.xml:1909(para)
+#: C/evolution.xml:1923(para)
 msgid "You can set the following options when sending mail in Evolution."
 msgstr ""
 "Puede establecer las siguientes opciones cuando envía correos con Evolution."
 
-#: C/evolution.xml:1911(title)
+#: C/evolution.xml:1925(title)
 msgid "Read Receipts:"
 msgstr "Confirmación de lectura:"
 
-#: C/evolution.xml:1912(para)
+#: C/evolution.xml:1926(para)
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
@@ -5026,11 +4996,11 @@ msgstr ""
 "importante. Para enviar una petición de lectura, pulse Insertar &gt; "
 "Solicitar confirmación de lectura en la ventana del editor."
 
-#: C/evolution.xml:1915(title)
+#: C/evolution.xml:1929(title)
 msgid "Prioritize Message:"
 msgstr "Priorizar mensaje:"
 
-#: C/evolution.xml:1916(para)
+#: C/evolution.xml:1930(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -5040,7 +5010,7 @@ msgstr ""
 "importancia relativa. Para priorizar un mensaje, pulse Insertar &gt; "
 "Priorizar mensaje en la ventana del editor."
 
-#: C/evolution.xml:1919(para)
+#: C/evolution.xml:1933(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -5049,11 +5019,11 @@ msgstr ""
 "debería decidir si el mensaje es importante o no."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:1924(title)
+#: C/evolution.xml:1938(title)
 msgid "Default Settings"
 msgstr "Ajustes predeterminados"
 
-#: C/evolution.xml:1925(para)
+#: C/evolution.xml:1939(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "Draft folder and Sent folder, set the addresses to which you want to sent "
@@ -5065,25 +5035,26 @@ msgstr ""
 "que quiere que se envíen copias de carbón y copias de carbón ocultas. "
 "También puede cambiar los ajustes para los destinatarios de los mensajes."
 
-#: C/evolution.xml:1927(para)
+#: C/evolution.xml:1941(para)
 msgid "To change your default settings,"
 msgstr "Cambiar los ajustes predeterminados,"
 
-#: C/evolution.xml:1933(para)
-msgid "Select the mail account whose default settings you want to change."
-msgstr ""
-"Seleccione la cuenta de correo de la que quiere cambiar los ajustes "
-"predeterminados."
+#: C/evolution.xml:1947(para)
+#| msgid "Select the mail account whose default settings you want to change."
+msgid "Select the mail account whose settings you want to change."
+msgstr "Seleccione la cuenta de correo de la que quiere cambiar los ajustes."
 
-#: C/evolution.xml:1936(para)
-msgid "Click Edit to open the Account Editor window."
+#: C/evolution.xml:1950(para) C/evolution.xml:6481(para)
+#: C/evolution.xml:6548(para)
+#| msgid "Click Edit to open the Account Editor window."
+msgid "Click Edit to open the Account Editor."
 msgstr "Pulse Editar para abrir la ventana del Editor de cuentas."
 
-#: C/evolution.xml:1939(para)
+#: C/evolution.xml:1953(para)
 msgid "Click the Default tab."
 msgstr "Pulse sobre la solapa Predeterminados."
 
-#: C/evolution.xml:1942(para)
+#: C/evolution.xml:1956(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want to "
 "always CC and BCC."
@@ -5091,19 +5062,19 @@ msgstr ""
 "Pulse las respectivas casillas de verificación e introduzca la dirección de "
 "correo-e que quiere usar para los campos Cc y Cco."
 
-#: C/evolution.xml:1945(para)
+#: C/evolution.xml:1959(para)
 msgid ""
 "Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Seleccione la opción que desea para la notificación de recepción de mensajes "
 "de la lista desplegable."
 
-#: C/evolution.xml:1950(title)
+#: C/evolution.xml:1964(title)
 msgid "Changing Default Folder for Sent and Draft Items"
 msgstr ""
 "Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
 
-#: C/evolution.xml:1951(para)
+#: C/evolution.xml:1965(para)
 msgid ""
 "By default, all the sent messages directly go to the Sent folder and those "
 "messages marked as drafts are saved in the Drafts folder. To change the "
@@ -5114,33 +5085,33 @@ msgstr ""
 "la carpeta Borradores. Para cambiar el ajuste predeterminado para los "
 "borradores,"
 
-#: C/evolution.xml:1954(para)
+#: C/evolution.xml:1968(para)
 msgid "Click the Drafts button to open the folder selection window."
 msgstr ""
 "Pulse el botón Borradores para abrir la ventana de selección de carpeta."
 
-#: C/evolution.xml:1957(para)
+#: C/evolution.xml:1971(para)
 msgid "Select the folder you want to save drafts to."
 msgstr "Seleccione la carpeta en la que quiere guardar los borradores."
 
-#: C/evolution.xml:1963(para) C/evolution.xml:1979(para)
+#: C/evolution.xml:1977(para) C/evolution.xml:1993(para)
 msgid "Click the Revert button to revert back to previous settings."
 msgstr "Pulse el botón Revertir para revertir al ajuste anterior."
 
-#: C/evolution.xml:1967(para)
+#: C/evolution.xml:1981(para)
 msgid "To change the default folder for sent items,"
 msgstr "Para cambiar la carpeta predeterminada para los elementos enviados,"
 
-#: C/evolution.xml:1970(para)
+#: C/evolution.xml:1984(para)
 msgid "Click the Sent button to open the folder selection window."
 msgstr ""
 "Pulse el botón Correo enviado para abrir la ventana de selección de carpeta."
 
-#: C/evolution.xml:1973(para)
+#: C/evolution.xml:1987(para)
 msgid "Select the desired folder for sent items."
 msgstr "Seleccione la carpeta que desea para los elementos enviados."
 
-#: C/evolution.xml:1987(para)
+#: C/evolution.xml:2001(para)
 msgid ""
 "When you receive an email, you can forward it to other individuals or groups "
 "that might be interested. You can forward a message as an attachment to a "
@@ -5163,15 +5134,15 @@ msgstr ""
 "al autor original del mensaje y diferenciar claramente las partes del texto "
 "que ha modificado, borrado o añadido."
 
-#: C/evolution.xml:1988(para)
+#: C/evolution.xml:2002(para)
 msgid "To forward a message you are reading:"
 msgstr "Reenviar un mensaje que está leyendo:"
 
-#: C/evolution.xml:1991(para)
+#: C/evolution.xml:2005(para)
 msgid "Click Forward on the toolbar."
 msgstr "Pulse Reenviar en la barra de herramientas."
 
-#: C/evolution.xml:1993(para)
+#: C/evolution.xml:2007(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -5180,7 +5151,7 @@ msgstr ""
 "lugar de como adjunto, pulse en el menú Mensaje &gt; Reenviar como &gt; "
 "Incluido en línea."
 
-#: C/evolution.xml:1996(para)
+#: C/evolution.xml:2010(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -5188,11 +5159,11 @@ msgstr ""
 "Seleccione una dirección como lo haría al enviar un mensaje nuevo, el asunto "
 "ya está introducido, aunque puede cambiarlo si lo desea."
 
-#: C/evolution.xml:1999(para)
+#: C/evolution.xml:2013(para)
 msgid "Add your comments on the message in the composition frame"
 msgstr "Añada sus comentarios en el mensaje dentro del marco de edición"
 
-#: C/evolution.xml:2003(para)
+#: C/evolution.xml:2017(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -5202,7 +5173,7 @@ msgstr ""
 "el mensaje original como un adjunto. Los mensajes incluidos no reenvían "
 "ningún adjunto."
 
-#: C/evolution.xml:2010(para)
+#: C/evolution.xml:2024(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -5213,7 +5184,7 @@ msgstr ""
 "capas de signos de mayor que (&gt;) que indican sucesivos reenvíos "
 "descuidados."
 
-#: C/evolution.xml:2013(para)
+#: C/evolution.xml:2027(para)
 msgid ""
 "Always begin and close with a salutation. Say <quote>please</quote> and "
 "<quote>thank you,</quote> just like you do in real life. You can keep your "
@@ -5223,7 +5194,7 @@ msgstr ""
 "<quote>gracias</quote> de la misma manera que haría en la vida real. Puede "
 "ser breve en sus cumplidos pero sea educado."
 
-#: C/evolution.xml:2016(para)
+#: C/evolution.xml:2030(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -5231,7 +5202,7 @@ msgstr ""
 "CUANDO ESCRIBE CON MAYÚSCULAS SIGNIFICA QUE ESTÁ GRITANDO No escriba "
 "mensajes enteros con mayúsculas porque a la gente le dolerán los oídos."
 
-#: C/evolution.xml:2019(para)
+#: C/evolution.xml:2033(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -5240,12 +5211,12 @@ msgstr ""
 "preconfigurado para destacar las palabras que no reconozca con una línea "
 "roja bajo las palabras conforme las vaya escribiendo."
 
-#: C/evolution.xml:2022(para)
+#: C/evolution.xml:2036(para)
 msgid "Don't send nasty emails (flames). If you get one, don't write back."
 msgstr ""
 "No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
 
-#: C/evolution.xml:2025(para)
+#: C/evolution.xml:2039(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -5253,11 +5224,11 @@ msgstr ""
 "Cuando conteste o reenvíe un mensaje incluya lo justo del mensaje anterior "
 "para proporcionar el contexto necesario."
 
-#: C/evolution.xml:2028(para)
+#: C/evolution.xml:2042(para)
 msgid "Don't send spam."
 msgstr "No envíe spam."
 
-#: C/evolution.xml:2036(para)
+#: C/evolution.xml:2050(para)
 msgid ""
 "A message template is a standard message that you can use at any time to "
 "send mail with the same pattern. Evolution allows you to create and edit "
@@ -5267,63 +5238,63 @@ msgstr ""
 "momento para enviar correos con el mismo patrón. Evolution le permite crear "
 "y editar plantillas de mensajes."
 
-#: C/evolution.xml:2039(link) C/evolution.xml:2059(title)
+#: C/evolution.xml:2053(link) C/evolution.xml:2073(title)
 msgid "Creating a Message Template from an Existing Message"
 msgstr "Crear un mensaje plantilla desde un mensaje existente"
 
-#: C/evolution.xml:2042(link) C/evolution.xml:2086(title)
+#: C/evolution.xml:2056(link) C/evolution.xml:2100(title)
 msgid "Saving a New Message as a Template"
 msgstr "Guardar un mensaje nuevo como plantilla"
 
-#: C/evolution.xml:2045(link) C/evolution.xml:2098(title)
+#: C/evolution.xml:2059(link) C/evolution.xml:2112(title)
 msgid "Using a Message Template as a Reply"
 msgstr "Usar una plantilla de mensaje como respuesta"
 
-#: C/evolution.xml:2048(link) C/evolution.xml:2115(title)
+#: C/evolution.xml:2062(link) C/evolution.xml:2129(title)
 msgid "Configuring Message Templates"
 msgstr "Configurar plantillas de mensajes"
 
-#: C/evolution.xml:2051(para)
+#: C/evolution.xml:2065(para)
 msgid "To enable the Message Template Plugin:"
 msgstr "Para activar el complemento Plantilla de mensaje:"
 
-#: C/evolution.xml:2054(para)
+#: C/evolution.xml:2068(para)
 msgid "Select Edit &gt; Plugins, then select Templates."
 msgstr "Seleccione Editar &gt; Complementos, después seleccione Plantillas."
 
-#: C/evolution.xml:2062(para)
+#: C/evolution.xml:2076(para)
 msgid "Select the message."
 msgstr "Seleccione el mensaje."
 
-#: C/evolution.xml:2065(para)
+#: C/evolution.xml:2079(para)
 msgid "Right-click &gt; Move to folder / Copy to folder."
 msgstr ""
 "Pulse con el botón derecho del ratón &gt; Mover a la carpeta / Copiar a la "
 "carpeta."
 
-#: C/evolution.xml:2068(para)
+#: C/evolution.xml:2082(para)
 msgid "Select the Template local folder."
 msgstr "Seleccione la carpeta local de la plantilla."
 
-#: C/evolution.xml:2071(para)
+#: C/evolution.xml:2085(para)
 msgid "You can also edit an existing message and save it as a template."
 msgstr ""
 "También puede editar un mensaje existente y guardarlo como una plantilla."
 
-#: C/evolution.xml:2074(para)
+#: C/evolution.xml:2088(para)
 msgid "Open the message and click Reply."
 msgstr "Abra el mensaje y pulse Responder."
 
-#: C/evolution.xml:2077(para)
+#: C/evolution.xml:2091(para)
 msgid "Edit the message body or the addresses according to your requirements."
 msgstr ""
 "Edite el cuerpo del mensaje o las direcciones de acuerdo con sus necesidades."
 
-#: C/evolution.xml:2080(para) C/evolution.xml:2092(para)
+#: C/evolution.xml:2094(para) C/evolution.xml:2106(para)
 msgid "Select File &gt; Save as Template."
 msgstr "Seleccione Archivo &gt; Guardar como plantilla."
 
-#: C/evolution.xml:2089(para)
+#: C/evolution.xml:2103(para)
 msgid ""
 "Click New and enter the information in the New Message window, according to "
 "your requirements."
@@ -5331,25 +5302,25 @@ msgstr ""
 "Pulse Nuevo e introduzca la información en la ventana Mensaje nuevo, de "
 "acuerdo con sus necesidades."
 
-#: C/evolution.xml:2101(para)
+#: C/evolution.xml:2115(para)
 msgid "Right-click the message you are replying to, then click Templates."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje al que está "
 "respondiendo, después pulse Plantillas."
 
-#: C/evolution.xml:2102(para)
+#: C/evolution.xml:2116(para)
 msgid "This option lists all the message templates in the Template folder."
 msgstr ""
 "Esta opción lista todas las plantillas de mensajes en la carpeta Plantilla."
 
-#: C/evolution.xml:2105(para)
+#: C/evolution.xml:2119(para)
 msgid ""
 "Select Open the message template of your choice and make changes if required."
 msgstr ""
 "Seleccione Abrir el mensaje de plantilla a su elección y realice los cambios "
 "si es necesario."
 
-#: C/evolution.xml:2109(para)
+#: C/evolution.xml:2123(para)
 msgid ""
 "When you select a message template for replying, the subject of the reply is "
 "preserved."
@@ -5357,7 +5328,7 @@ msgstr ""
 "Al seleccionar una plantilla de mensaje para responder, el asunto de la "
 "respuesta se mantiene."
 
-#: C/evolution.xml:2116(para)
+#: C/evolution.xml:2130(para)
 msgid ""
 "In the Plugin Manager, select the Configuration tab to customize your "
 "message templates. You can add, edit or remove the key-value pairs. You can "
@@ -5368,7 +5339,7 @@ msgstr ""
 "de claves y valores. Puede especificar cualquier número de pares de claves y "
 "valores."
 
-#: C/evolution.xml:2117(para)
+#: C/evolution.xml:2131(para)
 msgid ""
 "In any template, the occurrence of every $key is replaced by the value it "
 "has in the configuration. For example, if you set the key to Manager and the "
@@ -5380,7 +5351,7 @@ msgstr ""
 "Director y el valor a Tomás, cualquier aparición de $Director se reemplaza "
 "con Tomás en el mensaje."
 
-#: C/evolution.xml:2118(para)
+#: C/evolution.xml:2132(para)
 msgid ""
 "Assume that you have 1000 message templates with your current manager's name "
 "has a reference in them. When the current manager is replaced by a new one, "
@@ -5394,7 +5365,7 @@ msgstr ""
 "mensajes tienen un valor de clave $Director, puede cambiar el valor en la "
 "solapa Configuración de este complemento."
 
-#: C/evolution.xml:2119(para)
+#: C/evolution.xml:2133(para)
 msgid ""
 "By default, the entire environment variables are used as a key-value pair. "
 "An occurrence of $env_variable is replaced by the value it carries. For "
@@ -5406,11 +5377,11 @@ msgstr ""
 "lleva. Por ejemplo, una aparición de $PATH en su plantilla se reemplaza por "
 "su valor al usar la plantilla."
 
-#: C/evolution.xml:2120(para)
+#: C/evolution.xml:2134(para)
 msgid "The replacement process uses the following order of precedence:"
 msgstr "El proceso de reemplazo usa el siguiente orden de precedencia:"
 
-#: C/evolution.xml:2123(para)
+#: C/evolution.xml:2137(para)
 msgid ""
 "$key is replaced by the value set for it in the Configuration tab of the "
 "Templates plugin."
@@ -5418,7 +5389,7 @@ msgstr ""
 "$key se reemplaza por el valor ajustado para ello en la solapa Configuración "
 "del complemento Plantillas."
 
-#: C/evolution.xml:2126(para)
+#: C/evolution.xml:2140(para)
 msgid ""
 "If the key is not found, it is then replaced with the value of its "
 "environment variable."
@@ -5426,7 +5397,7 @@ msgstr ""
 "Si no se encuentra la clave, se reemplaza con el valor de su variable de "
 "entorno."
 
-#: C/evolution.xml:2129(para)
+#: C/evolution.xml:2143(para)
 msgid ""
 "If key is neither a configuration option nor an environment variable, no "
 "changes are made."
@@ -5434,7 +5405,7 @@ msgstr ""
 "Si la clave no es una opción de configuración ni una variable de entorno, "
 "entonces no se hacen cambios."
 
-#: C/evolution.xml:2137(para)
+#: C/evolution.xml:2151(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
 "invitations to the attendee list through the Evolution email tool. The "
@@ -5445,7 +5416,7 @@ msgstr ""
 "Evolution. La tarjeta de invitación se envía como archivo adjunto en formato "
 "iCal."
 
-#: C/evolution.xml:2138(para)
+#: C/evolution.xml:2152(para)
 msgid ""
 "To send an invitation, right click on the calendar item and click Forward as "
 "iCalendar."
@@ -5453,15 +5424,15 @@ msgstr ""
 "Para enviar una invitación pulse con el botón derecho sobre el elemento del "
 "calendario y pulse Reenviar como iCalendar."
 
-#: C/evolution.xml:2139(para)
+#: C/evolution.xml:2153(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Cuando reciba una invitación, tiene varias opciones:"
 
-#: C/evolution.xml:2141(title)
+#: C/evolution.xml:2155(title)
 msgid "Accept:"
 msgstr "Aceptar:"
 
-#: C/evolution.xml:2142(para)
+#: C/evolution.xml:2156(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5469,11 +5440,11 @@ msgstr ""
 "Indica que asistirá a la reunión. Cuando pulse el botón Aceptar, la reunión "
 "se apuntará en su agenda."
 
-#: C/evolution.xml:2145(title)
+#: C/evolution.xml:2159(title)
 msgid "Tentatively Accept:"
 msgstr "Aceptado provisionalmente:"
 
-#: C/evolution.xml:2146(para)
+#: C/evolution.xml:2160(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5482,11 +5453,11 @@ msgstr ""
 "Indica que es probable que asista a la reunión. Cuando pulse el botón "
 "Aceptar la reunión se apuntará en su agenda, pero marcada como provisional."
 
-#: C/evolution.xml:2149(title)
+#: C/evolution.xml:2163(title)
 msgid "Decline:"
 msgstr "Rehusar:"
 
-#: C/evolution.xml:2150(para)
+#: C/evolution.xml:2164(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
@@ -5496,18 +5467,18 @@ msgstr ""
 "calendario al pulsar Aceptar, aunque su respuesta se envía al organizador de "
 "la reunión si ha seleccionado la opción Responder al remitente."
 
-#: C/evolution.xml:2153(title)
+#: C/evolution.xml:2167(title)
 msgid "Send reply to sender:"
 msgstr "Responder al remitente:"
 
-#: C/evolution.xml:2154(para)
+#: C/evolution.xml:2168(para)
 msgid ""
 "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Marque esta casilla si quiere que su respuesta llegue a los organizadores de "
 "la reunión."
 
-#: C/evolution.xml:2160(para)
+#: C/evolution.xml:2174(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5523,11 +5494,11 @@ msgstr ""
 "si quiere escoger elementos específicos y excluir el resto, puede usar la "
 "herramienta de gestión de suscripciones."
 
-#: C/evolution.xml:2163(para)
+#: C/evolution.xml:2177(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Seleccione Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:2166(para)
+#: C/evolution.xml:2180(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5535,15 +5506,15 @@ msgstr ""
 "Si tiene cuentas en varios servidores IMAP, seleccione el servidor donde "
 "quiere gestionar sus suscripciones."
 
-#: C/evolution.xml:2167(para)
+#: C/evolution.xml:2181(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution mostrará la lista de carpetas y archivos disponibles."
 
-#: C/evolution.xml:2170(para)
+#: C/evolution.xml:2184(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Seleccione un archivo o carpeta pulsando sobre él."
 
-#: C/evolution.xml:2171(para)
+#: C/evolution.xml:2185(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5554,18 +5525,18 @@ msgstr ""
 "puede incluir carpetas que no son de correo, que puede ignorar sin mayor "
 "problema."
 
-#: C/evolution.xml:2174(para)
+#: C/evolution.xml:2188(para)
 msgid ""
 "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Active la correspondiente casilla de verificación para añadir una carpeta a "
 "su lista de suscripción."
 
-#: C/evolution.xml:2177(para)
+#: C/evolution.xml:2191(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr "Cierre la ventana cuando se haya suscrito a las carpetas que desea."
 
-#: C/evolution.xml:2184(para)
+#: C/evolution.xml:2198(para)
 msgid ""
 "To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
@@ -5573,15 +5544,15 @@ msgstr ""
 "Para proteger y codificar sus transmisiones de correos-e, Evolution ofrece "
 "dos métodos de cifrado:"
 
-#: C/evolution.xml:2187(para)
+#: C/evolution.xml:2201(para)
 msgid "GPG Encryption"
 msgstr "Cifrado GPG"
 
-#: C/evolution.xml:2190(para) C/evolution.xml:2351(title)
+#: C/evolution.xml:2204(para) C/evolution.xml:2365(title)
 msgid "S/MIME Encryption"
 msgstr "Cifrado S/MIME"
 
-#: C/evolution.xml:2193(para)
+#: C/evolution.xml:2207(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5591,7 +5562,7 @@ msgstr ""
 "Guard (GPG), una implementación del potente algoritmo de <link linkend="
 "\"public-key-encryption\">cifrado de clave pública</link>."
 
-#: C/evolution.xml:2194(para)
+#: C/evolution.xml:2208(para)
 msgid ""
 "In order to send and receive encrypted emails using GPG, it is necessary to "
 "use two kinds of encryption keys: public and private. Public keys are used "
@@ -5607,7 +5578,7 @@ msgstr ""
 "compartir con aquellos a los que quiera enviar mensajes cifrados. También "
 "puede subirlas a un servidor de claves públicas."
 
-#: C/evolution.xml:2195(para)
+#: C/evolution.xml:2209(para)
 msgid ""
 "Those who wish to send you encrypted email must first have a copy of your "
 "public key on your keyring. To this end, public keys can be shared with "
@@ -5621,7 +5592,7 @@ msgstr ""
 "mensajes cifrados. Para ello, debe subir sus claves públicas a un servidor "
 "de claves públicas. Las claves privadas no se deben compartir con otros."
 
-#: C/evolution.xml:2196(para)
+#: C/evolution.xml:2210(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5629,11 +5600,11 @@ msgstr ""
 "Evolution no soporta versiones antiguas de PGP, tales como OpenPGP y PGP "
 "incluido."
 
-#: C/evolution.xml:2197(para)
+#: C/evolution.xml:2211(para)
 msgid "You can use encryption in two different ways:"
 msgstr "El cifrado se puede usar de dos maneras diferentes:"
 
-#: C/evolution.xml:2200(para)
+#: C/evolution.xml:2214(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5641,7 +5612,7 @@ msgstr ""
 "Puede cifrar el mensaje entero para que nadie, excepto el destinatario, "
 "pueda leerlo."
 
-#: C/evolution.xml:2203(para)
+#: C/evolution.xml:2217(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5652,7 +5623,7 @@ msgstr ""
 "necesitaría descifrar la firma cuando quiera verificar la identidad del "
 "remitente."
 
-#: C/evolution.xml:2206(para)
+#: C/evolution.xml:2220(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
@@ -5668,11 +5639,11 @@ msgstr ""
 "usa su clave privada para descifrarlo y el mensaje quedará listo para su "
 "lectura."
 
-#: C/evolution.xml:2209(title)
+#: C/evolution.xml:2223(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Crear claves de cifrado GPG"
 
-#: C/evolution.xml:2210(para)
+#: C/evolution.xml:2224(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5685,16 +5656,16 @@ msgstr ""
 "exacto. Puede averiguar la versión exacta usando la orden <command>gpg --"
 "version</command>."
 
-#: C/evolution.xml:2213(para)
+#: C/evolution.xml:2227(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
 msgstr ""
 "Abra una terminal e introduzca el comando <command>gpg --gen-key</command>."
 
-#: C/evolution.xml:2216(para)
+#: C/evolution.xml:2230(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Seleccione un algoritmo, después pulse Intro."
 
-#: C/evolution.xml:2218(para)
+#: C/evolution.xml:2232(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5702,7 +5673,7 @@ msgstr ""
 "Para aceptar el algoritmo predeterminado «DSA y ElGamal», pulse Intro "
 "(recomendado)."
 
-#: C/evolution.xml:2221(para)
+#: C/evolution.xml:2235(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5710,11 +5681,11 @@ msgstr ""
 "Seleccione una longitud de clave, después pulse Intro. Para aceptar la "
 "predeterminada, de 1024 bits, pulse Intro."
 
-#: C/evolution.xml:2224(para)
+#: C/evolution.xml:2238(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Introduzca el tiempo para la cual su clave deberá ser válida."
 
-#: C/evolution.xml:2226(para)
+#: C/evolution.xml:2240(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5722,32 +5693,32 @@ msgstr ""
 "Para aceptar la opción predeterminada sin caducidad, pulse Intro, después "
 "puse Y cuando se le pregunte la verificación de su elección."
 
-#: C/evolution.xml:2229(para)
+#: C/evolution.xml:2243(para)
 msgid "Type your real name, then press Enter."
 msgstr "Escriba su nombre real, después pulse Intro."
 
-#: C/evolution.xml:2232(para)
+#: C/evolution.xml:2246(para)
 msgid "Type your email address, then press Enter."
 msgstr "Escriba su dirección de correo-e, después pulse Intro."
 
-#: C/evolution.xml:2235(para)
+#: C/evolution.xml:2249(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "(Opcional) Escriba un comentario, después pulse Intro."
 
-#: C/evolution.xml:2238(para)
+#: C/evolution.xml:2252(para)
 msgid "Review your selected user ID. If it is correct, press O."
 msgstr ""
 "Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
 
-#: C/evolution.xml:2241(para)
+#: C/evolution.xml:2255(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Escriba una frase de paso, después pulse Intro."
 
-#: C/evolution.xml:2244(para)
+#: C/evolution.xml:2258(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Mueva su ratón aleatoriamente para generar las claves."
 
-#: C/evolution.xml:2247(para)
+#: C/evolution.xml:2261(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5763,7 +5734,7 @@ msgstr ""
 "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
 "computeroutput>"
 
-#: C/evolution.xml:2248(para)
+#: C/evolution.xml:2262(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5774,11 +5745,11 @@ msgstr ""
 "están guardadas en el archivo ~/.gnupg/pubring.gpg. Si quiere darle a "
 "alguien su clave, envíele éste archivo."
 
-#: C/evolution.xml:2249(para)
+#: C/evolution.xml:2263(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr "Si lo desea puede subir sus claves a un servidor de claves."
 
-#: C/evolution.xml:2252(para)
+#: C/evolution.xml:2266(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after "
 "<quote>1024D</quote> on the line beginning with <quote>pub</quote>. In the "
@@ -5789,7 +5760,7 @@ msgstr ""
 "línea que empieza con <quote>pub</quote>. En este ejemplo es "
 "<quote>32j38dk2</quote>."
 
-#: C/evolution.xml:2255(para)
+#: C/evolution.xml:2269(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5800,7 +5771,7 @@ msgstr ""
 "clave por <varname>32j38dk2</varname>. Necesitará su contraseña para poder "
 "hacerlo."
 
-#: C/evolution.xml:2258(para)
+#: C/evolution.xml:2272(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5815,7 +5786,7 @@ msgstr ""
 "publicarla de una vez y permitir a los demás descargarlas desde un servidor "
 "central cuando ellos quieran."
 
-#: C/evolution.xml:2259(para)
+#: C/evolution.xml:2273(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5825,11 +5796,11 @@ msgstr ""
 "herramienta de cifrado para buscarla automáticamente. Si no puede encontrar "
 "la clave se mostrará un mensaje de error."
 
-#: C/evolution.xml:2263(title)
+#: C/evolution.xml:2277(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Obtener y usar claves GPG públicas"
 
-#: C/evolution.xml:2264(para)
+#: C/evolution.xml:2278(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5839,7 +5810,7 @@ msgstr ""
 "combinación con su clave privada. Evolution lo hace por usted, pero con todo "
 "necesitará obtener su clave y añadirla a su depósito de claves."
 
-#: C/evolution.xml:2265(para)
+#: C/evolution.xml:2279(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5852,7 +5823,7 @@ msgstr ""
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
 "su identificador se añadirá automáticamente a su depósito de claves."
 
-#: C/evolution.xml:2267(para)
+#: C/evolution.xml:2281(para)
 msgid ""
 "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
 "to multiple hosts in various networks. The gpg utility tries to connect to "
@@ -5864,7 +5835,7 @@ msgstr ""
 "a una en la red actual y si ese servidor en particular está caído, falla al "
 "superarse el tiempo de expiración."
 
-#: C/evolution.xml:2270(para)
+#: C/evolution.xml:2284(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
@@ -5879,7 +5850,7 @@ msgstr ""
 "wwwkeys.pgp.net keyid con el número de dirección IP explícito que devolvió "
 "la utilidad del servidor."
 
-#: C/evolution.xml:2275(para)
+#: C/evolution.xml:2289(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
@@ -5889,24 +5860,24 @@ msgstr ""
 "de texto plano e introduzca el comando <command>gpg <varname>--import</"
 "varname></command> para añadirá a su depósito de claves."
 
-#: C/evolution.xml:2279(title)
+#: C/evolution.xml:2293(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configurar el cifrado GPG"
 
-#: C/evolution.xml:2285(para) C/evolution.xml:2327(para)
+#: C/evolution.xml:2299(para) C/evolution.xml:2341(para)
 msgid "Select the account you want to use securely, then click Edit."
 msgstr ""
 "Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
 
-#: C/evolution.xml:2288(para) C/evolution.xml:2330(para)
+#: C/evolution.xml:2302(para) C/evolution.xml:2344(para)
 msgid "Click the Security tab."
 msgstr "Pulse en la solapa de Seguridad."
 
-#: C/evolution.xml:2291(para)
+#: C/evolution.xml:2305(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Especifique el ID de su clave en el campo ID de la clave GPG/PGP."
 
-#: C/evolution.xml:2300(para)
+#: C/evolution.xml:2314(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
 "can find it by typing <command>gpg --list-keys</command> in a terminal "
@@ -5918,27 +5889,27 @@ msgstr ""
 "en un terminal. El identificador de clave es una cadena de 8 caracteres con "
 "números y letras aleatorios."
 
-#: C/evolution.xml:2304(title)
+#: C/evolution.xml:2318(title)
 msgid "Encrypting Messages"
 msgstr "Cifrar mensajes"
 
-#: C/evolution.xml:2305(para)
+#: C/evolution.xml:2319(para)
 msgid "To encrypt a single message:"
 msgstr "Cifrar un sólo mensaje:"
 
-#: C/evolution.xml:2308(para) C/evolution.xml:5346(para)
+#: C/evolution.xml:2322(para) C/evolution.xml:5358(para)
 msgid "Open a Compose Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
-#: C/evolution.xml:2311(para)
+#: C/evolution.xml:2325(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Pulse Seguridad &gt; Cifrado PGP."
 
-#: C/evolution.xml:2314(para)
+#: C/evolution.xml:2328(para)
 msgid "Compose your message."
 msgstr "Edite su mensaje."
 
-#: C/evolution.xml:2319(para)
+#: C/evolution.xml:2333(para)
 msgid ""
 "The Subject line of the message will not be encrypted and should not be used "
 "for sensitive information."
@@ -5946,23 +5917,23 @@ msgstr ""
 "La línea del Asunto del mensaje no se cifrará y no se debería usar para "
 "contener información sensible."
 
-#: C/evolution.xml:2321(para)
+#: C/evolution.xml:2335(para)
 msgid "You can set Evolution to always sign your email messages:"
 msgstr ""
 "Puede configurar Evolution para que firme siempre sus mensajes de correo "
 "electrónico:"
 
 # index.docbook:172, index.docbook:216
-#: C/evolution.xml:2333(para)
+#: C/evolution.xml:2347(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr ""
 "Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
 
-#: C/evolution.xml:2345(title)
+#: C/evolution.xml:2359(title)
 msgid "Unencrypting a Received Message"
 msgstr "Descifrar un mensaje recibido"
 
-#: C/evolution.xml:2346(para)
+#: C/evolution.xml:2360(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5972,7 +5943,7 @@ msgstr ""
 "Recuerde que el remitente tiene que tener su clave pública (la suya, de "
 "usted) antes de enviarle un mensaje cifrado."
 
-#: C/evolution.xml:2347(para)
+#: C/evolution.xml:2361(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5980,7 +5951,7 @@ msgstr ""
 "Cuando vea el mensaje, Evolution le pedirá que escriba su contraseña PGP. "
 "Escríbala y el mensaje se mostrará apropiadamente."
 
-#: C/evolution.xml:2352(para)
+#: C/evolution.xml:2366(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -6002,7 +5973,7 @@ msgstr ""
 "certificado S/MIME, su sistema recibirá automáticamente la parte pública del "
 "certificado y descifrará o verificará el mensaje."
 
-#: C/evolution.xml:2353(para)
+#: C/evolution.xml:2367(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -6018,7 +5989,7 @@ msgstr ""
 "VeriSign* o Thawte*.  En cualquier caso, el administrador del sistema le "
 "proporciona un archivo de certificado."
 
-#: C/evolution.xml:2354(para)
+#: C/evolution.xml:2368(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
 "certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
@@ -6031,28 +6002,28 @@ msgstr ""
 "mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">ayuda "
 "de Mozilla</ulink>."
 
-#: C/evolution.xml:2355(para)
+#: C/evolution.xml:2369(para)
 msgid "The certificate file is a password-protected file on your computer."
 msgstr ""
 "El archivo certificado es un archivo protegido por contraseña en su equipo."
 
-#: C/evolution.xml:2358(title)
+#: C/evolution.xml:2372(title)
 msgid "Adding a Signing Certificate"
 msgstr "Añadir un certificado firmado"
 
-#: C/evolution.xml:2364(para)
+#: C/evolution.xml:2378(para)
 msgid "Click Certificates."
 msgstr "Pulse Certificados."
 
-#: C/evolution.xml:2367(para) C/evolution.xml:2490(para)
+#: C/evolution.xml:2381(para) C/evolution.xml:2504(para)
 msgid "Click Import."
 msgstr "Pulse Importar."
 
-#: C/evolution.xml:2370(para)
+#: C/evolution.xml:2384(para)
 msgid "Select the file to import, then click Open."
 msgstr "Seleccione el archivo a importar, después pulse Abrir."
 
-#: C/evolution.xml:2376(para)
+#: C/evolution.xml:2390(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -6065,11 +6036,11 @@ msgstr ""
 "nuevas autoridades de certificados, que tienen sus propios archivos de "
 "certificados, de la misma forma."
 
-#: C/evolution.xml:2380(title)
+#: C/evolution.xml:2394(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/evolution.xml:2381(para)
+#: C/evolution.xml:2395(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -6078,19 +6049,19 @@ msgstr ""
 "mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
 "de mensajes."
 
-#: C/evolution.xml:2382(para)
+#: C/evolution.xml:2396(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Para enviar cada mensaje cifrado o firmado:"
 
-#: C/evolution.xml:2388(para)
+#: C/evolution.xml:2402(para)
 msgid "Select the account to encrypt the messages in."
 msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
-#: C/evolution.xml:2391(para)
+#: C/evolution.xml:2405(para)
 msgid "Click Edit, then click Security."
 msgstr "Pulse Editar, después pulse en Seguridad."
 
-#: C/evolution.xml:2394(para)
+#: C/evolution.xml:2408(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -6098,7 +6069,7 @@ msgstr ""
 "Pulse Seleccionar junto a Certificado de firma y especificar la ruta a su "
 "certificado de firma."
 
-#: C/evolution.xml:2396(para)
+#: C/evolution.xml:2410(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -6106,11 +6077,11 @@ msgstr ""
 "Pulse seleccionar junto a Certificado de cifrado y especifique la ruta a su "
 "certificado de cifrado."
 
-#: C/evolution.xml:2399(para)
+#: C/evolution.xml:2413(para)
 msgid "Select the appropriate options."
 msgstr "Seleccione las opciones apropiadas."
 
-#: C/evolution.xml:2415(para)
+#: C/evolution.xml:2429(para)
 msgid ""
 "Whether you only get a few email messages a day, or you receive hundreds, "
 "you probably want to sort and organize them. <trademark>Evolution</"
@@ -6120,35 +6091,35 @@ msgstr ""
 "probablemente querrá organizarlos. <trademark>Evolution</trademark> tiene "
 "las herramientas para ayudarle a hacerlo."
 
-#: C/evolution.xml:2418(link) C/evolution.xml:2441(title)
+#: C/evolution.xml:2432(link) C/evolution.xml:2455(title)
 msgid "Importing Your Old Email"
 msgstr "Importar su correo-e antiguo"
 
-#: C/evolution.xml:2421(link) C/evolution.xml:2531(title)
+#: C/evolution.xml:2435(link) C/evolution.xml:2545(title)
 msgid "Sorting the Message List"
 msgstr "Ordenación de la lista de mensajes"
 
-#: C/evolution.xml:2424(link) C/evolution.xml:2702(title)
+#: C/evolution.xml:2438(link) C/evolution.xml:2716(title)
 msgid "Getting Organized with Folders"
 msgstr "Organización básica de carpetas"
 
-#: C/evolution.xml:2427(link) C/evolution.xml:2717(title)
+#: C/evolution.xml:2441(link) C/evolution.xml:2731(title)
 msgid "Searching for Messages"
 msgstr "Búsqueda de mensajes"
 
-#: C/evolution.xml:2430(link) C/evolution.xml:2921(title)
+#: C/evolution.xml:2444(link) C/evolution.xml:2935(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Creación de reglas para organizar automáticamente el correo"
 
-#: C/evolution.xml:2433(link) C/evolution.xml:3160(title)
+#: C/evolution.xml:2447(link) C/evolution.xml:3174(title)
 msgid "Using Search Folders"
 msgstr "Usar las carpetas de búsqueda"
 
-#: C/evolution.xml:2436(link) C/evolution.xml:3290(title)
+#: C/evolution.xml:2450(link) C/evolution.xml:3304(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Parar el correo basura (SPAM)"
 
-#: C/evolution.xml:2442(para)
+#: C/evolution.xml:2456(para)
 msgid ""
 "Evolution allows you to import old email and contacts so that you don't need "
 "to worry about losing your old information."
@@ -6156,19 +6127,19 @@ msgstr ""
 "Evolution le permite importar correo-e antiguo y sus contactos para que no "
 "tenga que preocuparse por la pérdida de información anterior."
 
-#: C/evolution.xml:2445(title)
+#: C/evolution.xml:2459(title)
 msgid "Importing Single Files"
 msgstr "Importar un sólo archivo"
 
-#: C/evolution.xml:2446(para)
+#: C/evolution.xml:2460(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution puede importar los siguientes tipos de archivos:"
 
-#: C/evolution.xml:2448(title)
+#: C/evolution.xml:2462(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2449(para)
+#: C/evolution.xml:2463(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -6178,11 +6149,11 @@ msgstr ""
 "numerosas aplicaciones de administración de contactos. Será necesario poder "
 "exportar la libreta de direcciones de su otra aplicación al formato vCard."
 
-#: C/evolution.xml:2452(title)
+#: C/evolution.xml:2466(title)
 msgid "vCalendar:"
 msgstr "vCalendar:"
 
-#: C/evolution.xml:2453(para)
+#: C/evolution.xml:2467(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -6190,11 +6161,11 @@ msgstr ""
 "Un formato para almacenar archivos de calendario. generalmente usado por "
 "Evolution, Microsoft Outlook, Sunbird y Korganizer."
 
-#: C/evolution.xml:2456(title)
+#: C/evolution.xml:2470(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar o iCal (.ics):"
 
-#: C/evolution.xml:2457(para)
+#: C/evolution.xml:2471(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -6203,22 +6174,22 @@ msgstr ""
 "programa utilizado por equipos de mano PalmOS, así como Evolution y "
 "Microsoft Outlook."
 
-#: C/evolution.xml:2460(title)
+#: C/evolution.xml:2474(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2461(para)
+#: C/evolution.xml:2475(para)
 msgid ""
 "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "Los archivos CSV o Tab guardados al usar Evolution, Microsoft Outlook y "
 "Mozilla."
 
-#: C/evolution.xml:2464(title)
+#: C/evolution.xml:2478(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2465(para)
+#: C/evolution.xml:2479(para)
 msgid ""
 "The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
@@ -6228,19 +6199,19 @@ msgstr ""
 "otras versiones de Microsoft Outlook y Outlook Express, vea la solución "
 "descrita en el <link linkend=\"bsawgkk\">Paso 1</link>."
 
-#: C/evolution.xml:2468(title)
+#: C/evolution.xml:2482(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "Formato de intercambio de datos de LDAP (.LDIF):"
 
-#: C/evolution.xml:2469(para)
+#: C/evolution.xml:2483(para)
 msgid "A standard data format for contact cards."
 msgstr "Un formato de datos estándar para tarjetas de visita."
 
-#: C/evolution.xml:2472(title)
+#: C/evolution.xml:2486(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox o extensión nula):"
 
-#: C/evolution.xml:2473(para)
+#: C/evolution.xml:2487(para)
 msgid ""
 "The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
 "other email clients."
@@ -6248,28 +6219,28 @@ msgstr ""
 "El formato de buzón de correo utilizado por los programas Mozilla, Netscape, "
 "Evolution, Eudora* y muchos otros clientes de correo electrónico."
 
-#: C/evolution.xml:2475(para)
+#: C/evolution.xml:2489(para)
 msgid "To import your old email:"
 msgstr "Importar sus correos electrónicos antiguos:"
 
-#: C/evolution.xml:2478(para) C/evolution.xml:2500(para)
-#: C/evolution.xml:3657(para)
+#: C/evolution.xml:2492(para) C/evolution.xml:2514(para)
+#: C/evolution.xml:3671(para)
 msgid "Click File &gt; Import."
 msgstr "Pulse Archivo &gt; Importar."
 
-#: C/evolution.xml:2484(para)
+#: C/evolution.xml:2498(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Seleccione Importar un único archivo, después pulse Siguiente."
 
-#: C/evolution.xml:2487(para)
+#: C/evolution.xml:2501(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Seleccione el archivo para importar, después pulse Adelante."
 
-#: C/evolution.xml:2496(title)
+#: C/evolution.xml:2510(title)
 msgid "Importing Multiple Files"
 msgstr "Importar múltiples archivos"
 
-#: C/evolution.xml:2497(para)
+#: C/evolution.xml:2511(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -6277,14 +6248,14 @@ msgstr ""
 "Evolution automatiza el proceso de importación para distintas aplicaciones "
 "que puede reconocer."
 
-#: C/evolution.xml:2506(para)
+#: C/evolution.xml:2520(para)
 msgid ""
 "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Seleccione Importar datos y configuración de programas antiguos, después "
 "pulse Adelante."
 
-#: C/evolution.xml:2507(para)
+#: C/evolution.xml:2521(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -6292,7 +6263,7 @@ msgstr ""
 "Siga los pasos <link linkend=\"bsawely\">Paso 3</link> hasta <link linkend="
 "\"bsawf2t\">Paso 5</link> para importar."
 
-#: C/evolution.xml:2508(para)
+#: C/evolution.xml:2522(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -6300,7 +6271,7 @@ msgstr ""
 "Evolution busca programas de correo antiguos y, si es posible, importa los "
 "datos de ellos."
 
-#: C/evolution.xml:2513(para)
+#: C/evolution.xml:2527(para)
 msgid ""
 "One migration method that works well is to use the Outport application. See "
 "<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
@@ -6312,7 +6283,7 @@ msgstr ""
 "net</ulink> para obtener información adicional. También puede importar datos "
 "en otro cliente de correo para Windows como Mozilla."
 
-#: C/evolution.xml:2516(para)
+#: C/evolution.xml:2530(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -6321,19 +6292,19 @@ msgstr ""
 "otro cliente de correo que utilice el formato mbox estándar, como Netscape o "
 "Eudora)."
 
-#: C/evolution.xml:2520(para)
+#: C/evolution.xml:2534(para)
 msgid ""
 "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Copie los archivos al sistema o a la partición en la que esté instalado "
 "Evolution."
 
-#: C/evolution.xml:2523(para)
+#: C/evolution.xml:2537(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr ""
 "Use la herramienta de importar de Evolution para importar los archivos."
 
-#: C/evolution.xml:2526(para)
+#: C/evolution.xml:2540(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -6350,7 +6321,7 @@ msgstr ""
 "todos los mensajes en la carpeta, seleccione la carpeta entera pulsaando Ctrl"
 "+A y después aplique los filtros pulsando Ctrl+Y."
 
-#: C/evolution.xml:2532(para)
+#: C/evolution.xml:2546(para)
 msgid ""
 "Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
@@ -6372,7 +6343,7 @@ msgstr ""
 "disponer de un conjunto de opciones de ordenación y añadir o quitar columnas "
 "de la lista de mensajes."
 
-#: C/evolution.xml:2533(para)
+#: C/evolution.xml:2547(para)
 msgid ""
 "To look at the complete headers for a message, click View &gt; All Message "
 "Headers. To see all message data, click View &gt; Message Source."
@@ -6381,11 +6352,11 @@ msgstr ""
 "cabeceras del mensaje. Para ver todos los datos del mensaje, pulse Ver &gt; "
 "Mensaje en bruto."
 
-#: C/evolution.xml:2536(title)
+#: C/evolution.xml:2550(title)
 msgid "Sorting Mail In Email Threads"
 msgstr "Ordenar los correos por conversaciones"
 
-#: C/evolution.xml:2537(para)
+#: C/evolution.xml:2551(para)
 msgid ""
 "You can also choose a threaded message view. Click View &gt; Group By "
 "Threads to turn the threaded view on or off. When you select this option, "
@@ -6397,7 +6368,7 @@ msgstr ""
 "opción, Evolution agrupa las respuestas de un mensaje con el original, por "
 "lo que puede seguir el hilo de la conversación de un mensaje al siguiente."
 
-#: C/evolution.xml:2539(para)
+#: C/evolution.xml:2553(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -6414,7 +6385,7 @@ msgstr ""
 "conversaciones se ordenan por la fecha del mensaje más reciente en las "
 "conversaciones."
 
-#: C/evolution.xml:2541(para)
+#: C/evolution.xml:2555(para)
 msgid ""
 "There is a GConf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -6430,11 +6401,11 @@ msgstr ""
 "todas las conversaciones toman este estado. Es una opción muy avanzada sólo "
 "para usuarios avanzados."
 
-#: C/evolution.xml:2546(title)
+#: C/evolution.xml:2560(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2547(para)
+#: C/evolution.xml:2561(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -6446,11 +6417,11 @@ msgstr ""
 "asunto. Puede cambiar el orden de las columnas o añadir y quitar columnas "
 "arrastrando y soltándolas."
 
-#: C/evolution.xml:2551(title)
+#: C/evolution.xml:2565(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2552(para)
+#: C/evolution.xml:2566(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
 "by list. You can use any of the criteria given in the Sort-by list such as "
@@ -6464,98 +6435,98 @@ msgstr ""
 "emphasis> para realizar la ordenación. Devuelve la lista de correo ordenada "
 "que coincide con los criterios que ha seleccionado."
 
-#: C/evolution.xml:2553(para)
+#: C/evolution.xml:2567(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2556(para)
+#: C/evolution.xml:2570(para)
 msgid "Right-click message header bar."
 msgstr "Pulse con el botón derecho sobre la barra de cabeceras."
 
-#: C/evolution.xml:2559(para)
+#: C/evolution.xml:2573(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Pulse Ordenar por para obtener una lista de opciones."
 
-#: C/evolution.xml:2561(title)
+#: C/evolution.xml:2575(title)
 msgid "Sort by:"
 msgstr "Ordenar por:"
 
-#: C/evolution.xml:2562(para)
+#: C/evolution.xml:2576(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr ""
 "Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
 
-#: C/evolution.xml:2566(para)
+#: C/evolution.xml:2580(para)
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: C/evolution.xml:2569(para) C/evolution.xml:2575(para)
+#: C/evolution.xml:2583(para) C/evolution.xml:2589(para)
 msgid "Sender"
 msgstr "Remitente"
 
-#: C/evolution.xml:2572(para)
+#: C/evolution.xml:2586(para)
 msgid "Location"
 msgstr "Lugar"
 
-#: C/evolution.xml:2578(para)
+#: C/evolution.xml:2592(para)
 msgid "Due By"
 msgstr "Vence en"
 
-#: C/evolution.xml:2581(para)
+#: C/evolution.xml:2595(para)
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: C/evolution.xml:2584(para)
+#: C/evolution.xml:2598(para)
 msgid "Flag Status"
 msgstr "Marca de estado"
 
-#: C/evolution.xml:2587(para)
+#: C/evolution.xml:2601(para)
 msgid "Size"
 msgstr "Tamaño"
 
-#: C/evolution.xml:2590(para)
+#: C/evolution.xml:2604(para)
 msgid "To"
 msgstr "Para"
 
-#: C/evolution.xml:2593(para)
+#: C/evolution.xml:2607(para)
 msgid "Received"
 msgstr "Recibido"
 
-#: C/evolution.xml:2596(para)
+#: C/evolution.xml:2610(para)
 msgid "Date"
 msgstr "Fecha"
 
-#: C/evolution.xml:2599(para)
+#: C/evolution.xml:2613(para)
 msgid "Subject"
 msgstr "Asunto"
 
-#: C/evolution.xml:2602(para)
+#: C/evolution.xml:2616(para)
 msgid "From"
 msgstr "De"
 
-#: C/evolution.xml:2605(para)
+#: C/evolution.xml:2619(para)
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: C/evolution.xml:2608(para)
+#: C/evolution.xml:2622(para)
 msgid "Score"
 msgstr "Puntuación"
 
-#: C/evolution.xml:2611(para)
+#: C/evolution.xml:2625(para)
 msgid "Flagged"
 msgstr "Marcado"
 
-#: C/evolution.xml:2614(para) C/evolution.xml:3579(para)
-#: C/evolution.xml:4462(para) C/evolution.xml:4813(para)
-#: C/evolution.xml:5008(para)
+#: C/evolution.xml:2628(para) C/evolution.xml:3593(para)
+#: C/evolution.xml:4476(para) C/evolution.xml:4827(para)
+#: C/evolution.xml:5022(para)
 msgid "Status"
 msgstr "Estado"
 
-#: C/evolution.xml:2617(para)
+#: C/evolution.xml:2631(para)
 msgid "Custom"
 msgstr "Personalizado"
 
-#: C/evolution.xml:2621(para)
+#: C/evolution.xml:2635(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
@@ -6574,11 +6545,11 @@ msgstr ""
 "los ordenará descendentemente. La siguiente pulsación hará que se muestren "
 "sin orden."
 
-#: C/evolution.xml:2624(title)
+#: C/evolution.xml:2638(title)
 msgid "Sort Ascending:"
 msgstr "Orden ascendente:"
 
-#: C/evolution.xml:2625(para)
+#: C/evolution.xml:2639(para)
 msgid ""
 "Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
@@ -6586,11 +6557,11 @@ msgstr ""
 "Ordena los mensajes de arriba a abajo y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más viejo a más nuevo."
 
-#: C/evolution.xml:2628(title)
+#: C/evolution.xml:2642(title)
 msgid "Sort Descending:"
 msgstr "Orden descendente:"
 
-#: C/evolution.xml:2629(para)
+#: C/evolution.xml:2643(para)
 msgid ""
 "Sort descending reverts the order and returns you the sorted message list in "
 "the order of newest to oldest."
@@ -6598,11 +6569,11 @@ msgstr ""
 "Ordena los mensajes de forma descendente y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más nuevo a más viejo."
 
-#: C/evolution.xml:2632(title)
+#: C/evolution.xml:2646(title)
 msgid "Unsort:"
 msgstr "Desordenar:"
 
-#: C/evolution.xml:2633(para)
+#: C/evolution.xml:2647(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6610,11 +6581,11 @@ msgstr ""
 "Desordenar elimina la ordenación para esta columna, revirtiendo el orden de "
 "los mensajes según fueron añadidos a la carpeta."
 
-#: C/evolution.xml:2636(title)
+#: C/evolution.xml:2650(title)
 msgid "Removing a Column:"
 msgstr "Eliminar una columna:"
 
-#: C/evolution.xml:2637(para)
+#: C/evolution.xml:2651(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6622,11 +6593,11 @@ msgstr ""
 "Retira la columna de la pantalla. Para retirar columnas, también puede "
 "arrastrar y soltar la cabecera fuera de la lista."
 
-#: C/evolution.xml:2640(title)
+#: C/evolution.xml:2654(title)
 msgid "Adding a Column:"
 msgstr "Añadir una columna:"
 
-#: C/evolution.xml:2641(para)
+#: C/evolution.xml:2655(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6637,11 +6608,11 @@ msgstr ""
 "cabeceras existentes. Una flecha roja le indica el lugar donde quedará la "
 "columna."
 
-#: C/evolution.xml:2644(title)
+#: C/evolution.xml:2658(title)
 msgid "Best Fit:"
 msgstr "Ajuste automático:"
 
-#: C/evolution.xml:2645(para)
+#: C/evolution.xml:2659(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6649,11 +6620,11 @@ msgstr ""
 "Ajusta automáticamente las anchuras de las columnas para un uso más "
 "eficiente del espacio."
 
-#: C/evolution.xml:2648(title)
+#: C/evolution.xml:2662(title)
 msgid "Customizing the Current View:"
 msgstr "Personalizar la vista actual:"
 
-#: C/evolution.xml:2649(para)
+#: C/evolution.xml:2663(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6661,19 +6632,19 @@ msgstr ""
 "Elija este elemento para escoger un orden de los mensajes más complejo o "
 "para elegir qué columnas quiere ver con la información de sus mensajes."
 
-#: C/evolution.xml:2653(para)
+#: C/evolution.xml:2667(para)
 msgid "Select the search criteria from the list."
 msgstr "Seleccione el criterio de búsqueda de la lista."
 
-#: C/evolution.xml:2654(para)
+#: C/evolution.xml:2668(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
-#: C/evolution.xml:2660(title)
+#: C/evolution.xml:2674(title)
 msgid "Using the Follow-Up Feature"
 msgstr "Usar la característica de Marca de seguimiento"
 
-#: C/evolution.xml:2661(para)
+#: C/evolution.xml:2675(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the follow-up "
 "feature."
@@ -6681,45 +6652,45 @@ msgstr ""
 "Para asegurarse de que no se olvida de un mensaje, puede usar la "
 "característica Marca de seguimiento."
 
-#: C/evolution.xml:2664(para)
+#: C/evolution.xml:2678(para)
 msgid "Select one or more messages."
 msgstr "Seleccione uno o más mensajes."
 
-#: C/evolution.xml:2667(para)
+#: C/evolution.xml:2681(para)
 msgid "Right-click one of the messages."
 msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/evolution.xml:2670(para)
+#: C/evolution.xml:2684(para)
 msgid "Click Mark for Follow Up."
 msgstr "Pulse Marca para seguimiento."
 
-#: C/evolution.xml:2673(para)
+#: C/evolution.xml:2687(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "También puede abrir la ventana de Marcar para seguimiento así"
 
-#: C/evolution.xml:2676(para)
+#: C/evolution.xml:2690(para)
 msgid "Selecting the messages."
 msgstr "Seleccione los mensajes."
 
-#: C/evolution.xml:2679(para)
+#: C/evolution.xml:2693(para)
 msgid "Selecting the Message menu."
 msgstr "Seleccione el menú Mensaje."
 
-#: C/evolution.xml:2682(para)
+#: C/evolution.xml:2696(para)
 msgid "Clicking Mark as."
 msgstr "Pulse en Marcar como."
 
-#: C/evolution.xml:2685(para)
+#: C/evolution.xml:2699(para)
 msgid "Selecting Follow Up or pressing Shift+Ctrl+G."
 msgstr "Seleccione Marcar para seguimiento o pulse Mayús+Ctrl+G."
 
-#: C/evolution.xml:2686(para)
+#: C/evolution.xml:2700(para)
 msgid "A window opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Se abrirá una ventana para permitirle establecer el tipo de marca y la fecha "
 "de vencimiento."
 
-#: C/evolution.xml:2690(para)
+#: C/evolution.xml:2704(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward and Reply, but you can enter your "
@@ -6729,7 +6700,7 @@ msgstr ""
 "varias disponibles, como Llamar, Reenviar y Responder, pero puede escribir "
 "la nota o acción que prefiera."
 
-#: C/evolution.xml:2691(para)
+#: C/evolution.xml:2705(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6739,7 +6710,7 @@ msgstr ""
 "eliminar la marca pinchando con el botón derecho sobre el mensaje y "
 "eligiendo Marcar como terminado o Quitar marca."
 
-#: C/evolution.xml:2692(para)
+#: C/evolution.xml:2706(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you "
@@ -6750,7 +6721,7 @@ msgstr ""
 "un mensaje atrasado podrá decirle algo como <quote>Llamar antes del 7 de "
 "abril de 2003 a las 17:00</quote>."
 
-#: C/evolution.xml:2693(para)
+#: C/evolution.xml:2707(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6765,11 +6736,11 @@ msgstr ""
 "quitarles las marcas cuando haya acabado, de manera que la carpeta sólo "
 "contenga mensajes pendientes."
 
-#: C/evolution.xml:2695(title)
+#: C/evolution.xml:2709(title)
 msgid "Mark as Important Feature:"
 msgstr "Característica Marcar como importante:"
 
-#: C/evolution.xml:2696(para)
+#: C/evolution.xml:2710(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
@@ -6780,7 +6751,7 @@ msgstr ""
 "sobre el mensaje y después pulsando Marcar como importante o seleccionar "
 "Mensaje &gt; Marcar como &gt; Importante desde la barra de menú."
 
-#: C/evolution.xml:2703(para)
+#: C/evolution.xml:2717(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6793,7 +6764,7 @@ msgstr ""
 "desee. Cree nuevas carpetas pulsaando Carpeta &gt; Nueva, o pulsando con el "
 "botón derecho sobre la lista y seleccionando Carpeta nueva."
 
-#: C/evolution.xml:2704(para)
+#: C/evolution.xml:2718(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
 "move the messages to it by dragging and dropping them, or right click on the "
@@ -6804,7 +6775,7 @@ msgstr ""
 "o pulsando con el botón derecho del ratón y eligiendo Mover a la carpeta o "
 "pulsando Mayús+Ctrl+V."
 
-#: C/evolution.xml:2705(para)
+#: C/evolution.xml:2719(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
 "&gt; Move to folder. This will open the Select folder window, where you can "
@@ -6815,7 +6786,7 @@ msgstr ""
 "abrirá la ventana Seleccionar carpeta, donde podrá soltar su mensaje en "
 "cualquiera de las carpetas listadas."
 
-#: C/evolution.xml:2707(para)
+#: C/evolution.xml:2721(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder in the entry "
@@ -6829,7 +6800,7 @@ msgstr ""
 "puede mover los mensajes desde una carpeta a otra seleccionando el mensaje y "
 "pulsando la solapa Mover en la parte inferior derecha."
 
-#: C/evolution.xml:2708(para)
+#: C/evolution.xml:2722(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
 "automatically. Select Edit &gt; Message Filters to bring up the Message "
@@ -6839,7 +6810,7 @@ msgstr ""
 "automáticamente. Para ello seleccione Editar &gt; Filtros de mensajes para "
 "que aparezca la ventana Filtros de mensajes."
 
-#: C/evolution.xml:2710(para)
+#: C/evolution.xml:2724(para)
 msgid ""
 "Click on the Add button to bring up the Add Rule window from where you can "
 "set different criteria for filtering messages. For additional information on "
@@ -6851,7 +6822,7 @@ msgstr ""
 "obtener más información consulte <link linkend=\"usage-mail-org-filters-new"
 "\">Crear de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:2712(para)
+#: C/evolution.xml:2726(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6867,7 +6838,7 @@ msgstr ""
 "subcarpetas en el buzón de entrada, dejará de poder leer mensajes que "
 "existen en esta carpeta, hasta que las mueva hacia otro lugar."
 
-#: C/evolution.xml:2718(para)
+#: C/evolution.xml:2732(para)
 msgid ""
 "Most email clients can search for messages for you, but Evolution does it "
 "differently and efficiently giving you faster search results with quick "
@@ -6878,13 +6849,13 @@ msgstr ""
 "una búsqueda más rápida con la búsqueda rápida, búsqueda personalizada y "
 "búsqueda avanzada."
 
-#: C/evolution.xml:2720(title) C/evolution.xml:3519(title)
-#: C/evolution.xml:4394(title) C/evolution.xml:4702(title)
-#: C/evolution.xml:4946(title)
+#: C/evolution.xml:2734(title) C/evolution.xml:3533(title)
+#: C/evolution.xml:4408(title) C/evolution.xml:4716(title)
+#: C/evolution.xml:4960(title)
 msgid "Quick Search:"
 msgstr "Búsqueda rápida:"
 
-#: C/evolution.xml:2721(para)
+#: C/evolution.xml:2735(para)
 msgid ""
 "Quick Search displays all the messages that match the built-in criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6894,14 +6865,14 @@ msgstr ""
 "criterios integrados que ha seleccionado de la lista desplegable en la parte "
 "superior izquierda, justo encima de la lista de mensajes."
 
-#: C/evolution.xml:2723(para)
+#: C/evolution.xml:2737(para)
 msgid "To perform a quick search:"
 msgstr "Para realizar una búsqueda rápida:"
 
-#: C/evolution.xml:2726(para) C/evolution.xml:2805(para)
-#: C/evolution.xml:3482(para) C/evolution.xml:3525(para)
-#: C/evolution.xml:4346(para) C/evolution.xml:4662(para)
-#: C/evolution.xml:4898(para)
+#: C/evolution.xml:2740(para) C/evolution.xml:2819(para)
+#: C/evolution.xml:3496(para) C/evolution.xml:3539(para)
+#: C/evolution.xml:4360(para) C/evolution.xml:4676(para)
+#: C/evolution.xml:4912(para)
 msgid ""
 "Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> to expand the drop-down list."
@@ -6909,72 +6880,72 @@ msgstr ""
 "Pulse el botón de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> para expandir la dista desplegable."
 
-#: C/evolution.xml:2729(para) C/evolution.xml:3528(para)
-#: C/evolution.xml:4402(para) C/evolution.xml:4744(para)
-#: C/evolution.xml:4954(para)
+#: C/evolution.xml:2743(para) C/evolution.xml:3542(para)
+#: C/evolution.xml:4416(para) C/evolution.xml:4758(para)
+#: C/evolution.xml:4968(para)
 msgid "Select the search criteria from the list:"
 msgstr "Seleccione el criterio de búsqueda de la lista:"
 
-#: C/evolution.xml:2732(para)
+#: C/evolution.xml:2746(para)
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: C/evolution.xml:2735(para)
+#: C/evolution.xml:2749(para)
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: C/evolution.xml:2738(para)
+#: C/evolution.xml:2752(para)
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: C/evolution.xml:2741(para) C/evolution.xml:2783(para)
+#: C/evolution.xml:2755(para) C/evolution.xml:2797(para)
 msgid "Important"
 msgstr "Importante"
 
-#: C/evolution.xml:2744(para) C/evolution.xml:2786(para)
+#: C/evolution.xml:2758(para) C/evolution.xml:2800(para)
 msgid "Work"
 msgstr "Trabajo"
 
-#: C/evolution.xml:2747(para) C/evolution.xml:2789(para)
-#: C/evolution.xml:3573(para) C/evolution.xml:4456(para)
-#: C/evolution.xml:4807(para) C/evolution.xml:5002(para)
-#: C/evolution.xml:5572(para)
+#: C/evolution.xml:2761(para) C/evolution.xml:2803(para)
+#: C/evolution.xml:3587(para) C/evolution.xml:4470(para)
+#: C/evolution.xml:4821(para) C/evolution.xml:5016(para)
+#: C/evolution.xml:5584(para)
 msgid "Personal"
 msgstr "Personal"
 
-#: C/evolution.xml:2750(para) C/evolution.xml:2792(para)
+#: C/evolution.xml:2764(para) C/evolution.xml:2806(para)
 msgid "To do"
 msgstr "Por hacer"
 
-#: C/evolution.xml:2753(para) C/evolution.xml:2795(para)
+#: C/evolution.xml:2767(para) C/evolution.xml:2809(para)
 msgid "Later"
 msgstr "Después"
 
-#: C/evolution.xml:2756(para)
+#: C/evolution.xml:2770(para)
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: C/evolution.xml:2759(para)
+#: C/evolution.xml:2773(para)
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: C/evolution.xml:2762(para)
+#: C/evolution.xml:2776(para)
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: C/evolution.xml:2765(para)
+#: C/evolution.xml:2779(para)
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: C/evolution.xml:2768(para)
+#: C/evolution.xml:2782(para)
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: C/evolution.xml:2771(para)
+#: C/evolution.xml:2785(para)
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son spam"
 
-#: C/evolution.xml:2776(para)
+#: C/evolution.xml:2790(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6982,7 +6953,7 @@ msgstr ""
 "Evolution muestra los mensajes que coincidan con los criterios presentes en "
 "la lista de mensajes mostrada."
 
-#: C/evolution.xml:2780(para)
+#: C/evolution.xml:2794(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
 "listed here. You can change the name of these labels by selecting Edit &gt; "
@@ -6993,24 +6964,24 @@ msgstr ""
 "etiquetas seleccionando Editar &gt; Preferencias &gt; Preferencias del "
 "correo &gt; Colores."
 
-#: C/evolution.xml:2800(title) C/evolution.xml:3477(title)
-#: C/evolution.xml:4341(title) C/evolution.xml:4657(title)
-#: C/evolution.xml:4893(title)
+#: C/evolution.xml:2814(title) C/evolution.xml:3491(title)
+#: C/evolution.xml:4355(title) C/evolution.xml:4671(title)
+#: C/evolution.xml:4907(title)
 msgid "Customized Search:"
 msgstr "Búsqueda personalizada:"
 
-#: C/evolution.xml:2801(para)
+#: C/evolution.xml:2815(para)
 msgid ""
 "Evolution allows you to perform customized search. To search for a message:"
 msgstr ""
 "Evolution le permite realizar búsquedas personalizadas. Para buscar un "
 "mensaje:"
 
-#: C/evolution.xml:2807(title)
+#: C/evolution.xml:2821(title)
 msgid "Subject or Sender Contain:"
 msgstr "El asunto o remitente contiene:"
 
-#: C/evolution.xml:2808(para)
+#: C/evolution.xml:2822(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -7018,78 +6989,78 @@ msgstr ""
 "Busca mensajes que contiene el texto buscado en el asunto o remitente. No "
 "busca en el cuerpo del mensaje."
 
-#: C/evolution.xml:2811(title)
+#: C/evolution.xml:2825(title)
 msgid "Recipients Contain:"
 msgstr "El destinatario contiene:"
 
-#: C/evolution.xml:2812(para)
+#: C/evolution.xml:2826(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr "Busca mensajes con el texto buscado en las cabeceras Para: y Cc:."
 
-#: C/evolution.xml:2815(title)
+#: C/evolution.xml:2829(title)
 msgid "Message Contains:"
 msgstr "El mensaje contiene:"
 
-#: C/evolution.xml:2816(para)
+#: C/evolution.xml:2830(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr ""
 "Busca el texto especificado en el cuerpo del mensaje y en todas las "
 "cabeceras."
 
-#: C/evolution.xml:2819(title)
+#: C/evolution.xml:2833(title)
 msgid "Subject Contain:"
 msgstr "El asunto contiene:"
 
-#: C/evolution.xml:2820(para)
+#: C/evolution.xml:2834(para)
 msgid "Shows messages where the search text is in the subject line."
 msgstr ""
 "Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
 
-#: C/evolution.xml:2823(title)
+#: C/evolution.xml:2837(title)
 msgid "Sender Contain:"
 msgstr "El remitente contiene:"
 
-#: C/evolution.xml:2824(para)
+#: C/evolution.xml:2838(para)
 msgid ""
 "Finds messages whose From: header contains a match for your search text."
 msgstr ""
 "Busca mensajes cuya cabecera De: contiene coincidencias con el texto que ha "
 "introducido."
 
-#: C/evolution.xml:2827(title)
+#: C/evolution.xml:2841(title)
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2828(para)
+#: C/evolution.xml:2842(para)
 msgid "Searches only in message text, not any other header."
 msgstr "Busca sólo en el cuerpo del mensaje, no en ninguna otra cabecera."
 
-#: C/evolution.xml:2832(para)
+#: C/evolution.xml:2846(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Pulse sobre la lista desplegable para seleccionar el rango"
 
-#: C/evolution.xml:2835(para)
+#: C/evolution.xml:2849(para)
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: C/evolution.xml:2838(para)
+#: C/evolution.xml:2852(para)
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: C/evolution.xml:2841(para)
+#: C/evolution.xml:2855(para)
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: C/evolution.xml:2844(para)
+#: C/evolution.xml:2858(para)
 msgid "Current Message"
 msgstr "Mensaje actual"
 
-#: C/evolution.xml:2849(para)
+#: C/evolution.xml:2863(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
 
-#: C/evolution.xml:2851(para)
+#: C/evolution.xml:2865(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -7097,7 +7068,7 @@ msgstr ""
 "Se deshabilitará la lista de carpetas mientras realiza una búsqueda en Todas "
 "las cuentas o en la Cuenta actual."
 
-#: C/evolution.xml:2855(para)
+#: C/evolution.xml:2869(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -7108,7 +7079,7 @@ msgstr ""
 "la <link linkend=\"usage-mail-organize-vfolders\">Uso de las carpetas de "
 "búsqueda</link>."
 
-#: C/evolution.xml:2857(para) C/evolution.xml:3517(para)
+#: C/evolution.xml:2871(para) C/evolution.xml:3531(para)
 msgid ""
 "To clear your search you can click the Clear icon in the search string "
 "field, or choose Search &gt; Clear from the menubar, or enter a blank "
@@ -7119,7 +7090,7 @@ msgstr ""
 "introducir una búsqueda vacía. También puede pulsar Mayús+Ctrl+Q para "
 "limpiar la búsqueda."
 
-#: C/evolution.xml:2860(para)
+#: C/evolution.xml:2874(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -7128,32 +7099,32 @@ msgstr ""
 "personalizada ya que sólo filtra y muestra los mensajes en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2863(title) C/evolution.xml:4367(title)
-#: C/evolution.xml:4683(title) C/evolution.xml:4919(title)
+#: C/evolution.xml:2877(title) C/evolution.xml:4381(title)
+#: C/evolution.xml:4697(title) C/evolution.xml:4933(title)
 msgid "Advanced Search:"
 msgstr "Búsqueda avanzada:"
 
-#: C/evolution.xml:2864(para) C/evolution.xml:4368(para)
-#: C/evolution.xml:4684(para) C/evolution.xml:4920(para)
+#: C/evolution.xml:2878(para) C/evolution.xml:4382(para)
+#: C/evolution.xml:4698(para) C/evolution.xml:4934(para)
 msgid "You can perform an advanced search based on any of the search types."
 msgstr ""
 "Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
 "búsqueda."
 
-#: C/evolution.xml:2868(para) C/evolution.xml:4372(para)
-#: C/evolution.xml:4688(para)
+#: C/evolution.xml:2882(para) C/evolution.xml:4386(para)
+#: C/evolution.xml:4702(para)
 msgid "Select the Search menu."
 msgstr "Seleccione el menú Buscar."
 
-#: C/evolution.xml:2871(para)
+#: C/evolution.xml:2885(para)
 msgid "Click Advanced Search to open the Advanced Search window."
 msgstr "Pulse Búsqueda avanzada para abrir la ventana Búsqueda avanzada."
 
-#: C/evolution.xml:2876(para)
+#: C/evolution.xml:2890(para)
 msgid "Enter the Search name."
 msgstr "Introduzca el nombre de la búsqueda."
 
-#: C/evolution.xml:2879(para)
+#: C/evolution.xml:2893(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -7163,16 +7134,16 @@ msgstr ""
 "acerca de las reglas, vea el <link linkend=\"bsazsjd\">Paso 4</link> bajo "
 "<link linkend=\"vfolder-create\">Crear una carpeta de búsqueda</link>."
 
-#: C/evolution.xml:2885(para) C/evolution.xml:4390(para)
-#: C/evolution.xml:4942(para)
+#: C/evolution.xml:2899(para) C/evolution.xml:4404(para)
+#: C/evolution.xml:4956(para)
 msgid "Click Save to save your search results."
 msgstr "Pulse Guardar para guardar los resultados."
 
-#: C/evolution.xml:2889(title)
+#: C/evolution.xml:2903(title)
 msgid "Save Search:"
 msgstr "Guardar búsqueda:"
 
-#: C/evolution.xml:2890(para)
+#: C/evolution.xml:2904(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -7182,27 +7153,27 @@ msgstr ""
 "seleccione Buscar &gt; Guardar búsqueda. Puede ver la etiqueta de los "
 "resultados de su búsqueda listada bajo el menú Buscar."
 
-#: C/evolution.xml:2893(title)
+#: C/evolution.xml:2907(title)
 msgid "Edit Saved Searches:"
 msgstr "Editar búsquedas guardadas:"
 
-#: C/evolution.xml:2894(para)
+#: C/evolution.xml:2908(para)
 msgid "To edit your saved searches,"
 msgstr "Editar sus búsquedas guardadas,"
 
-#: C/evolution.xml:2898(para)
+#: C/evolution.xml:2912(para)
 msgid "Select Search from the menu bar."
 msgstr "Seleccione Buscar en la barra de menú."
 
-#: C/evolution.xml:2901(para)
+#: C/evolution.xml:2915(para)
 msgid "Click Edit Saved Searches to open the Searches window."
 msgstr "Pulse Editar búsquedas guardadas para abrir la ventana Búsquedas."
 
-#: C/evolution.xml:2906(para)
+#: C/evolution.xml:2920(para)
 msgid "Click the Edit button to open the Edit Rule window."
 msgstr "Pulse el botón Editar para abrir la ventana Editar regla."
 
-#: C/evolution.xml:2907(para)
+#: C/evolution.xml:2921(para)
 msgid ""
 "You can also add or remove searches from the list by using the respective "
 "buttons available at the right."
@@ -7210,11 +7181,11 @@ msgstr ""
 "También puede añadir o quitar búsquedas de la lista usando los respectivos "
 "botones disponibles a la derecha."
 
-#: C/evolution.xml:2912(para)
+#: C/evolution.xml:2926(para)
 msgid "Edit the title or search criteria from the dialog box."
 msgstr "Edite el título o el criterio de búsqueda desde el cuadro de diálogo."
 
-#: C/evolution.xml:2922(para)
+#: C/evolution.xml:2936(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -7231,29 +7202,29 @@ msgstr ""
 "copias de un mismo mensaje en múltiples carpetas; pueden también conservar o "
 "incluso mandar una copia a otra persona."
 
-#: C/evolution.xml:2925(title)
+#: C/evolution.xml:2939(title)
 msgid "Creating New Filter Rules"
 msgstr "Crear reglas de filtros nuevas"
 
-#: C/evolution.xml:2928(para) C/evolution.xml:3132(para)
-#: C/evolution.xml:3147(para)
+#: C/evolution.xml:2942(para) C/evolution.xml:3146(para)
+#: C/evolution.xml:3161(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Pulse Editar &gt; Filtros de mensajes."
 
-#: C/evolution.xml:2931(para) C/evolution.xml:3182(para)
-#: C/evolution.xml:5235(para) C/evolution.xml:5816(para)
+#: C/evolution.xml:2945(para) C/evolution.xml:3196(para)
+#: C/evolution.xml:5249(para) C/evolution.xml:5828(para)
 msgid "Click Add."
 msgstr "Pulse Añadir."
 
-#: C/evolution.xml:2934(para)
+#: C/evolution.xml:2948(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Escriba un nombre para el filtro en el campo de nombre de la regla."
 
-#: C/evolution.xml:2939(para)
+#: C/evolution.xml:2953(para)
 msgid "Define the criteria for the filter in the first section."
 msgstr "Defina el criterio para el filtro en la primera sección."
 
-#: C/evolution.xml:2940(para)
+#: C/evolution.xml:2954(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -7261,42 +7232,42 @@ msgstr ""
 "Para cada criterio de filtrado, debe seleccionar en primer lugar qué partes "
 "de los mensajes quiere filtrar:"
 
-#: C/evolution.xml:2942(title) C/evolution.xml:3192(title)
+#: C/evolution.xml:2956(title) C/evolution.xml:3206(title)
 msgid "Sender:"
 msgstr "Remitente:"
 
-#: C/evolution.xml:2943(para)
+#: C/evolution.xml:2957(para)
 msgid "The sender's email address or the name of the sender."
 msgstr ""
 "La dirección de correo electrónico del remitente o el nombre del remitente."
 
-#: C/evolution.xml:2946(title)
+#: C/evolution.xml:2960(title)
 msgid "Recipient:"
 msgstr "Destinatario:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2947(para) C/evolution.xml:3197(para)
+#: C/evolution.xml:2961(para) C/evolution.xml:3211(para)
 msgid "The recipients of the message."
 msgstr "Los destinatarios del mensaje."
 
-#: C/evolution.xml:2950(title) C/evolution.xml:3200(title)
+#: C/evolution.xml:2964(title) C/evolution.xml:3214(title)
 msgid "Subject:"
 msgstr "Asunto:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2951(para) C/evolution.xml:3201(para)
+#: C/evolution.xml:2965(para) C/evolution.xml:3215(para)
 msgid "The subject line of the message."
 msgstr "La línea asunto del mensaje."
 
-#: C/evolution.xml:2954(title)
+#: C/evolution.xml:2968(title)
 msgid "Specific Header:"
 msgstr "Cabecera específica:"
 
-#: C/evolution.xml:2955(para)
+#: C/evolution.xml:2969(para)
 msgid "Any header including custom ones."
 msgstr "Cualquier cabecera, incluyendo las personalizadas."
 
-#: C/evolution.xml:2957(para)
+#: C/evolution.xml:2971(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -7314,20 +7285,20 @@ msgstr ""
 "si la segunda declaración no apareciera. Para filtrar mensajes que utilizan "
 "varias cabeceras varias veces, utilice una expresión regular."
 
-#: C/evolution.xml:2959(title) C/evolution.xml:3204(title)
+#: C/evolution.xml:2973(title) C/evolution.xml:3218(title)
 msgid "Message Body:"
 msgstr "Cuerpo del mensaje:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2960(para) C/evolution.xml:3205(para)
+#: C/evolution.xml:2974(para) C/evolution.xml:3219(para)
 msgid "Searches in the actual text of the message."
 msgstr "Busca en el texto efectivo del mensaje."
 
-#: C/evolution.xml:2963(title)
+#: C/evolution.xml:2977(title)
 msgid "Expression:"
 msgstr "Expresión:"
 
-#: C/evolution.xml:2964(para)
+#: C/evolution.xml:2978(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
 "in the Scheme language used to define filters in Evolution."
@@ -7335,11 +7306,11 @@ msgstr ""
 "(Sólo para programadores) busca un mensaje que corresponda a una expresión "
 "escrita en lenguaje Scheme, usado para definir filtros en Evolution."
 
-#: C/evolution.xml:2967(title) C/evolution.xml:3212(title)
+#: C/evolution.xml:2981(title) C/evolution.xml:3226(title)
 msgid "Date Sent:"
 msgstr "Fecha de envío:"
 
-#: C/evolution.xml:2968(para) C/evolution.xml:3213(para)
+#: C/evolution.xml:2982(para) C/evolution.xml:3227(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -7357,12 +7328,12 @@ msgstr ""
 "en el calendario. Es posible incluso buscar mensajes dentro de un intervalo "
 "de tiempo relativo, por ejemplo, buscar mensajes en los últimos cuatro días."
 
-#: C/evolution.xml:2971(title) C/evolution.xml:3216(title)
+#: C/evolution.xml:2985(title) C/evolution.xml:3230(title)
 msgid "Date Received:"
 msgstr "Fecha de recepción:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2972(para) C/evolution.xml:3217(para)
+#: C/evolution.xml:2986(para) C/evolution.xml:3231(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -7370,11 +7341,11 @@ msgstr ""
 "Funciona del mismo modo que la opción Fecha de envío, excepto que compara la "
 "fecha y hora de recepción del mensaje con las fechas especificadas."
 
-#: C/evolution.xml:2975(title) C/evolution.xml:3220(title)
+#: C/evolution.xml:2989(title) C/evolution.xml:3234(title)
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: C/evolution.xml:2976(para) C/evolution.xml:3221(para)
+#: C/evolution.xml:2990(para) C/evolution.xml:3235(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
 "can set labels with other filters or manually."
@@ -7383,11 +7354,11 @@ msgstr ""
 "Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
 "o manualmente."
 
-#: C/evolution.xml:2979(title) C/evolution.xml:3224(title)
+#: C/evolution.xml:2993(title) C/evolution.xml:3238(title)
 msgid "Score:"
 msgstr "Puntuación:"
 
-#: C/evolution.xml:2980(para) C/evolution.xml:3225(para)
+#: C/evolution.xml:2994(para) C/evolution.xml:3239(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -7402,20 +7373,20 @@ msgstr ""
 "simplemente un número que puede asignar a mensajes para que otros filtros "
 "puedan procesarlos."
 
-#: C/evolution.xml:2983(title) C/evolution.xml:3228(title)
+#: C/evolution.xml:2997(title) C/evolution.xml:3242(title)
 msgid "Size:"
 msgstr "Tamaño:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2984(para) C/evolution.xml:3229(para)
+#: C/evolution.xml:2998(para) C/evolution.xml:3243(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Ordenación basada en el tamaño del mensaje, en kilobytes."
 
-#: C/evolution.xml:2987(title) C/evolution.xml:3232(title)
+#: C/evolution.xml:3001(title) C/evolution.xml:3246(title)
 msgid "Status:"
 msgstr "Estado:"
 
-#: C/evolution.xml:2988(para) C/evolution.xml:3233(para)
+#: C/evolution.xml:3002(para) C/evolution.xml:3247(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -7423,27 +7394,27 @@ msgstr ""
 "Filtros de acuerdo al estado de un mensaje. El estado puede ser Respoder a, "
 "Borrador, Importante, Leído o SPAM."
 
-#: C/evolution.xml:2991(title)
+#: C/evolution.xml:3005(title)
 msgid "Flagged:"
 msgstr "Marcado:"
 
-#: C/evolution.xml:2992(para) C/evolution.xml:3237(para)
+#: C/evolution.xml:3006(para) C/evolution.xml:3251(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Comprueba si el mensaje está marcado para seguimiento."
 
-#: C/evolution.xml:2995(title) C/evolution.xml:3240(title)
+#: C/evolution.xml:3009(title) C/evolution.xml:3254(title)
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: C/evolution.xml:2996(para) C/evolution.xml:3241(para)
+#: C/evolution.xml:3010(para) C/evolution.xml:3255(para)
 msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crea un filtro en función de si el correo-e contiene un adjunto."
 
-#: C/evolution.xml:2999(title)
+#: C/evolution.xml:3013(title)
 msgid "Mailing List"
 msgstr "Lista de correo"
 
-#: C/evolution.xml:3000(para) C/evolution.xml:3245(para)
+#: C/evolution.xml:3014(para) C/evolution.xml:3259(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -7457,11 +7428,11 @@ msgstr ""
 "redistribuciones de correo. El correo proveniente de  servidores de listas "
 "que no establezca adecuadamente la cabecera X-BeenThere no será filtrado."
 
-#: C/evolution.xml:3003(title)
+#: C/evolution.xml:3017(title)
 msgid "Regex Match:"
 msgstr "Coincide con la expresión regular:"
 
-#: C/evolution.xml:3004(para)
+#: C/evolution.xml:3018(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -7479,11 +7450,11 @@ msgstr ""
 "cómo usar las expresiones regulares examine la página del manual del comando "
 "grep."
 
-#: C/evolution.xml:3007(title)
+#: C/evolution.xml:3021(title)
 msgid "Source Account:"
 msgstr "Cuenta de origen:"
 
-#: C/evolution.xml:3008(para)
+#: C/evolution.xml:3022(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -7491,11 +7462,11 @@ msgstr ""
 "Filtros de mensajes de acuerdo con el servidor de las que las recibió. Esto "
 "es útil cuando tiene múltiples cuentas de correo POP."
 
-#: C/evolution.xml:3011(title) C/evolution.xml:3095(title)
+#: C/evolution.xml:3025(title) C/evolution.xml:3109(title)
 msgid "Pipe to Program:"
 msgstr "Encauzar al programa:"
 
-#: C/evolution.xml:3012(para)
+#: C/evolution.xml:3026(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -7506,51 +7477,51 @@ msgstr ""
 "deben devolver un entero. Generalmente esto se suele usar para añadir un "
 "filtro de correo spam."
 
-#: C/evolution.xml:3015(title)
+#: C/evolution.xml:3029(title)
 msgid "Junk Test:"
 msgstr "Detección de spam:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:3016(para)
+#: C/evolution.xml:3030(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtros basados en los resultados de las pruebas de spam."
 
-#: C/evolution.xml:3019(title)
+#: C/evolution.xml:3033(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Seleccione el Criterio para la Condición:"
 
-#: C/evolution.xml:3020(para)
+#: C/evolution.xml:3034(para)
 msgid ""
 "If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Si quiere utilizar múltiples criterios para este filtro, pulse Añadir y "
 "repita el paso 4."
 
-#: C/evolution.xml:3023(title)
+#: C/evolution.xml:3037(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
-#: C/evolution.xml:3024(para)
+#: C/evolution.xml:3038(para)
 msgid "Select any of the following options."
 msgstr "Seleccione cualquiera de la siguientes opciones."
 
-#: C/evolution.xml:3029(title)
+#: C/evolution.xml:3043(title)
 msgid "Move to Folder:"
 msgstr "Mover a la carpeta:"
 
-#: C/evolution.xml:3030(para)
+#: C/evolution.xml:3044(para)
 msgid "Moves the message into a folder you specify."
 msgstr "Mueve el mensaje dentro de la carpeta que especifique."
 
-#: C/evolution.xml:3035(title)
+#: C/evolution.xml:3049(title)
 msgid "Copy to Folder:"
 msgstr "Copar a la carpeta:"
 
-#: C/evolution.xml:3036(para)
+#: C/evolution.xml:3050(para)
 msgid "Puts a copy of the message into a folder you specify."
 msgstr "Pone una copia del mensaje en la carpeta que especifique."
 
-#: C/evolution.xml:3042(para)
+#: C/evolution.xml:3056(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7558,11 +7529,11 @@ msgstr ""
 "Marca el mensaje para borrarlo. Sigue siendo posible recuperar el mensaje de "
 "nuevo, al menos hasta que seleccione Purgar el correo."
 
-#: C/evolution.xml:3047(title)
+#: C/evolution.xml:3061(title)
 msgid "Stop Processing:"
 msgstr "Parar de procesar:"
 
-#: C/evolution.xml:3048(para)
+#: C/evolution.xml:3062(para)
 msgid ""
 "Select this if you want to all other filters ignore this message. Note that "
 "only filters listed after this particular rule will be ignored."
@@ -7571,35 +7542,35 @@ msgstr ""
 "mensaje. Note que sólo los filtros listados después de esta regla en "
 "particular, se ignorarán."
 
-#: C/evolution.xml:3053(title)
+#: C/evolution.xml:3067(title)
 msgid "Assign Color:"
 msgstr "Asignar color:"
 
-#: C/evolution.xml:3054(para)
+#: C/evolution.xml:3068(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marca el mensaje con un color de su elección."
 
-#: C/evolution.xml:3059(title)
+#: C/evolution.xml:3073(title)
 msgid "Assign Score:"
 msgstr "Asignar puntuación:"
 
-#: C/evolution.xml:3060(para)
+#: C/evolution.xml:3074(para)
 msgid "Assigns the message a numeric score."
 msgstr "Asigna al mensaje una puntuación numérica."
 
-#: C/evolution.xml:3065(title)
+#: C/evolution.xml:3079(title)
 msgid "Adjust Score:"
 msgstr "Ajustar puntuación:"
 
-#: C/evolution.xml:3066(para)
+#: C/evolution.xml:3080(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Cambia la puntuación numérica por la cantidad que establezca."
 
-#: C/evolution.xml:3071(title)
+#: C/evolution.xml:3085(title)
 msgid "Set Status:"
 msgstr "Poner estado:"
 
-#: C/evolution.xml:3072(para)
+#: C/evolution.xml:3086(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7607,11 +7578,11 @@ msgstr ""
 "Establece el estado del mensaje. El estado puede ser Respondió a, Borrador, "
 "Importante, Leído, o SPAM."
 
-#: C/evolution.xml:3077(title)
+#: C/evolution.xml:3091(title)
 msgid "Unset Status:"
 msgstr "Quitar estado:"
 
-#: C/evolution.xml:3078(para)
+#: C/evolution.xml:3092(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7619,19 +7590,19 @@ msgstr ""
 "Si el mensaje tiene un estado, lo elimina. Si no tiene establecido un "
 "estado, no hace nada."
 
-#: C/evolution.xml:3084(para)
+#: C/evolution.xml:3098(para)
 msgid "Makes the system beep."
 msgstr "Hace que el sistema pite."
 
-#: C/evolution.xml:3089(title)
+#: C/evolution.xml:3103(title)
 msgid "Play Sound:"
 msgstr "Reproducir un sonido:"
 
-#: C/evolution.xml:3090(para)
+#: C/evolution.xml:3104(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Seleccione un archivo de sonido para que Evolution lo reproduzca."
 
-#: C/evolution.xml:3096(para)
+#: C/evolution.xml:3110(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
 "This feature can be used to create automatic Web postings from email "
@@ -7643,36 +7614,36 @@ msgstr ""
 "desde mensajes de correo o para realizar procesados posteriores adicionales "
 "que no estén soportados por Evolution."
 
-#: C/evolution.xml:3101(title)
+#: C/evolution.xml:3115(title)
 msgid "Run Program:"
 msgstr "Ejecutar programa:"
 
-#: C/evolution.xml:3102(para)
+#: C/evolution.xml:3116(para)
 msgid "Evolution runs an application."
 msgstr "Evolution ejecutar una aplicación."
 
-#: C/evolution.xml:3108(para)
+#: C/evolution.xml:3122(para)
 msgid "Click Add if you need multiple actions and click OK."
 msgstr ""
 "Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
 
-#: C/evolution.xml:3114(para)
+#: C/evolution.xml:3128(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Existe un atajo sencillo para los filtros rápidos o creación de carpetas de "
 "búsqueda:"
 
-#: C/evolution.xml:3117(para)
+#: C/evolution.xml:3131(para)
 msgid "Right-click the message in the message list."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
 "mensajes."
 
-#: C/evolution.xml:3120(para)
+#: C/evolution.xml:3134(para)
 msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Seleccione uno de los elementos bajo Crear regla del submenú Mensaje."
 
-#: C/evolution.xml:3121(para)
+#: C/evolution.xml:3135(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7680,7 +7651,7 @@ msgstr ""
 "Crear una regla basada en un mensaje abre la herramienta de creación de "
 "filtros con alguna de la información acerca del mensaje ya introducida."
 
-#: C/evolution.xml:3124(para)
+#: C/evolution.xml:3138(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7692,7 +7663,7 @@ msgstr ""
 "usa esta acción en un filtro, el mensaje afectado no volverá a ser procesado "
 "por ningún otro filtro."
 
-#: C/evolution.xml:3125(para)
+#: C/evolution.xml:3139(para)
 msgid ""
 "When you first open the Filters window, you are shown the list of filters "
 "sorted in the order in which they will be applied. You can move them up and "
@@ -7702,27 +7673,27 @@ msgstr ""
 "por el orden de aplicación de los mismos. Puede moverlos arriba y abajo, "
 "modificando así su prioridad pulsando los botones Arriba y Abajo."
 
-#: C/evolution.xml:3129(title)
+#: C/evolution.xml:3143(title)
 msgid "Editing Filters"
 msgstr "Editar de filtros"
 
-#: C/evolution.xml:3135(para)
+#: C/evolution.xml:3149(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Seleccione el filtro a editar, después puse Editar."
 
-#: C/evolution.xml:3138(para)
+#: C/evolution.xml:3152(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr "Haga las correcciones que desee, después pulse Aceptar dos veces."
 
-#: C/evolution.xml:3144(title)
+#: C/evolution.xml:3158(title)
 msgid "Deleting Filters"
 msgstr "Borrar filtros"
 
-#: C/evolution.xml:3150(para)
+#: C/evolution.xml:3164(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Seleccione el filtro a eliminar, después pulse Quitar."
 
-#: C/evolution.xml:3161(para)
+#: C/evolution.xml:3175(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
@@ -7737,7 +7708,7 @@ msgstr ""
 "cantidad de correo u olvida con frecuencia dónde pone sus mensajes, entonces "
 "las carpetas de búsqueda le ayudarán a mantener las cosas organizadas."
 
-#: C/evolution.xml:3162(para)
+#: C/evolution.xml:3176(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7754,7 +7725,7 @@ msgstr ""
 "diferentes. Los mensajes incluidos son identificados al vuelo mediante un "
 "conjunto de criterios elegidos de antemano."
 
-#: C/evolution.xml:3163(para)
+#: C/evolution.xml:3177(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7767,7 +7738,7 @@ msgstr ""
 "donde existe realmente, así como de cualquier carpeta de búsqueda con la que "
 "es posible consultarlo."
 
-#: C/evolution.xml:3164(para)
+#: C/evolution.xml:3178(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7776,7 +7747,7 @@ msgstr ""
 "carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
 "criterios satisfechos por las demás carpetas de búsqueda."
 
-#: C/evolution.xml:3165(para)
+#: C/evolution.xml:3179(para)
 msgid ""
 "If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
@@ -7790,7 +7761,7 @@ msgstr ""
 "carpeta de búsqueda que busque en almacenes de correo remotos, la carpeta de "
 "búsqueda No coincidente tampoco los buscará."
 
-#: C/evolution.xml:3166(para)
+#: C/evolution.xml:3180(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
 "following: To organize his mailbox, Jim sets up a search folder for email "
@@ -7816,11 +7787,11 @@ msgstr ""
 "búsqueda <quote>Ana</quote> como también en la carpeta de búsqueda "
 "<quote>Debate interno acerca de Evolution</quote>."
 
-#: C/evolution.xml:3169(title)
+#: C/evolution.xml:3183(title)
 msgid "Creating A Search Folder"
 msgstr "Crear una carpeta de búsqueda"
 
-#: C/evolution.xml:3172(para)
+#: C/evolution.xml:3186(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7828,12 +7799,12 @@ msgstr ""
 "Pulse Mensaje &gt; Crear regla, después seleccione una carpeta de búsqueda "
 "basada en el Asunto, Remitente, Destinatario o Lista de correo."
 
-#: C/evolution.xml:3174(para)
+#: C/evolution.xml:3188(para)
 msgid "Select Search &gt; Create Search Folder From Search."
 msgstr ""
 "Seleccione Buscar &gt; Crear una carpeta de búsqueda desde la búsqueda."
 
-#: C/evolution.xml:3176(para)
+#: C/evolution.xml:3190(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7842,17 +7813,17 @@ msgstr ""
 "búsqueda desde la búsqueda está activado sólo si ya ha realizado una "
 "búsqueda."
 
-#: C/evolution.xml:3179(para)
+#: C/evolution.xml:3193(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Seleccione Editar &gt; Carpeta de búsqueda"
 
-#: C/evolution.xml:3187(para)
+#: C/evolution.xml:3201(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr ""
 "Escriba el nombre de la carpeta de búsqueda en el campo Nombre de la "
 "búsqueda."
 
-#: C/evolution.xml:3190(para)
+#: C/evolution.xml:3204(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7863,19 +7834,19 @@ msgstr ""
 "similares a los de los filtros."
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:3193(para)
+#: C/evolution.xml:3207(para)
 msgid "Sender's address."
 msgstr "La dirección del remitente."
 
-#: C/evolution.xml:3196(title)
+#: C/evolution.xml:3210(title)
 msgid "Recipients:"
 msgstr "Destinatarios:"
 
-#: C/evolution.xml:3208(title)
+#: C/evolution.xml:3222(title)
 msgid "Expression (for programmers only):"
 msgstr "Expresión (sólo para programadores):"
 
-#: C/evolution.xml:3209(para)
+#: C/evolution.xml:3223(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7883,33 +7854,33 @@ msgstr ""
 "Busca un mensaje que coincida con una expresión escrita en lenguaje Scheme, "
 "utilizado para definir filtros en Evolution."
 
-#: C/evolution.xml:3236(title)
+#: C/evolution.xml:3250(title)
 msgid "Follow Up:"
 msgstr "Seguimiento:"
 
-#: C/evolution.xml:3244(title)
+#: C/evolution.xml:3258(title)
 msgid "Mailing List:"
 msgstr "Lista de correo:"
 
-#: C/evolution.xml:3248(title)
+#: C/evolution.xml:3262(title)
 msgid "Match all:"
 msgstr "Coincidir con todo:"
 
-#: C/evolution.xml:3249(para)
+#: C/evolution.xml:3263(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Comprueba si el mensaje coincide con todos los criterios listados."
 
-#: C/evolution.xml:3253(para)
+#: C/evolution.xml:3267(para)
 msgid ""
 "Select which folders will be used for the search folder. Your options are:"
 msgstr ""
 "Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
 
-#: C/evolution.xml:3255(title)
+#: C/evolution.xml:3269(title)
 msgid "All local folders:"
 msgstr "Todas las carpetas locales:"
 
-#: C/evolution.xml:3256(para)
+#: C/evolution.xml:3270(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7917,11 +7888,11 @@ msgstr ""
 "Usa todas las carpetas locales para la fuente de la carpeta de búsqueda, "
 "además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3259(title)
+#: C/evolution.xml:3273(title)
 msgid "All active remote folders:"
 msgstr "Todas las carpetas remotas activas:"
 
-#: C/evolution.xml:3260(para)
+#: C/evolution.xml:3274(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7933,11 +7904,11 @@ msgstr ""
 "para poder incluir cualquier mensaje de dicho origen además de las carpetas "
 "individuales seleccionadas."
 
-#: C/evolution.xml:3263(title)
+#: C/evolution.xml:3277(title)
 msgid "All local and active remote folders:"
 msgstr "Todas las carpetas locales y remotas activas:"
 
-#: C/evolution.xml:3264(para)
+#: C/evolution.xml:3278(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7945,27 +7916,27 @@ msgstr ""
 "Usa todas las carpetas activas remotas y locales para la fuente de la "
 "carpeta de búsqueda, además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3267(title)
+#: C/evolution.xml:3281(title)
 msgid "Specific folders only:"
 msgstr "Únicamente carpetas especificadas:"
 
-#: C/evolution.xml:3268(para)
+#: C/evolution.xml:3282(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Usa carpetas individuales para la fuente de carpeta de búsqueda."
 
-#: C/evolution.xml:3270(para)
+#: C/evolution.xml:3284(para)
 msgid "If you select Specific folders only,"
 msgstr "Si selecciona Únicamente carpetas especificadas,"
 
-#: C/evolution.xml:3273(para)
+#: C/evolution.xml:3287(para)
 msgid "click Add button to open the Select folder window."
 msgstr "pulse el botón Añadir para abrir la ventana Seleccionar carpeta."
 
-#: C/evolution.xml:3277(para)
+#: C/evolution.xml:3291(para)
 msgid "Select the folder and press Add button."
 msgstr "Seleccione la carpeta y pulse el botón Añadir."
 
-#: C/evolution.xml:3280(para)
+#: C/evolution.xml:3294(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7973,7 +7944,7 @@ msgstr ""
 "Puede ver la carpeta añadida a la lista de carpetas en la caja de texto de "
 "la parte inferior de la ventana Carpeta de búsqueda nueva."
 
-#: C/evolution.xml:3291(para)
+#: C/evolution.xml:3305(para)
 msgid ""
 "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
 "or Bogofilter with trainable Bayesian filters to perform the spam check. "
@@ -7987,7 +7958,7 @@ msgstr ""
 "marcará y ocultará de su vista. Los mensajes marcados como correo basura "
 "sólo se muestran en la carpeta SPAM."
 
-#: C/evolution.xml:3292(para)
+#: C/evolution.xml:3306(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
@@ -8009,7 +7980,7 @@ msgstr ""
 "como SPAM o Ctrl+J. Cuando lo corrija, el filtro puede reconocer mensajes "
 "similares para el futuro y se hace más preciso a medida que pasa el tiempo."
 
-#: C/evolution.xml:3293(para)
+#: C/evolution.xml:3307(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -8022,7 +7993,7 @@ msgstr ""
 "aprenda que es correo válido. El botón <emphasis>SPAM</emphasis> aprende qué "
 "mensajes son SPAM."
 
-#: C/evolution.xml:3294(para)
+#: C/evolution.xml:3308(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
 "then click Mail Preferences."
@@ -8030,7 +8001,7 @@ msgstr ""
 "Para cambiar sus preferencias de filtrado de correo basura, pulse Editar "
 "&gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:3295(para) C/evolution.xml:5869(para)
+#: C/evolution.xml:3309(para) C/evolution.xml:5881(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"mail-prefs-"
 "junk\">Junk Mail Preferences</link>."
@@ -8038,7 +8009,7 @@ msgstr ""
 "Para información adicional acerca del correo basura, vea <link linkend="
 "\"mail-prefs-junk\">Preferencias de spam</link>."
 
-#: C/evolution.xml:3296(para)
+#: C/evolution.xml:3310(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -8046,7 +8017,7 @@ msgstr ""
 "Para ver ajustes de correo basura adicionales, consulte <link linkend=\"more-"
 "mail-options\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:3298(para)
+#: C/evolution.xml:3312(para)
 msgid ""
 "SpamAssassin is an application that scans through the mail box to find junk "
 "mail. Evolution uses SpamAssassin as the default spam-filtering application. "
@@ -8059,7 +8030,7 @@ msgstr ""
 "\"http://spamassassin.apache.org/\">El proyecto SpamAssasin de Apache</"
 "ulink>."
 
-#: C/evolution.xml:3299(para)
+#: C/evolution.xml:3313(para)
 msgid ""
 "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
@@ -8074,7 +8045,7 @@ msgstr ""
 "consulte <ulink url=\"http://bogofilter.sourceforge.net/\">el sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:3306(para)
+#: C/evolution.xml:3320(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "contacts tool to organize any amount of contact information, share addresses "
@@ -8085,27 +8056,27 @@ msgstr ""
 "información sobre contactos, compartir direcciones a través de una red y "
 "ahorrar tiempo con las tareas cotidianas."
 
-#: C/evolution.xml:3309(link) C/evolution.xml:3326(title)
+#: C/evolution.xml:3323(link) C/evolution.xml:3340(title)
 msgid "Contacts and Cards"
 msgstr "Contactos y tarjetas"
 
-#: C/evolution.xml:3312(link) C/evolution.xml:3475(title)
+#: C/evolution.xml:3326(link) C/evolution.xml:3489(title)
 msgid "Searching for Contacts"
 msgstr "Búsqueda de contactos"
 
-#: C/evolution.xml:3315(link) C/evolution.xml:3626(title)
+#: C/evolution.xml:3329(link) C/evolution.xml:3640(title)
 msgid "Organizing your Contacts"
 msgstr "Organizar sus contactos"
 
-#: C/evolution.xml:3318(link) C/evolution.xml:3735(title)
+#: C/evolution.xml:3332(link) C/evolution.xml:3749(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: libretas de direcciones compartidas en una red"
 
-#: C/evolution.xml:3321(link) C/evolution.xml:3758(title)
+#: C/evolution.xml:3335(link) C/evolution.xml:3772(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envíeme una tarjeta: Cómo añadir tarjetas rápidamente"
 
-#: C/evolution.xml:3327(para)
+#: C/evolution.xml:3341(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
 "you can keep track of information about them and send email to them. In "
@@ -8123,11 +8094,11 @@ msgstr ""
 "de contactos consulte <link linkend=\"config-prefs-contact\">Gestión de "
 "contactos</link>."
 
-#: C/evolution.xml:3330(title)
+#: C/evolution.xml:3344(title)
 msgid "The Contact Editor"
 msgstr "El editor de contactos"
 
-#: C/evolution.xml:3331(para)
+#: C/evolution.xml:3345(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email addresses, telephone numbers, mailing addresses and all other contact "
@@ -8138,23 +8109,23 @@ msgstr ""
 "mensajería instantánea y el resto de la información que ha introducido para "
 "un contacto en particular."
 
-#: C/evolution.xml:3332(para)
+#: C/evolution.xml:3346(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La ventana del editor de contactos tiene tres solapas:"
 
-#: C/evolution.xml:3334(title)
+#: C/evolution.xml:3348(title)
 msgid "Contact:"
 msgstr "Contacto:"
 
-#: C/evolution.xml:3335(para)
+#: C/evolution.xml:3349(para)
 msgid "Contains basic contact information."
 msgstr "Contiene la información básica del contacto."
 
-#: C/evolution.xml:3338(title)
+#: C/evolution.xml:3352(title)
 msgid "Personal Information:"
 msgstr "Información personal:"
 
-#: C/evolution.xml:3339(para)
+#: C/evolution.xml:3353(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -8162,15 +8133,15 @@ msgstr ""
 "Contiene una descripción más específica de la persona, incluyendo URL para "
 "el calendario e información de disponibilidad."
 
-#: C/evolution.xml:3342(title)
+#: C/evolution.xml:3356(title)
 msgid "Mailing Address:"
 msgstr "Dirección de correo:"
 
-#: C/evolution.xml:3343(para)
+#: C/evolution.xml:3357(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contiene las direcciones de correo individuales."
 
-#: C/evolution.xml:3345(para)
+#: C/evolution.xml:3359(para)
 msgid ""
 "You can also use the Forward Contact menu item in the Action menu, which "
 "opens a new message with the card already attached, or Send Message to "
@@ -8180,7 +8151,7 @@ msgstr ""
 "un nuevo mensaje con la tarjeta adjuntada, o Enviar mensaje al contacto, que "
 "abrirá un nuevo mensaje con la dirección de correo-e del contacto."
 
-#: C/evolution.xml:3346(para)
+#: C/evolution.xml:3360(para)
 msgid ""
 "You can add a card from within an email message or calendar appointment. In "
 "an open email, right-click any email address or message, and click Add to "
@@ -8191,7 +8162,7 @@ msgstr ""
 "dirección o mensaje de correo electrónico, y elija en el menú Añadir a la "
 "libreta de direcciones o seleccione Añadir remitente a la libreta."
 
-#: C/evolution.xml:3347(para)
+#: C/evolution.xml:3361(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -8200,11 +8171,11 @@ msgstr ""
 "la información que haya introducido, pero algunos de ellos tienen "
 "características adicionales:"
 
-#: C/evolution.xml:3349(title)
+#: C/evolution.xml:3363(title)
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: C/evolution.xml:3350(para)
+#: C/evolution.xml:3364(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
@@ -8235,11 +8206,11 @@ msgstr ""
 "<quote>de Icaza</quote>, tiene dos palabras y para ordenarlo correctamente "
 "debe introducir de Icaza, Miguel en el campo Archivar como."
 
-#: C/evolution.xml:3353(title)
+#: C/evolution.xml:3367(title)
 msgid "Where:"
 msgstr "Dónde:"
 
-#: C/evolution.xml:3354(para)
+#: C/evolution.xml:3368(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -8249,11 +8220,11 @@ msgstr ""
 "contacto. Quizá no pueda escribir en todas las libretas de direcciones, "
 "especialmente en aquellas de una red."
 
-#: C/evolution.xml:3357(title)
+#: C/evolution.xml:3371(title)
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: C/evolution.xml:3358(para)
+#: C/evolution.xml:3372(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -8266,11 +8237,11 @@ msgstr ""
 "contactos, vea <link linkend=\"usage-contact-organize\">Organizar sus "
 "contactos</link>."
 
-#: C/evolution.xml:3361(title)
+#: C/evolution.xml:3375(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de Disponibilidad y Calendario:"
 
-#: C/evolution.xml:3362(para)
+#: C/evolution.xml:3376(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes free/busy or calendar data online, using a server "
@@ -8284,28 +8255,28 @@ msgstr ""
 "direcciones para esos servidores aquí. Después de hacerlo, puede comprobar "
 "sus horarios cuando cree citas con el calendario."
 
-#: C/evolution.xml:3367(title)
+#: C/evolution.xml:3381(title)
 msgid "Creating and Editing Contacts"
 msgstr "Crear y editar contactos"
 
-#: C/evolution.xml:3368(para)
+#: C/evolution.xml:3382(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Siga los pasos dados debajo para crear una nueva tarjeta."
 
-#: C/evolution.xml:3371(para)
+#: C/evolution.xml:3385(para)
 msgid "Click File &gt; New &gt; Contact."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Contacto."
 
-#: C/evolution.xml:3374(para)
+#: C/evolution.xml:3388(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr ""
 "Introduzca la información del contacto en las cajas de texto proporcionadas."
 
-#: C/evolution.xml:3380(para)
+#: C/evolution.xml:3394(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/evolution.xml:3383(para)
+#: C/evolution.xml:3397(para)
 msgid ""
 "Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
 "the menubar."
@@ -8313,32 +8284,32 @@ msgstr ""
 "Vaya a la ventana de Contactos seleccionando Ver &gt; Ventana &gt; Contactos "
 "desde la barra de menú."
 
-#: C/evolution.xml:3386(para)
+#: C/evolution.xml:3400(para)
 msgid "Double click on the card you want to edit."
 msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
-#: C/evolution.xml:3389(para) C/evolution.xml:3409(para)
+#: C/evolution.xml:3403(para) C/evolution.xml:3423(para)
 msgid "Edit the information in the Contact Editor window."
 msgstr "Edite la información en la ventana del editor de contactos."
 
-#: C/evolution.xml:3395(para)
+#: C/evolution.xml:3409(para)
 msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 "También puede editar la información del contacto desde el panel de vista "
 "previa."
 
-#: C/evolution.xml:3398(para)
+#: C/evolution.xml:3412(para)
 msgid "Right click on the address from Message Header."
 msgstr ""
 "Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
 
-#: C/evolution.xml:3401(para)
+#: C/evolution.xml:3415(para)
 msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Seleccione Añadir a la libreta de direcciones para mostrar la ventana Añadir "
 "contacto rápido."
 
-#: C/evolution.xml:3406(para)
+#: C/evolution.xml:3420(para)
 msgid ""
 "Press the Edit Full button at the bottom left to bring up the Contact Editor "
 "window."
@@ -8346,11 +8317,11 @@ msgstr ""
 "Pulse la solapa Editar todo en la parte inferior izquierda para mostrar la "
 "ventana del Editor de contactos."
 
-#: C/evolution.xml:3417(title)
+#: C/evolution.xml:3431(title)
 msgid "Google Contacts"
 msgstr "Contactos de Google"
 
-#: C/evolution.xml:3418(para)
+#: C/evolution.xml:3432(para)
 msgid ""
 "Evolution allows you to access your Google Address Book. You can view the "
 "Google contacts offline and create, modify and delete the contacts online."
@@ -8359,25 +8330,25 @@ msgstr ""
 "ver los contactos de Google cuando esté desconectado y crear, modificar y "
 "borrar elementos del calendario cuando esté conectado."
 
-#: C/evolution.xml:3419(para)
+#: C/evolution.xml:3433(para)
 msgid "To configure your Google Address Book in Evolution contacts:"
 msgstr ""
 "Para configurar su Libreta de direcciones de Google en sus contactos de "
 "Evolution:"
 
-#: C/evolution.xml:3422(para) C/evolution.xml:7070(para)
+#: C/evolution.xml:3436(para) C/evolution.xml:7085(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Libreta de direcciones."
 
-#: C/evolution.xml:3427(para) C/evolution.xml:3917(para)
+#: C/evolution.xml:3441(para) C/evolution.xml:3931(para)
 msgid "Select Google from the Type drop-down list."
 msgstr "Seleccione Google de la lista desplegable de tipos."
 
-#: C/evolution.xml:3430(para)
+#: C/evolution.xml:3444(para)
 msgid "Specify a name for the address book."
 msgstr "Especifique un nombre para la libreta de direcciones."
 
-#: C/evolution.xml:3433(para)
+#: C/evolution.xml:3447(para)
 msgid ""
 "Select or deselect the following options and provide the username for the "
 "Google account:"
@@ -8385,11 +8356,11 @@ msgstr ""
 "Seleccione o deseleccione las siguientes opciones y proporcione el nombre de "
 "usuario para la cuenta de Google:"
 
-#: C/evolution.xml:3437(title)
+#: C/evolution.xml:3451(title)
 msgid "Mark as default address book:"
 msgstr "Marcar como libreta de direcciones predeterminada:"
 
-#: C/evolution.xml:3438(para)
+#: C/evolution.xml:3452(para)
 msgid ""
 "Select this option to make the Google address book as your default address "
 "book."
@@ -8397,11 +8368,11 @@ msgstr ""
 "Seleccione esta opción para que la libreta de direcciones de Google sea su "
 "libreta de direcciones predeterminada."
 
-#: C/evolution.xml:3443(title)
+#: C/evolution.xml:3457(title)
 msgid "Copy book content locally for offline operations:"
 msgstr "Copiar el contenido de la carpeta localmente para operar desconectado:"
 
-#: C/evolution.xml:3444(para)
+#: C/evolution.xml:3458(para)
 msgid ""
 "Select this option to copy the address book to your machine so you can "
 "access the contacts even when you are not connected to the network."
@@ -8409,20 +8380,20 @@ msgstr ""
 "Seleccione esta opción para copiar la libreta de direcciones de su equipo, "
 "así podrá acceder a los contactos incluso cuando no está conectado a la red."
 
-#: C/evolution.xml:3449(title) C/evolution.xml:3932(title)
+#: C/evolution.xml:3463(title) C/evolution.xml:3946(title)
 msgid "Username:"
 msgstr "Usuario:"
 
-#: C/evolution.xml:3450(para) C/evolution.xml:3933(para)
+#: C/evolution.xml:3464(para) C/evolution.xml:3947(para)
 msgid "Specify your username for your Google account."
 msgstr "Especifique su nombre de usuario para su cuenta en Google."
 
-#: C/evolution.xml:3455(title)
+#: C/evolution.xml:3469(title)
 msgid "Use SSL:"
 msgstr "Usar SSL:"
 
-#: C/evolution.xml:3456(para) C/evolution.xml:3942(para)
-#: C/evolution.xml:5850(para)
+#: C/evolution.xml:3470(para) C/evolution.xml:3956(para)
+#: C/evolution.xml:5862(para)
 msgid ""
 "Select Use SSL to enable a secure connection between Evolution and the "
 "server."
@@ -8430,17 +8401,17 @@ msgstr ""
 "Seleccione Usar SSL para activar una conexión segura entre Evolution y el "
 "servidor."
 
-#: C/evolution.xml:3461(title)
+#: C/evolution.xml:3475(title)
 msgid "Refresh:"
 msgstr "Actualizar:"
 
-#: C/evolution.xml:3462(para)
+#: C/evolution.xml:3476(para)
 msgid "Set the time to automatically refresh the Google address book."
 msgstr ""
 "Establezca el tiempo para refrescar la libreta de direcciones de Google "
 "automáticamente."
 
-#: C/evolution.xml:3478(para)
+#: C/evolution.xml:3492(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "customized search. To find the contact address you are looking for, use the "
@@ -8450,29 +8421,29 @@ msgstr ""
 "búsqueda personalizada. Para buscar la dirección del contacto que está "
 "buscando, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3485(para) C/evolution.xml:4349(para)
-#: C/evolution.xml:4665(para) C/evolution.xml:4901(para)
+#: C/evolution.xml:3499(para) C/evolution.xml:4363(para)
+#: C/evolution.xml:4679(para) C/evolution.xml:4915(para)
 msgid "Specify the search criteria from any of the following:"
 msgstr ""
 "Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
 
-#: C/evolution.xml:3488(para)
+#: C/evolution.xml:3502(para)
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: C/evolution.xml:3491(para)
+#: C/evolution.xml:3505(para)
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: C/evolution.xml:3494(para)
+#: C/evolution.xml:3508(para)
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:3499(para)
+#: C/evolution.xml:3513(para)
 msgid "Press Enter to begin the search."
 msgstr "Pulse Intro para iniciar la búsqueda."
 
-#: C/evolution.xml:3502(para)
+#: C/evolution.xml:3516(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -8480,19 +8451,19 @@ msgstr ""
 "Para una búsqueda más compleja, seleccione Búsqueda avanzada y seleccione el "
 "criterio que describe el contacto que desea:"
 
-#: C/evolution.xml:3505(para)
+#: C/evolution.xml:3519(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Escriba un nombre para la regla en el campo Nombre de la regla."
 
-#: C/evolution.xml:3508(para)
+#: C/evolution.xml:3522(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Configure el criterio en el campo Buscar elementos."
 
-#: C/evolution.xml:3511(para)
+#: C/evolution.xml:3525(para)
 msgid "Select Add to add additional criteria."
 msgstr "Seleccione Añadir para añadir el criterio adicional."
 
-#: C/evolution.xml:3520(para)
+#: C/evolution.xml:3534(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -8501,139 +8472,139 @@ msgstr ""
 "seleccionado de la lista desplegable en la parte izquierda, justo encima del "
 "panel de visualización."
 
-#: C/evolution.xml:3522(para)
+#: C/evolution.xml:3536(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Para realizar una búsqueda rápida, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3531(para) C/evolution.xml:4417(para)
-#: C/evolution.xml:4768(para) C/evolution.xml:4963(para)
+#: C/evolution.xml:3545(para) C/evolution.xml:4431(para)
+#: C/evolution.xml:4782(para) C/evolution.xml:4977(para)
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: C/evolution.xml:3534(para) C/evolution.xml:4420(para)
-#: C/evolution.xml:4771(para) C/evolution.xml:4966(para)
+#: C/evolution.xml:3548(para) C/evolution.xml:4434(para)
+#: C/evolution.xml:4785(para) C/evolution.xml:4980(para)
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: C/evolution.xml:3537(para) C/evolution.xml:4423(para)
-#: C/evolution.xml:4774(para) C/evolution.xml:4969(para)
+#: C/evolution.xml:3551(para) C/evolution.xml:4437(para)
+#: C/evolution.xml:4788(para) C/evolution.xml:4983(para)
 msgid "Business"
 msgstr "Trabajo"
 
-#: C/evolution.xml:3540(para) C/evolution.xml:4426(para)
-#: C/evolution.xml:4777(para) C/evolution.xml:4972(para)
+#: C/evolution.xml:3554(para) C/evolution.xml:4440(para)
+#: C/evolution.xml:4791(para) C/evolution.xml:4986(para)
 msgid "Competition"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:3543(para) C/evolution.xml:4975(para)
+#: C/evolution.xml:3557(para) C/evolution.xml:4989(para)
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:3546(para) C/evolution.xml:4432(para)
-#: C/evolution.xml:4783(para) C/evolution.xml:4978(para)
+#: C/evolution.xml:3560(para) C/evolution.xml:4446(para)
+#: C/evolution.xml:4797(para) C/evolution.xml:4992(para)
 msgid "Gifts"
 msgstr "Regalos"
 
-#: C/evolution.xml:3549(para) C/evolution.xml:4435(para)
-#: C/evolution.xml:4786(para) C/evolution.xml:4981(para)
+#: C/evolution.xml:3563(para) C/evolution.xml:4449(para)
+#: C/evolution.xml:4800(para) C/evolution.xml:4995(para)
 msgid "Goals/Objectives"
 msgstr "Metas/Objetivos"
 
-#: C/evolution.xml:3552(para) C/evolution.xml:4438(para)
+#: C/evolution.xml:3566(para) C/evolution.xml:4452(para)
 msgid "Holiday"
 msgstr "Fiesta"
 
-#: C/evolution.xml:3555(para) C/evolution.xml:4441(para)
-#: C/evolution.xml:4792(para) C/evolution.xml:4987(para)
+#: C/evolution.xml:3569(para) C/evolution.xml:4455(para)
+#: C/evolution.xml:4806(para) C/evolution.xml:5001(para)
 msgid "Holiday Cards"
 msgstr "Tarjetas de vacaciones"
 
-#: C/evolution.xml:3558(para)
+#: C/evolution.xml:3572(para)
 msgid "Hot Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:3561(para) C/evolution.xml:4444(para)
-#: C/evolution.xml:4795(para) C/evolution.xml:4990(para)
+#: C/evolution.xml:3575(para) C/evolution.xml:4458(para)
+#: C/evolution.xml:4809(para) C/evolution.xml:5004(para)
 msgid "Ideas"
 msgstr "Ideas"
 
-#: C/evolution.xml:3564(para) C/evolution.xml:4447(para)
-#: C/evolution.xml:4798(para) C/evolution.xml:4993(para)
+#: C/evolution.xml:3578(para) C/evolution.xml:4461(para)
+#: C/evolution.xml:4812(para) C/evolution.xml:5007(para)
 msgid "International"
 msgstr "Internacional"
 
-#: C/evolution.xml:3567(para) C/evolution.xml:4450(para)
+#: C/evolution.xml:3581(para) C/evolution.xml:4464(para)
 msgid "Key Customer"
 msgstr "Cliente clave"
 
-#: C/evolution.xml:3570(para) C/evolution.xml:4453(para)
-#: C/evolution.xml:4804(para) C/evolution.xml:4999(para)
+#: C/evolution.xml:3584(para) C/evolution.xml:4467(para)
+#: C/evolution.xml:4818(para) C/evolution.xml:5013(para)
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: C/evolution.xml:3576(para) C/evolution.xml:4459(para)
-#: C/evolution.xml:4810(para) C/evolution.xml:5005(para)
+#: C/evolution.xml:3590(para) C/evolution.xml:4473(para)
+#: C/evolution.xml:4824(para) C/evolution.xml:5019(para)
 msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
-#: C/evolution.xml:3582(para) C/evolution.xml:4465(para)
-#: C/evolution.xml:4816(para) C/evolution.xml:5011(para)
+#: C/evolution.xml:3596(para) C/evolution.xml:4479(para)
+#: C/evolution.xml:4830(para) C/evolution.xml:5025(para)
 msgid "Strategies"
 msgstr "Estrategias"
 
-#: C/evolution.xml:3585(para) C/evolution.xml:4468(para)
-#: C/evolution.xml:4819(para) C/evolution.xml:5014(para)
+#: C/evolution.xml:3599(para) C/evolution.xml:4482(para)
+#: C/evolution.xml:4833(para) C/evolution.xml:5028(para)
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#: C/evolution.xml:3588(para) C/evolution.xml:4471(para)
-#: C/evolution.xml:4822(para) C/evolution.xml:5017(para)
+#: C/evolution.xml:3602(para) C/evolution.xml:4485(para)
+#: C/evolution.xml:4836(para) C/evolution.xml:5031(para)
 msgid "Time &amp; Expenses"
 msgstr "Tiempo y gastos"
 
-#: C/evolution.xml:3591(para) C/evolution.xml:4474(para)
-#: C/evolution.xml:4825(para) C/evolution.xml:5020(para)
+#: C/evolution.xml:3605(para) C/evolution.xml:4488(para)
+#: C/evolution.xml:4839(para) C/evolution.xml:5034(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: C/evolution.xml:3594(para) C/evolution.xml:4477(para)
-#: C/evolution.xml:4828(para) C/evolution.xml:5023(para)
+#: C/evolution.xml:3608(para) C/evolution.xml:4491(para)
+#: C/evolution.xml:4842(para) C/evolution.xml:5037(para)
 msgid "Waiting"
 msgstr "Esperando"
 
-#: C/evolution.xml:3597(para)
+#: C/evolution.xml:3611(para)
 msgid "Weather: Cloudy"
 msgstr "Meteorología: Nuboso"
 
-#: C/evolution.xml:3600(para)
+#: C/evolution.xml:3614(para)
 msgid "Weather: Fog"
 msgstr "Meteorología: Niebla"
 
-#: C/evolution.xml:3603(para)
+#: C/evolution.xml:3617(para)
 msgid "Weather: Partly Cloudy"
 msgstr "Meteorología: Parcialmente nuboso"
 
-#: C/evolution.xml:3606(para)
+#: C/evolution.xml:3620(para)
 msgid "Weather: Rain"
 msgstr "Meteorología: Lluvia"
 
-#: C/evolution.xml:3609(para)
+#: C/evolution.xml:3623(para)
 msgid "Weather: Snow"
 msgstr "Meteorología: Nieve"
 
-#: C/evolution.xml:3612(para)
+#: C/evolution.xml:3626(para)
 msgid "Weather: Sunny"
 msgstr "Meteorología: Soleado"
 
-#: C/evolution.xml:3615(para)
+#: C/evolution.xml:3629(para)
 msgid "Weather: Thunderstorms"
 msgstr "Meteorología: Tormenta"
 
-#: C/evolution.xml:3620(para)
+#: C/evolution.xml:3634(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution muestra los contactos deseados."
 
-#: C/evolution.xml:3627(para)
+#: C/evolution.xml:3641(para)
 msgid ""
 "Evolution allows you to organize your contacts. You can create several "
 "individual address books, or contact lists. Within a given address book, you "
@@ -8643,23 +8614,23 @@ msgstr ""
 "libretas de direcciones individuales o grupos de contactos. Dentro de una "
 "libreta de direcciones dada puede tener varias categorías para los contactos."
 
-#: C/evolution.xml:3630(link) C/evolution.xml:3644(title)
+#: C/evolution.xml:3644(link) C/evolution.xml:3658(title)
 msgid "Contact Groups"
 msgstr "Grupos de contactos"
 
-#: C/evolution.xml:3633(link) C/evolution.xml:3666(title)
+#: C/evolution.xml:3647(link) C/evolution.xml:3680(title)
 msgid "Creating a List of Contacts"
 msgstr "Crear una lista de contactos"
 
-#: C/evolution.xml:3636(link) C/evolution.xml:3698(title)
+#: C/evolution.xml:3650(link) C/evolution.xml:3712(title)
 msgid "Grouping with Categories"
 msgstr "Agrupación por categorías"
 
-#: C/evolution.xml:3639(link) C/evolution.xml:3752(title)
+#: C/evolution.xml:3653(link) C/evolution.xml:3766(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuración de Evolution para utilizar LDAP"
 
-#: C/evolution.xml:3645(para)
+#: C/evolution.xml:3659(para)
 msgid ""
 "Contact groups are nothing but address books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
@@ -8675,7 +8646,7 @@ msgstr ""
 "proporcionar un nombre. Para los contactos en la red debe proporcionar más "
 "información acerca del servidor de contactos al que está intentando acceder."
 
-#: C/evolution.xml:3646(para)
+#: C/evolution.xml:3660(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
 "of contacts and drop it to a different group. You cannot change the contents "
@@ -8685,7 +8656,7 @@ msgstr ""
 "vista general de contactos. No puede modificar el contenido de la mayoría de "
 "los contactos de red."
 
-#: C/evolution.xml:3648(para)
+#: C/evolution.xml:3662(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
@@ -8698,11 +8669,11 @@ msgstr ""
 "contactos y generalmente se usa para enviar correos electrónicos a varias "
 "personas a la vez."
 
-#: C/evolution.xml:3653(title)
+#: C/evolution.xml:3667(title)
 msgid "Importing Contacts"
 msgstr "Importar contactos"
 
-#: C/evolution.xml:3654(para)
+#: C/evolution.xml:3668(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8710,11 +8681,11 @@ msgstr ""
 "Puede importar contactos desde otra herramienta de gestión de contactos con "
 "la herramienta Importar."
 
-#: C/evolution.xml:3659(para)
+#: C/evolution.xml:3673(para)
 msgid "Mail yourself a contact as a vCard attachment."
 msgstr "Envíese a si mismo un contacto como un adjunto vCard."
 
-#: C/evolution.xml:3660(para)
+#: C/evolution.xml:3674(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8722,7 +8693,7 @@ msgstr ""
 "Actualmente se soportan VCF y LDIF. Los formatos CSV y TAB están soportados "
 "desde Microsoft Outlook, Thunderbird, Mozilla  y Evolution."
 
-#: C/evolution.xml:3667(para)
+#: C/evolution.xml:3681(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
 "When you send email to the nickname, it is sent to every member of the list. "
@@ -8736,7 +8707,7 @@ msgstr ""
 "para su conveniencia, en lugar de ser una dirección de correo real "
 "gestionada por una aplicación para listas de correo en un servidor."
 
-#: C/evolution.xml:3668(para)
+#: C/evolution.xml:3682(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
 "those cards to a contact list called <quote>Family.</quote> Then, instead of "
@@ -8749,33 +8720,33 @@ msgstr ""
 "correo electrónico de cada persona individualmente, puede enviar un correo "
 "electrónico a <quote>Familia</quote> y el mensaje se enviará a todos ellos."
 
-#: C/evolution.xml:3669(para)
+#: C/evolution.xml:3683(para)
 msgid "To create a list of contacts:"
 msgstr "Para crear una lista de contactos:"
 
-#: C/evolution.xml:3672(para)
+#: C/evolution.xml:3686(para)
 msgid "Open the list creation window by clicking the New List button."
 msgstr ""
 "Abra el cuadro de diálogo de creación de listas pulsando el botón lista "
 "nueva."
 
-#: C/evolution.xml:3674(para)
+#: C/evolution.xml:3688(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de contactos."
 
-#: C/evolution.xml:3677(para)
+#: C/evolution.xml:3691(para)
 msgid "Specify a name for the list."
 msgstr "Especifique un nombre para la lista."
 
-#: C/evolution.xml:3680(para)
+#: C/evolution.xml:3694(para)
 msgid "Specify the names or email addresses of contacts."
 msgstr "Especifique los nombres o direcciones de correo-e de los contactos."
 
-#: C/evolution.xml:3682(para)
+#: C/evolution.xml:3696(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Arrastre los contactos desde la ventana principal hasta la lista."
 
-#: C/evolution.xml:3685(para)
+#: C/evolution.xml:3699(para)
 msgid ""
 "Choose whether you want to hide the email addresses when you send a message "
 "to the list."
@@ -8783,7 +8754,7 @@ msgstr ""
 "Elija si quiere ocultar las direcciones de los correos-e cuando envíe un "
 "mensaje a la lista."
 
-#: C/evolution.xml:3686(para)
+#: C/evolution.xml:3700(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
@@ -8796,11 +8767,11 @@ msgstr ""
 "to-types\">Especificar destinatarios adicioneles para correo electrónico</"
 "link>."
 
-#: C/evolution.xml:3689(para)
+#: C/evolution.xml:3703(para)
 msgid "When you are finished, click OK."
 msgstr "Cuando termine, pulse Aceptar."
 
-#: C/evolution.xml:3692(para)
+#: C/evolution.xml:3706(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
 "card, including mailing the list to another person and sending email to the "
@@ -8810,7 +8781,7 @@ msgstr ""
 "demás, incluyendo la posibilidad de enviar la lista a otra persona y la de "
 "enviar un mensaje a la lista."
 
-#: C/evolution.xml:3693(para)
+#: C/evolution.xml:3707(para)
 msgid ""
 "To mail the list, open a new email and type the name you chose for the list. "
 "Evolution addresses the message to the entire list when you send the "
@@ -8823,12 +8794,12 @@ msgstr ""
 "tarjeta correspondiente en la libreta de direcciones, y seleccionar Enviar "
 "un mensaje a la lista."
 
-#: C/evolution.xml:3694(para)
+#: C/evolution.xml:3708(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr ""
 "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
-#: C/evolution.xml:3699(para)
+#: C/evolution.xml:3713(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
@@ -8842,25 +8813,25 @@ msgstr ""
 "la categoría <guilabel>Trabajo</guilabel> porque trabaja con él y en la "
 "categoría <guilabel>Amigos</guilabel> porque es un amigo."
 
-#: C/evolution.xml:3700(para)
+#: C/evolution.xml:3714(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Para marcar una tarjeta como perteneciente a una categoría,"
 
-#: C/evolution.xml:3703(para)
+#: C/evolution.xml:3717(para)
 msgid "Double click the card to bring up the Contact Editor window"
 msgstr ""
 "Pulse dos veces sobre la tarjeta para que aparezca la ventana del Editor de "
 "contactos"
 
-#: C/evolution.xml:3706(para)
+#: C/evolution.xml:3720(para)
 msgid "Click the Categories button at the left."
 msgstr "Pulse el botón Categorías de la izquierda."
 
-#: C/evolution.xml:3707(para)
+#: C/evolution.xml:3721(para)
 msgid "The Categories window is shown below."
 msgstr "La ventana de Categorías se muestra debajo."
 
-#: C/evolution.xml:3712(para)
+#: C/evolution.xml:3726(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8868,7 +8839,7 @@ msgstr ""
 "Seleccione la categoría de la lista. Puede seleccionar tantas categorías "
 "como desee."
 
-#: C/evolution.xml:3715(para)
+#: C/evolution.xml:3729(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
 "categories. To add a new category,"
@@ -8876,12 +8847,12 @@ msgstr ""
 "Si la lista maestra de categorías no se ajusta a sus necesidades puede "
 "añadir sus propias categorías. Para añadir una nueva categoría,"
 
-#: C/evolution.xml:3718(para)
+#: C/evolution.xml:3732(para)
 msgid "Enter the new category in the entry box at the top."
 msgstr ""
 "Introduzca la nueva categoría en la caja de entrada de la parte superior."
 
-#: C/evolution.xml:3722(para)
+#: C/evolution.xml:3736(para)
 msgid ""
 "You can view the category name in the field next to Categories button in the "
 "Contact Editor window."
@@ -8889,7 +8860,7 @@ msgstr ""
 "Puede ver que el nombre de la categoría aparece en el campo junto al botón "
 "Categorías en el Editor de contactos."
 
-#: C/evolution.xml:3729(para)
+#: C/evolution.xml:3743(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click the Edit button at the bottom of the "
@@ -8900,7 +8871,7 @@ msgstr ""
 "inferior de la ventana de Categorías. Pulse el botón Borrar para borrar "
 "elementos de la lista."
 
-#: C/evolution.xml:3736(para)
+#: C/evolution.xml:3750(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8915,7 +8886,7 @@ msgstr ""
 "departamento. Muchas empresas conservan en una libreta LDAP las direcciones "
 "de todos sus empleados o los contactos de clientes."
 
-#: C/evolution.xml:3737(para)
+#: C/evolution.xml:3751(para)
 msgid ""
 "To learn how to add a remote LDAP directory to your available address books, "
 "see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
@@ -8929,7 +8900,7 @@ msgstr ""
 "bajo el elemento En servidores LDAP en el selector. Funciona como una "
 "carpeta de tarjetas locales, con las siguientes excepciones:"
 
-#: C/evolution.xml:3740(para)
+#: C/evolution.xml:3754(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
@@ -8941,7 +8912,7 @@ msgstr ""
 "del directorio de red o colocar en caché algún directorio de red. Para ello, "
 "arrastre los contactos deseados dentro de la lista de contactos local."
 
-#: C/evolution.xml:3741(para)
+#: C/evolution.xml:3755(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, click Properties and select Copy Folder Content "
@@ -8952,7 +8923,7 @@ msgstr ""
 "Propiedades y seleccione Copiar el contenido de la carpeta localmente para "
 "operación desconectada."
 
-#: C/evolution.xml:3744(para)
+#: C/evolution.xml:3758(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8960,7 +8931,7 @@ msgstr ""
 "Para prevenir exceso de tráfico en la red, Evolution no descarga los datos "
 "del servidor LDAP de una forma normal al iniciarse."
 
-#: C/evolution.xml:3747(para)
+#: C/evolution.xml:3761(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8973,7 +8944,7 @@ msgstr ""
 "la que Evolution proporciona. Compruebe con su administrador de su sistema "
 "si necesita una configuración diferente."
 
-#: C/evolution.xml:3753(para)
+#: C/evolution.xml:3767(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8981,7 +8952,7 @@ msgstr ""
 "Para obtener más información acerca de cómo configurar Evolution para usar "
 "LDAP, vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3759(para)
+#: C/evolution.xml:3773(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
 "you can add it to an address card. To do so, right-click any email address "
@@ -9001,7 +8972,7 @@ msgstr ""
 "HotSync*. Para obtener más información consulte <link linkend=\"config-sync"
 "\">Sincronización de Evolution con dispositivos portátiles</link>."
 
-#: C/evolution.xml:3765(para)
+#: C/evolution.xml:3779(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "Calendar to manage your schedule alone or in conjunction with peers. To "
@@ -9014,47 +8985,47 @@ msgstr ""
 "linkend=\"importing-mail\">Importar un solo archivo</link>, que describe la "
 "herramienta de importación."
 
-#: C/evolution.xml:3768(link) C/evolution.xml:3800(title)
+#: C/evolution.xml:3782(link) C/evolution.xml:3814(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Opciones de la vista de calendario"
 
-#: C/evolution.xml:3771(link) C/evolution.xml:3958(title)
+#: C/evolution.xml:3785(link) C/evolution.xml:3972(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planificación con el calendario de Evolution"
 
-#: C/evolution.xml:3774(link) C/evolution.xml:4338(title)
+#: C/evolution.xml:3788(link) C/evolution.xml:4352(title)
 msgid "Searching for Calendar Items"
 msgstr "Buscar elementos del calendario"
 
-#: C/evolution.xml:3777(link) C/evolution.xml:4486(title)
+#: C/evolution.xml:3791(link) C/evolution.xml:4500(title)
 msgid "Printing Displayed Items"
 msgstr "Imprimir los elementos mostrados"
 
-#: C/evolution.xml:3780(link) C/evolution.xml:4491(title)
+#: C/evolution.xml:3794(link) C/evolution.xml:4505(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Borrar citas y reuniones antiguas"
 
-#: C/evolution.xml:3783(link) C/evolution.xml:4496(title)
+#: C/evolution.xml:3797(link) C/evolution.xml:4510(title)
 msgid "Delegating Meetings"
 msgstr "Eliminar reuniones"
 
-#: C/evolution.xml:3786(link) C/evolution.xml:4516(title)
+#: C/evolution.xml:3800(link) C/evolution.xml:4530(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Múltiples calendarios, calendarios web y CalDAV"
 
-#: C/evolution.xml:3789(link) C/evolution.xml:4523(title)
+#: C/evolution.xml:3803(link) C/evolution.xml:4537(title)
 msgid "The Task List"
 msgstr "La Lista de tareas"
 
-#: C/evolution.xml:3792(link) C/evolution.xml:4838(title)
+#: C/evolution.xml:3806(link) C/evolution.xml:4852(title)
 msgid "Memos"
 msgstr "Notas"
 
-#: C/evolution.xml:3795(link) C/evolution.xml:5033(title)
+#: C/evolution.xml:3809(link) C/evolution.xml:5047(title)
 msgid "Configuring Time Zones"
 msgstr "Configurar la zona horaria"
 
-#: C/evolution.xml:3801(para)
+#: C/evolution.xml:3815(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
@@ -9072,11 +9043,11 @@ msgstr ""
 "diferentes juegos de citas, puede asegurarse de evitar conflictos, "
 "reduciendo la carga en la vista."
 
-#: C/evolution.xml:3802(para)
+#: C/evolution.xml:3816(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr "Las citas para cada calendario aparecen con un color diferente."
 
-#: C/evolution.xml:3803(para)
+#: C/evolution.xml:3817(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -9084,55 +9055,55 @@ msgstr ""
 "La barra de herramientas le ofrece cinco botones diferentes que le pueden "
 "mostrar distintas vistas de su calendario."
 
-#: C/evolution.xml:3811(para)
+#: C/evolution.xml:3825(para)
 msgid "Calendar View"
 msgstr "Vista del calendario"
 
-#: C/evolution.xml:3814(para)
+#: C/evolution.xml:3828(para)
 msgid "Shortcut Keys"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:3821(para)
+#: C/evolution.xml:3835(para)
 msgid "Day"
 msgstr "Día"
 
-#: C/evolution.xml:3824(para)
+#: C/evolution.xml:3838(para)
 msgid "control+y"
 msgstr "control+y"
 
-#: C/evolution.xml:3829(para)
+#: C/evolution.xml:3843(para)
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: C/evolution.xml:3832(para)
+#: C/evolution.xml:3846(para)
 msgid "control+j"
 msgstr "control+j"
 
-#: C/evolution.xml:3837(para)
+#: C/evolution.xml:3851(para)
 msgid "Week"
 msgstr "Semana"
 
-#: C/evolution.xml:3840(para)
+#: C/evolution.xml:3854(para)
 msgid "control+k"
 msgstr "control+k"
 
-#: C/evolution.xml:3845(para)
+#: C/evolution.xml:3859(para)
 msgid "Month"
 msgstr "Mes"
 
-#: C/evolution.xml:3848(para)
+#: C/evolution.xml:3862(para)
 msgid "control+m"
 msgstr "control+m"
 
-#: C/evolution.xml:3853(para)
+#: C/evolution.xml:3867(para)
 msgid "List"
 msgstr "Lista"
 
-#: C/evolution.xml:3856(para)
+#: C/evolution.xml:3870(para)
 msgid "control+l"
 msgstr "control+l"
 
-#: C/evolution.xml:3862(para)
+#: C/evolution.xml:3876(para)
 msgid ""
 "You can also select an arbitrary range of days in the small calendar in the "
 "side bar. To do this, select the days that you want to view in your calendar."
@@ -9140,7 +9111,7 @@ msgstr ""
 "Puede elegir cualquier rango de días en el calendario pequeño en la barra "
 "lateral. Para ello seleccione los días que quiere ver en el calendario."
 
-#: C/evolution.xml:3864(para)
+#: C/evolution.xml:3878(para)
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
@@ -9151,7 +9122,7 @@ msgstr ""
 "puede desplazarse una semana o un mes. Para volver al día de hoy pulse Hoy "
 "en la barra de tareas."
 
-#: C/evolution.xml:3865(para)
+#: C/evolution.xml:3879(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -9159,11 +9130,11 @@ msgstr ""
 "Para visitar las entradas del calendario para una fecha específica, pulse en "
 "Ir a para abrir un cuadro de diálogo donde elegir la fecha."
 
-#: C/evolution.xml:3868(title)
+#: C/evolution.xml:3882(title)
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: C/evolution.xml:3869(para)
+#: C/evolution.xml:3883(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -9172,33 +9143,33 @@ msgstr ""
 "copiar los contenidos para su uso desconectado. Para establecer las "
 "propiedades de su calendario"
 
-#: C/evolution.xml:3872(para)
+#: C/evolution.xml:3886(para)
 msgid "Select the calendar from the side bar at the left."
 msgstr "Seleccione el calendario desde la barra lateral en la izquierda."
 
-#: C/evolution.xml:3875(para)
+#: C/evolution.xml:3889(para)
 msgid "Right-click on the calendar."
 msgstr "Pulse con el botón derecho en el calendario."
 
-#: C/evolution.xml:3878(para)
+#: C/evolution.xml:3892(para)
 msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Seleccione Propiedades para abrir el cuadro de diálogo Propiedades del "
 "calendario."
 
-#: C/evolution.xml:3890(para)
+#: C/evolution.xml:3904(para)
 msgid "Edit the label from Name field."
 msgstr "Edite la etiqueta desde el campo Nombre."
 
-#: C/evolution.xml:3893(para)
+#: C/evolution.xml:3907(para)
 msgid "To assign a color for the calendar, click the Color button."
 msgstr "Para asignar un color para el calendario,pulse el botón Color."
 
-#: C/evolution.xml:3896(para)
+#: C/evolution.xml:3910(para)
 msgid "Select the color and click OK."
 msgstr "Seleccione el color y pulse Aceptar."
 
-#: C/evolution.xml:3899(para)
+#: C/evolution.xml:3913(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -9206,7 +9177,7 @@ msgstr ""
 "Para marcar el contenido de su calendario para un uso desconectado, pulse "
 "Copiar el contenido del calendario localmente para trabajar desconectado."
 
-#: C/evolution.xml:3901(para)
+#: C/evolution.xml:3915(para)
 msgid ""
 "Right-click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
@@ -9217,7 +9188,7 @@ msgstr ""
 "acerca de trabajar desconectado consulte <link linkend=\"usage-mail-getnsend-"
 "offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:3903(para)
+#: C/evolution.xml:3917(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -9227,7 +9198,7 @@ msgstr ""
 "iCal, pulse con el botón derecho sobre el calendario en la vista de "
 "calendario a la izquierda y seleccione Guardar al disco."
 
-#: C/evolution.xml:3905(para)
+#: C/evolution.xml:3919(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -9235,11 +9206,11 @@ msgstr ""
 "Pulse Marcar como carpeta predeterminada si quiere marcar esta carpeta como "
 "su carpeta predeterminada para los calendarios."
 
-#: C/evolution.xml:3909(title)
+#: C/evolution.xml:3923(title)
 msgid "Google Calendar"
 msgstr "Google Calendar"
 
-#: C/evolution.xml:3910(para)
+#: C/evolution.xml:3924(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
 "calendar offline or create, modify, and delete the calendar items online."
@@ -9248,33 +9219,33 @@ msgstr ""
 "calendario de Google cuando esté desconectado o crear, modificar y borrar "
 "elementos del calendario cuando esté conectado."
 
-#: C/evolution.xml:3911(para)
+#: C/evolution.xml:3925(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr "Para integrar el calendario de Google en Evolution:"
 
-#: C/evolution.xml:3914(para)
+#: C/evolution.xml:3928(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Pulse Nuevo, después seleccione Calendario para abrir el diálogo Calendario "
 "nuevo."
 
-#: C/evolution.xml:3922(para)
+#: C/evolution.xml:3936(para)
 msgid "Specify the following:"
 msgstr "Especifique lo siguiente:"
 
-#: C/evolution.xml:3926(title)
+#: C/evolution.xml:3940(title)
 msgid "Name:"
 msgstr "Nombre:"
 
-#: C/evolution.xml:3927(para)
+#: C/evolution.xml:3941(para)
 msgid "Specify a name for the Google calendar."
 msgstr "Especifique un nombre para el calendario en Google."
 
-#: C/evolution.xml:3939(para)
+#: C/evolution.xml:3953(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Establezca el tiempo para refrescar el calendario automáticamente."
 
-#: C/evolution.xml:3945(para)
+#: C/evolution.xml:3959(para)
 msgid ""
 "If you want to set a color label for the calendar, click the Color tab, "
 "select the desired color, then click OK."
@@ -9282,7 +9253,7 @@ msgstr ""
 "Si quiere establecer un color para una etiqueta del calendario, pulse la "
 "solapa Color y seleccione el color que desee y pulse Aceptar."
 
-#: C/evolution.xml:3948(para)
+#: C/evolution.xml:3962(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
@@ -9291,14 +9262,14 @@ msgstr ""
 "seleccione la casilla de verificación Copiar el contenido del calendario "
 "localmente para trabajar desconectado."
 
-#: C/evolution.xml:3949(para)
+#: C/evolution.xml:3963(para)
 msgid ""
 "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Si selecciona esta opción, no podrá modificar o crear elementos en el "
 "calendario."
 
-#: C/evolution.xml:3959(para)
+#: C/evolution.xml:3973(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -9312,71 +9283,71 @@ msgstr ""
 "También puede usar la búsqueda de Disponibilidad para las reuniones y "
 "determinar la disponibilidad de los participantes."
 
-#: C/evolution.xml:3962(link) C/evolution.xml:3985(title)
+#: C/evolution.xml:3976(link) C/evolution.xml:3999(title)
 msgid "Appointments"
 msgstr "Citas"
 
-#: C/evolution.xml:3965(link) C/evolution.xml:4157(title)
+#: C/evolution.xml:3979(link) C/evolution.xml:4171(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Enviar una invitación para reunión"
 
-#: C/evolution.xml:3968(link) C/evolution.xml:4246(title)
+#: C/evolution.xml:3982(link) C/evolution.xml:4260(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Aceptar y responder a solicitudes de reuniones"
 
-#: C/evolution.xml:3971(link) C/evolution.xml:4264(title)
+#: C/evolution.xml:3985(link) C/evolution.xml:4278(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Leer respuestas a solicitudes de reunión"
 
-#: C/evolution.xml:3974(link) C/evolution.xml:4269(title)
+#: C/evolution.xml:3988(link) C/evolution.xml:4283(title)
 msgid "Using the Free/Busy View"
 msgstr "Uso de la característica de disponibilidad"
 
-#: C/evolution.xml:3977(link) C/evolution.xml:4298(title)
+#: C/evolution.xml:3991(link) C/evolution.xml:4312(title)
 msgid ""
 "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publicar la información de Disponibilidad de calendario sin un servidor "
 "Groupware"
 
-#: C/evolution.xml:3980(link) C/evolution.xml:4331(title)
+#: C/evolution.xml:3994(link) C/evolution.xml:4345(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
-#: C/evolution.xml:3986(para)
+#: C/evolution.xml:4000(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
 msgstr ""
 "En Evolution, una cita es un acontecimiento que programa para si mismo."
 
-#: C/evolution.xml:3989(link) C/evolution.xml:4003(title)
+#: C/evolution.xml:4003(link) C/evolution.xml:4017(title)
 msgid "Creating Appointments"
 msgstr "Crear de citas"
 
-#: C/evolution.xml:3992(link) C/evolution.xml:4091(title)
-#: C/evolution.xml:5521(title)
+#: C/evolution.xml:4006(link) C/evolution.xml:4105(title)
+#: C/evolution.xml:5533(title)
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: C/evolution.xml:3995(link) C/evolution.xml:4127(title)
+#: C/evolution.xml:4009(link) C/evolution.xml:4141(title)
 msgid "Classifications"
 msgstr "Clasificaciones"
 
-#: C/evolution.xml:3998(link) C/evolution.xml:4150(title)
+#: C/evolution.xml:4012(link) C/evolution.xml:4164(title)
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: C/evolution.xml:4006(para)
+#: C/evolution.xml:4020(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Cita."
 
-#: C/evolution.xml:4008(para)
+#: C/evolution.xml:4022(para)
 msgid ""
 "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 "Pulse el Calendario en el Selector, después pulse Archivo &gt; Nuevo &gt; "
 "Cita."
 
-#: C/evolution.xml:4010(para)
+#: C/evolution.xml:4024(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
 "dialog box. The particular time on the calendar view against which you have "
@@ -9386,33 +9357,33 @@ msgstr ""
 "cuadro de diálogo Cita. Se creará la cita para esa hora en particular en la "
 "vista del calendario sobre la que haya pulsado dos veces."
 
-#: C/evolution.xml:4012(para)
+#: C/evolution.xml:4026(para)
 msgid ""
 "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Seleccione la duración requerida en la vista del calendario y escriba el "
 "resumen."
 
-#: C/evolution.xml:4015(para) C/evolution.xml:4170(para)
+#: C/evolution.xml:4029(para) C/evolution.xml:4184(para)
 msgid "Select a calendar in the Calendar drop-down list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
-#: C/evolution.xml:4016(para) C/evolution.xml:4027(para)
-#: C/evolution.xml:4185(para) C/evolution.xml:4568(para)
-#: C/evolution.xml:4622(para) C/evolution.xml:4854(para)
-#: C/evolution.xml:5920(para)
+#: C/evolution.xml:4030(para) C/evolution.xml:4041(para)
+#: C/evolution.xml:4199(para) C/evolution.xml:4582(para)
+#: C/evolution.xml:4636(para) C/evolution.xml:4868(para)
+#: C/evolution.xml:5932(para)
 msgid "Enter a brief summary in the Summary field."
 msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
 
-#: C/evolution.xml:4021(para) C/evolution.xml:4188(para)
+#: C/evolution.xml:4035(para) C/evolution.xml:4202(para)
 msgid "(Optional) Type a location in the Location field."
 msgstr "(Opcional) escriba una ubicación en el campo Lugar."
 
-#: C/evolution.xml:4024(para)
+#: C/evolution.xml:4038(para)
 msgid "Select the date and time."
 msgstr "Seleccione la fecha y la hora."
 
-#: C/evolution.xml:4030(para) C/evolution.xml:4191(para)
+#: C/evolution.xml:4044(para) C/evolution.xml:4205(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -9420,19 +9391,19 @@ msgstr ""
 "Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
 "Opciones &gt; Acontecimiento para todo el día."
 
-#: C/evolution.xml:4032(para) C/evolution.xml:4193(para)
+#: C/evolution.xml:4046(para) C/evolution.xml:4207(para)
 msgid "Click the All Day Event button on the toolbar."
 msgstr ""
 "Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
 
-#: C/evolution.xml:4035(para) C/evolution.xml:4196(para)
+#: C/evolution.xml:4049(para) C/evolution.xml:4210(para)
 msgid ""
 "If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
 "Si el acontecimiento es un acontecimiento para todo el día, especifique la "
 "fecha de comienzo y la fecha de finalización."
 
-#: C/evolution.xml:4038(para) C/evolution.xml:4199(para)
+#: C/evolution.xml:4052(para) C/evolution.xml:4213(para)
 msgid ""
 "If the event is not an all day event, specify a starting time and an ending "
 "time."
@@ -9440,56 +9411,56 @@ msgstr ""
 "Si el acontecimiento no es un acontecimiento para todo el día, especifique "
 "una hora de comienzo y una hora de finalización."
 
-#: C/evolution.xml:4041(para) C/evolution.xml:4202(para)
+#: C/evolution.xml:4055(para) C/evolution.xml:4216(para)
 msgid "Select For to specify the duration."
 msgstr "Seleccione Durante para especificar la duración."
 
-#: C/evolution.xml:4043(para) C/evolution.xml:4204(para)
+#: C/evolution.xml:4057(para) C/evolution.xml:4218(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr ""
 "Seleccione Hasta para especificar la hora de finalización del acontecimiento."
 
-#: C/evolution.xml:4046(para) C/evolution.xml:4207(para)
-#: C/evolution.xml:4577(para) C/evolution.xml:4628(para)
+#: C/evolution.xml:4060(para) C/evolution.xml:4221(para)
+#: C/evolution.xml:4591(para) C/evolution.xml:4642(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Escriba la información de zona horaria en el campo Zona horaria."
 
-#: C/evolution.xml:4048(para) C/evolution.xml:4209(para)
-#: C/evolution.xml:4579(para) C/evolution.xml:4630(para)
+#: C/evolution.xml:4062(para) C/evolution.xml:4223(para)
+#: C/evolution.xml:4593(para) C/evolution.xml:4644(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Pulse el globo terráqueo para personalizar la zona horaria."
 
-#: C/evolution.xml:4049(para) C/evolution.xml:4210(para)
-#: C/evolution.xml:4580(para) C/evolution.xml:4631(para)
+#: C/evolution.xml:4063(para) C/evolution.xml:4224(para)
+#: C/evolution.xml:4594(para) C/evolution.xml:4645(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
 msgstr ""
 "Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
 
-#: C/evolution.xml:4052(para)
+#: C/evolution.xml:4066(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Para mostrar la hora como ocupada, pulse Opciones &gt; Mostrar hora como "
 "ocupada."
 
-#: C/evolution.xml:4055(para) C/evolution.xml:4133(para)
-#: C/evolution.xml:4583(para) C/evolution.xml:4634(para)
-#: C/evolution.xml:4850(para)
+#: C/evolution.xml:4069(para) C/evolution.xml:4147(para)
+#: C/evolution.xml:4597(para) C/evolution.xml:4648(para)
+#: C/evolution.xml:4864(para)
 msgid "(Optional) Type a category in the Categories field."
 msgstr "(Opcional) escriba una categoría en el campo Categoría."
 
-#: C/evolution.xml:4056(para) C/evolution.xml:4139(para)
-#: C/evolution.xml:4584(para) C/evolution.xml:4635(para)
+#: C/evolution.xml:4070(para) C/evolution.xml:4153(para)
+#: C/evolution.xml:4598(para) C/evolution.xml:4649(para)
 msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:4059(para) C/evolution.xml:4587(para)
-#: C/evolution.xml:4638(para) C/evolution.xml:4860(para)
-#: C/evolution.xml:5929(para)
+#: C/evolution.xml:4073(para) C/evolution.xml:4601(para)
+#: C/evolution.xml:4652(para) C/evolution.xml:4874(para)
+#: C/evolution.xml:5941(para)
 msgid "(Optional) Enter a description in the Description field."
 msgstr "(Opcional) escriba una descripción en el campo Descripción."
 
-#: C/evolution.xml:4062(para) C/evolution.xml:4117(para)
-#: C/evolution.xml:4213(para)
+#: C/evolution.xml:4076(para) C/evolution.xml:4131(para)
+#: C/evolution.xml:4227(para)
 msgid ""
 "To create an alarm for this appointment, click Alarms on the toolbar, or "
 "click Options &gt; Alarms."
@@ -9497,14 +9468,14 @@ msgstr ""
 "Para crear una alerta para esta cita, pulse Alertas en la barra de "
 "herramientas o pulse Opciones &gt; Alertas."
 
-#: C/evolution.xml:4063(para) C/evolution.xml:4120(para)
-#: C/evolution.xml:4214(para)
+#: C/evolution.xml:4077(para) C/evolution.xml:4134(para)
+#: C/evolution.xml:4228(para)
 msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
 "Seleccione Personalizar para añadir o eliminar alertas personalizadas para "
 "el acontecimiento."
 
-#: C/evolution.xml:4064(para) C/evolution.xml:4215(para)
+#: C/evolution.xml:4078(para) C/evolution.xml:4229(para)
 msgid ""
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
@@ -9512,9 +9483,9 @@ msgstr ""
 "Para obtener más información acerca de los recordatorios, vea <link linkend="
 "\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:4067(para) C/evolution.xml:4218(para)
-#: C/evolution.xml:4596(para) C/evolution.xml:4641(para)
-#: C/evolution.xml:4863(para)
+#: C/evolution.xml:4081(para) C/evolution.xml:4232(para)
+#: C/evolution.xml:4610(para) C/evolution.xml:4655(para)
+#: C/evolution.xml:4877(para)
 msgid ""
 "(Optional) To add an attachment, drag and drop the attachment into the "
 "attachment bar."
@@ -9522,9 +9493,9 @@ msgstr ""
 "(Opcional) para añadir un adjunto a la tarea, arrastre y suelte el adjunto "
 "en la barra de adjuntos."
 
-#: C/evolution.xml:4069(para) C/evolution.xml:4220(para)
-#: C/evolution.xml:4598(para) C/evolution.xml:4643(para)
-#: C/evolution.xml:4865(para)
+#: C/evolution.xml:4083(para) C/evolution.xml:4234(para)
+#: C/evolution.xml:4612(para) C/evolution.xml:4657(para)
+#: C/evolution.xml:4879(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -9532,19 +9503,21 @@ msgstr ""
 "Pulse el botón Adjuntar en la barra de herramientas, o pulse Insertar &gt; "
 "Adjunto y después examine para seleccionar el adjunto."
 
-#: C/evolution.xml:4072(para) C/evolution.xml:4223(para)
+#: C/evolution.xml:4086(para) C/evolution.xml:4237(para)
+#: C/evolution.xml:4604(para) C/evolution.xml:4660(para)
+#: C/evolution.xml:4882(para)
 msgid ""
-"(Optional) Select a classification (Public, Private, or Confidential) by "
-"clicking &gt; Options &gt; Classifications."
+"(Optional) Click Options &gt; Classifications, then select a classification "
+"(as Public, Private or Confidential)."
 msgstr ""
-"(Opcional) seleccione una clasificación (Pública, Privada o Confidencial) "
-"pulsando Opciones &gt; Clasificaciones."
+"(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
+"clasificación (como Público, Privado o Confidencial)."
 
-#: C/evolution.xml:4075(para) C/evolution.xml:4226(para)
+#: C/evolution.xml:4089(para) C/evolution.xml:4240(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(Opcional) pulse el botón Repetición en la barra de herramientas."
 
-#: C/evolution.xml:4077(para) C/evolution.xml:4228(para)
+#: C/evolution.xml:4091(para) C/evolution.xml:4242(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -9552,11 +9525,11 @@ msgstr ""
 "Pulse Opciones &gt; Repetición, y especifique cuando y con qué frecuencia "
 "quiere que se repita la cita."
 
-#: C/evolution.xml:4082(title)
+#: C/evolution.xml:4096(title)
 msgid "All Day Event"
 msgstr "Acontecimiento para todo el día"
 
-#: C/evolution.xml:4083(para)
+#: C/evolution.xml:4097(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -9575,7 +9548,7 @@ msgstr ""
 "solaparse. Cuando eso ocurre se muestran con múltiples columnas en la vista "
 "del día del calendario."
 
-#: C/evolution.xml:4084(para)
+#: C/evolution.xml:4098(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -9583,7 +9556,7 @@ msgstr ""
 "Si crea citas que se solapan, Evolution las mostrará lado a lado en el "
 "calendario."
 
-#: C/evolution.xml:4092(para)
+#: C/evolution.xml:4106(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -9593,29 +9566,29 @@ msgstr ""
 "antelación a la cita que ha planificado. Puede tener un recordatorio de cada "
 "uno de los siguientes tipos:"
 
-#: C/evolution.xml:4096(title)
+#: C/evolution.xml:4110(title)
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: C/evolution.xml:4097(para)
+#: C/evolution.xml:4111(para)
 msgid ""
 "A notification pops up on your screen to remind you of your appointment."
 msgstr ""
 "Se abrirá una ventana emergente en su pantalla para recordarle su cita."
 
-#: C/evolution.xml:4102(title)
+#: C/evolution.xml:4116(title)
 msgid "Audio:"
 msgstr "Sonido:"
 
-#: C/evolution.xml:4103(para)
+#: C/evolution.xml:4117(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "Su sistema emitirá un sonido como alerta."
 
-#: C/evolution.xml:4108(title)
+#: C/evolution.xml:4122(title)
 msgid "Program:"
 msgstr "Ejecutar un programa:"
 
-#: C/evolution.xml:4109(para)
+#: C/evolution.xml:4123(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -9623,7 +9596,7 @@ msgstr ""
 "Puede ejecutar un programa como recordatorio. Debe introducir el nombre en "
 "el campo de texto o buscarlo con el botón Explorar."
 
-#: C/evolution.xml:4113(para)
+#: C/evolution.xml:4127(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9633,11 +9606,11 @@ msgstr ""
 "parpadea en el área de notificación. Para pausar la alerta o ver el "
 "acontecimiento, pulse en el icono de notificación."
 
-#: C/evolution.xml:4114(para)
+#: C/evolution.xml:4128(para)
 msgid "To create a reminder:"
 msgstr "Crear un recordatorio:"
 
-#: C/evolution.xml:4123(para)
+#: C/evolution.xml:4137(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
@@ -9653,7 +9626,7 @@ msgstr ""
 "salir de Evolution y aún podrá recibir los recordatorios de las citas "
 "próximas."
 
-#: C/evolution.xml:4128(para)
+#: C/evolution.xml:4142(para)
 msgid ""
 "If you are using a calendar on a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> or Microsoft Exchange server, select a "
@@ -9673,7 +9646,7 @@ msgstr ""
 "del servidor; compruebe con el administrador de su sistema o ajuste su "
 "configuración de delegación."
 
-#: C/evolution.xml:4129(para)
+#: C/evolution.xml:4143(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9688,13 +9661,13 @@ msgstr ""
 "la caja Libre en la selección Mostrar hora como. Generalmente las citas se "
 "muestran como Ocupado."
 
-#: C/evolution.xml:4130(para)
+#: C/evolution.xml:4144(para)
 msgid ""
 "You can categorize appointments in the same way you can categorize contacts."
 msgstr ""
 "Puede categorizar las citas de la misma manera que categoriza contactos."
 
-#: C/evolution.xml:4136(para)
+#: C/evolution.xml:4150(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9702,7 +9675,7 @@ msgstr ""
 "Seleccione la casilla de verificación junto a cada categoría que coincida "
 "con la cita que está creando."
 
-#: C/evolution.xml:4143(para)
+#: C/evolution.xml:4157(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
@@ -9711,7 +9684,7 @@ msgstr ""
 "lista maestra de categorías y a continuación en Pulse aquí para añadir una "
 "categoría."
 
-#: C/evolution.xml:4145(para)
+#: C/evolution.xml:4159(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9721,7 +9694,7 @@ msgstr ""
 "cita. Las categorías seleccionadas se muestran en un cuadro de texto a la "
 "derecha del botón Categorías."
 
-#: C/evolution.xml:4146(para)
+#: C/evolution.xml:4160(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
@@ -9733,7 +9706,7 @@ msgstr ""
 "de una categoría en particular, seleccione la categoría correspondiente en "
 "la barra de búsqueda en la parte superior del calendario."
 
-#: C/evolution.xml:4151(para)
+#: C/evolution.xml:4165(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
@@ -9752,7 +9725,7 @@ msgstr ""
 "de junio de 2008</quote> o <quote>de cada mes el primer viernes en 12 "
 "ocasiones</quote>."
 
-#: C/evolution.xml:4152(para)
+#: C/evolution.xml:4166(para)
 msgid ""
 "After you have finished settings, click the Save button in the toolbar to "
 "save and close the appointment editor window. If you want, you can alter an "
@@ -9767,7 +9740,7 @@ msgstr ""
 "otros ajustes pulsando con el botón derecho sobre la cita y después "
 "eligiendo Abrir o pulsando dos veces sobre la cita."
 
-#: C/evolution.xml:4158(para)
+#: C/evolution.xml:4172(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9777,7 +9750,7 @@ msgstr ""
 "Evolution sirve para organizar reuniones de grupos y ayudarle a gestionar "
 "las respuestas a las solicitudes de reunión."
 
-#: C/evolution.xml:4159(para)
+#: C/evolution.xml:4173(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
 "attendees in several categories, such as <quote>chair</quote> or "
@@ -9790,7 +9763,7 @@ msgstr ""
 "requerido</quote>. Cuando guarde su lista, cada invitado recibirá un mensaje "
 "con los datos de la cita y tendrán la opción de responder."
 
-#: C/evolution.xml:4160(para)
+#: C/evolution.xml:4174(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
@@ -9806,15 +9779,15 @@ msgstr ""
 "destinatarios podrán incluir el acontecimiento en sus calendarios con una "
 "pulsación, pero no le enviarán respuesta acerca de si asistirán o no."
 
-#: C/evolution.xml:4161(para)
+#: C/evolution.xml:4175(para)
 msgid "To schedule a meeting:"
 msgstr "Para planificar una reunión:"
 
-#: C/evolution.xml:4164(para) C/evolution.xml:4274(para)
+#: C/evolution.xml:4178(para) C/evolution.xml:4288(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Reunión."
 
-#: C/evolution.xml:4167(para) C/evolution.xml:4613(para)
+#: C/evolution.xml:4181(para) C/evolution.xml:4627(para)
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
@@ -9822,24 +9795,24 @@ msgstr ""
 "Si tiene múltiples cuentas de correo seleccione la que quiere usar "
 "seleccionando un elemento en el campo Organizador."
 
-#: C/evolution.xml:4173(para) C/evolution.xml:4277(para)
+#: C/evolution.xml:4187(para) C/evolution.xml:4291(para)
 msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Pulse añadir para añadir las direcciones de correo-e de las personas a las "
 "que quiere invitar."
 
-#: C/evolution.xml:4176(para)
+#: C/evolution.xml:4190(para)
 msgid ""
 "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Para quitar un participante de la lista, seleccione un participante y pulse "
 "Quitar."
 
-#: C/evolution.xml:4179(para)
+#: C/evolution.xml:4193(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Para editar un campo, seleccione el campo y pulse Editar."
 
-#: C/evolution.xml:4182(para)
+#: C/evolution.xml:4196(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9847,7 +9820,7 @@ msgstr ""
 "Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
 "Estado y RSVP."
 
-#: C/evolution.xml:4231(para)
+#: C/evolution.xml:4245(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9855,22 +9828,22 @@ msgstr ""
 "Para preguntar la información de Disponibilidad de los asistentes, pulse el "
 "botón Disponibilidad en la barra de herramientas."
 
-#: C/evolution.xml:4233(para)
+#: C/evolution.xml:4247(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Pulse Opciones &gt; Disponibilidad."
 
-#: C/evolution.xml:4236(para)
+#: C/evolution.xml:4250(para)
 msgid "Click Save to save the meeting."
 msgstr "Pulse Guardar para guardar la reunión."
 
-#: C/evolution.xml:4239(para)
+#: C/evolution.xml:4253(para)
 msgid ""
 "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Se enviará un correo-e a todos los destinatarios, invitándoles a su "
 "acontecimiento."
 
-#: C/evolution.xml:4241(para)
+#: C/evolution.xml:4255(para)
 msgid ""
 "In Evolution, a meeting can have only one organizer, and only the organizer "
 "can add participants to that meeting. Though it is possible to change the "
@@ -9887,7 +9860,7 @@ msgstr ""
 "ha invitado el organizador, es recomendable que reenvíe el mensaje de "
 "invitación que recibió del organizador original a los asistentes."
 
-#: C/evolution.xml:4247(para)
+#: C/evolution.xml:4261(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9900,19 +9873,19 @@ msgstr ""
 "fechas. Después puede elegir cómo responder a la invitación. Sus opciones "
 "son:"
 
-#: C/evolution.xml:4250(para)
+#: C/evolution.xml:4264(para)
 msgid "Accept"
 msgstr "Aceptar"
 
-#: C/evolution.xml:4253(para)
+#: C/evolution.xml:4267(para)
 msgid "Tentatively Accept"
 msgstr "Aceptado provisionalmente"
 
-#: C/evolution.xml:4256(para)
+#: C/evolution.xml:4270(para)
 msgid "Decline"
 msgstr "Rehusar"
 
-#: C/evolution.xml:4259(para)
+#: C/evolution.xml:4273(para)
 msgid ""
 "Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
@@ -9920,7 +9893,7 @@ msgstr ""
 "Pulse Aceptar para enviar un correo-e con su respuesta al organizador. Si "
 "acepta el acontecimiento también se añadirá a su calendario."
 
-#: C/evolution.xml:4260(para)
+#: C/evolution.xml:4274(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9930,7 +9903,7 @@ msgstr ""
 "a la información, pero si el organizador original envía otra actualización, "
 "sus cambios se sobreescribirán."
 
-#: C/evolution.xml:4265(para)
+#: C/evolution.xml:4279(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
 "inline by clicking the attachment and selecting View Inline."
@@ -9938,7 +9911,7 @@ msgstr ""
 "Cuando reciba una respuesta a su invitación de reunión, podrá verla incluida "
 "dentro del mensaje pulsando el adjunto y seleccionando Ver incluido."
 
-#: C/evolution.xml:4270(para)
+#: C/evolution.xml:4284(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9959,18 +9932,18 @@ msgstr ""
 "todavía puede usar los acontecimientos iCal en forma de invitaciones para "
 "coordinar las agendas con otras personas."
 
-#: C/evolution.xml:4271(para)
+#: C/evolution.xml:4285(para)
 msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
-#: C/evolution.xml:4280(para)
+#: C/evolution.xml:4294(para)
 msgid ""
 "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Pulse el botón Disponibilidad en la barra de herramientas o pulse Opciones "
 "&gt; Disponibilidad."
 
-#: C/evolution.xml:4285(para)
+#: C/evolution.xml:4299(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
@@ -9983,22 +9956,22 @@ msgstr ""
 "actualizados automáticamente, el resto recibirá una notificación por correo "
 "electrónico de cualquier cambio en los planes."
 
-#: C/evolution.xml:4289(title)
+#: C/evolution.xml:4303(title)
 msgid "Attendee List:"
 msgstr "Lista de asistentes:"
 
-#: C/evolution.xml:4290(para)
+#: C/evolution.xml:4304(para)
 msgid ""
 "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 "La Lista de asistentes muestra a las personas que han sido invitadas a la "
 "reunión."
 
-#: C/evolution.xml:4293(title)
+#: C/evolution.xml:4307(title)
 msgid "Schedule Grid:"
 msgstr "Cuadrícula de planificación:"
 
-#: C/evolution.xml:4294(para)
+#: C/evolution.xml:4308(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -10017,7 +9990,7 @@ msgstr ""
 "un URL y ha introducido ese URL en la tarjeta del contacto usando el editor "
 "de contactos."
 
-#: C/evolution.xml:4299(para)
+#: C/evolution.xml:4313(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -10029,15 +10002,15 @@ msgstr ""
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
-#: C/evolution.xml:4300(para)
+#: C/evolution.xml:4314(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Para establecer la disponibilidad de publicación de un Calendario:"
 
-#: C/evolution.xml:4303(para) C/evolution.xml:5037(para)
+#: C/evolution.xml:4317(para) C/evolution.xml:5051(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr "Pulse Editar &gt; Preferencias, después pulse Calendario y tareas."
 
-#: C/evolution.xml:4306(para)
+#: C/evolution.xml:4320(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -10045,23 +10018,23 @@ msgstr ""
 "Pulse en la solapa Publicación de calendarios, pulse Añadir, después "
 "seleccione la información que quiere publicar."
 
-#: C/evolution.xml:4309(para)
+#: C/evolution.xml:4323(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Seleccione la frecuencia con la que quiere subir datos."
 
-#: C/evolution.xml:4312(para)
+#: C/evolution.xml:4326(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Seleccione los calendarios para los que quiere mostrar los datos."
 
-#: C/evolution.xml:4315(para)
+#: C/evolution.xml:4329(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Especifique la ubicación para publicar en el servidor de subidas."
 
-#: C/evolution.xml:4318(para)
+#: C/evolution.xml:4332(para)
 msgid "Type your username and password."
 msgstr "Escriba su nombre de usuario y contraseña."
 
-#: C/evolution.xml:4324(para)
+#: C/evolution.xml:4338(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -10070,13 +10043,13 @@ msgstr ""
 "herramienta del Calendario y pulse Acciones &gt; Publicar información del "
 "calendario."
 
-#: C/evolution.xml:4326(para) C/evolution.xml:6879(para)
+#: C/evolution.xml:4340(para) C/evolution.xml:6894(para)
 msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Puede especificar una plantilla para usar cuando publique contra el servidor "
 "de disponibilidad."
 
-#: C/evolution.xml:4332(para)
+#: C/evolution.xml:4346(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -10089,7 +10062,7 @@ msgstr ""
 "reunión con ellos, Evolution comprueba los horarios y los muestra en los "
 "datos de Disponibilidad."
 
-#: C/evolution.xml:4339(para)
+#: C/evolution.xml:4353(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Calendar items."
@@ -10097,7 +10070,7 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos del Calendario."
 
-#: C/evolution.xml:4342(para)
+#: C/evolution.xml:4356(para)
 msgid ""
 "Evolution enables you to find the Calendar items by using a Customized "
 "Search."
@@ -10105,52 +10078,52 @@ msgstr ""
 "Evolution le permite buscar los elementos del Calendario usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4352(para) C/evolution.xml:4668(para)
-#: C/evolution.xml:4904(para)
+#: C/evolution.xml:4366(para) C/evolution.xml:4682(para)
+#: C/evolution.xml:4918(para)
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: C/evolution.xml:4355(para) C/evolution.xml:4671(para)
-#: C/evolution.xml:4907(para)
+#: C/evolution.xml:4369(para) C/evolution.xml:4685(para)
+#: C/evolution.xml:4921(para)
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: C/evolution.xml:4358(para) C/evolution.xml:4674(para)
-#: C/evolution.xml:4910(para)
+#: C/evolution.xml:4372(para) C/evolution.xml:4688(para)
+#: C/evolution.xml:4924(para)
 msgid "Any field Contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:4363(para) C/evolution.xml:4915(para)
+#: C/evolution.xml:4377(para) C/evolution.xml:4929(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution muestra los elementos del Calendario deseados."
 
-#: C/evolution.xml:4375(para) C/evolution.xml:4689(para)
-#: C/evolution.xml:4927(para)
+#: C/evolution.xml:4389(para) C/evolution.xml:4703(para)
+#: C/evolution.xml:4941(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Seleccione Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda "
 "avanzada."
 
-#: C/evolution.xml:4376(para) C/evolution.xml:4690(para)
-#: C/evolution.xml:4928(para)
+#: C/evolution.xml:4390(para) C/evolution.xml:4704(para)
+#: C/evolution.xml:4942(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 "El campo de búsqueda de nombre muestra el tipo de búsqueda que ha "
 "seleccionado."
 
-#: C/evolution.xml:4381(para) C/evolution.xml:4695(para)
-#: C/evolution.xml:4933(para)
+#: C/evolution.xml:4395(para) C/evolution.xml:4709(para)
+#: C/evolution.xml:4947(para)
 msgid "Click Add to add rules."
 msgstr "Pulse Añadir para añadir reglas."
 
-#: C/evolution.xml:4384(para) C/evolution.xml:4698(para)
-#: C/evolution.xml:4936(para)
+#: C/evolution.xml:4398(para) C/evolution.xml:4712(para)
+#: C/evolution.xml:4950(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Seleccione el criterio y después escriba una entrada de búsqueda en el campo "
 "proporcionado."
 
-#: C/evolution.xml:4395(para)
+#: C/evolution.xml:4409(para)
 msgid ""
 "Displays all the Calendar items that match the criteria that you have "
 "selected from the drop-down list in the Search bar."
@@ -10158,43 +10131,43 @@ msgstr ""
 "Muestra todos los elementos del Calendario que coincidan con los criterios "
 "que haya seleccionado de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4399(para) C/evolution.xml:4951(para)
+#: C/evolution.xml:4413(para) C/evolution.xml:4965(para)
 msgid "Click the Show drop-down list."
 msgstr "Pulse Mostrar la lista desplegable."
 
-#: C/evolution.xml:4405(para) C/evolution.xml:4747(para)
-#: C/evolution.xml:4957(para)
+#: C/evolution.xml:4419(para) C/evolution.xml:4761(para)
+#: C/evolution.xml:4971(para)
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: C/evolution.xml:4408(para) C/evolution.xml:4750(para)
-#: C/evolution.xml:4960(para)
+#: C/evolution.xml:4422(para) C/evolution.xml:4764(para)
+#: C/evolution.xml:4974(para)
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: C/evolution.xml:4411(para)
+#: C/evolution.xml:4425(para)
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: C/evolution.xml:4414(para)
+#: C/evolution.xml:4428(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: C/evolution.xml:4429(para) C/evolution.xml:4780(para)
+#: C/evolution.xml:4443(para) C/evolution.xml:4794(para)
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:4482(para)
+#: C/evolution.xml:4496(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr "Puede ver los elementos deseados listados en la vista del Calendario."
 
-#: C/evolution.xml:4487(para)
+#: C/evolution.xml:4501(para)
 msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Para imprimir los elementos mostrados del calendario pulse Archivo &gt; "
 "Imprimir."
 
-#: C/evolution.xml:4492(para)
+#: C/evolution.xml:4506(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -10205,29 +10178,29 @@ msgstr ""
 "introduzca el número de días de acontecimientos pasados que quiere mantener. "
 "Pulse Aceptar para purgar los elementos."
 
-#: C/evolution.xml:4497(para)
+#: C/evolution.xml:4511(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Sólo los asistentes a una reunión pueden delegar una reunión."
 
-#: C/evolution.xml:4500(para)
+#: C/evolution.xml:4514(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho en la reunión que quiere "
 "delegar."
 
-#: C/evolution.xml:4503(para)
+#: C/evolution.xml:4517(para)
 msgid "Click Delegate Meeting."
 msgstr "Pulse Delegar reunión."
 
-#: C/evolution.xml:4506(para)
+#: C/evolution.xml:4520(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Seleccione los contactos a los que quiere delegar la reunión."
 
-#: C/evolution.xml:4512(para)
+#: C/evolution.xml:4526(para)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Cada contacto recibe una copia de la invitación a la reunión."
 
-#: C/evolution.xml:4517(para)
+#: C/evolution.xml:4531(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -10249,7 +10222,7 @@ msgstr ""
 "añadido el calendario de un equipo de deporte a su calendario, puede que no "
 "necesite actualizarlo más de una vez por semana."
 
-#: C/evolution.xml:4518(para)
+#: C/evolution.xml:4532(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -10261,7 +10234,7 @@ msgstr ""
 "fiestas nacionales y religiosas, fases de la luna, deportes y "
 "acontecimientos locales y regionales."
 
-#: C/evolution.xml:4519(para)
+#: C/evolution.xml:4533(para)
 msgid ""
 "Evolution lets you view and manage calendars on remote CalDAV servers. The "
 "procedure to create a CalDAV calendar source is similar to that of a remote "
@@ -10273,7 +10246,7 @@ msgstr ""
 "calendario Web remoto. Puede ver y crear acontecimientos en las cuentas "
 "CalDAV igual que en los otros calendarios de Evolution."
 
-#: C/evolution.xml:4524(para)
+#: C/evolution.xml:4538(para)
 msgid ""
 "The Task List, located in the upper-right corner of the calendar, lets you "
 "keep a list of tasks separate from your calendar appointments."
@@ -10282,7 +10255,7 @@ msgstr ""
 "calendario, permite mantener la lista de tareas separada de las citas del "
 "calendario."
 
-#: C/evolution.xml:4525(para)
+#: C/evolution.xml:4539(para)
 msgid ""
 "You can use the list in a larger window by clicking the Tasks button in the "
 "side bar."
@@ -10290,7 +10263,7 @@ msgstr ""
 "Puede usar la lista en la ventana más grande pulsando el botón Tareas en la "
 "barra lateral."
 
-#: C/evolution.xml:4526(para)
+#: C/evolution.xml:4540(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -10304,35 +10277,35 @@ msgstr ""
 "calendario aparecen las tareas de todas las listas de tareas, coloreadas por "
 "su código de lista."
 
-#: C/evolution.xml:4529(link) C/evolution.xml:4540(title)
+#: C/evolution.xml:4543(link) C/evolution.xml:4554(title)
 msgid "Creating a New Task List"
 msgstr "Crear una nueva lista de tareas"
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4532(link) C/evolution.xml:4559(title)
+#: C/evolution.xml:4546(link) C/evolution.xml:4573(title)
 msgid "Creating a New Task"
 msgstr "Crear una tarea nueva"
 
-#: C/evolution.xml:4535(link) C/evolution.xml:4604(title)
+#: C/evolution.xml:4549(link) C/evolution.xml:4618(title)
 msgid "Assigned Tasks"
 msgstr "Tareas asignadas"
 
-#: C/evolution.xml:4543(para)
+#: C/evolution.xml:4557(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de tareas."
 
-#: C/evolution.xml:4546(para)
+#: C/evolution.xml:4560(para)
 msgid "Specify the name and color for the task list."
 msgstr "Especifique el nombre y el color para la lista de tareas."
 
-#: C/evolution.xml:4549(para)
+#: C/evolution.xml:4563(para)
 msgid ""
 "(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(Opcional) Si la tarea es una lista en línea, especifique el URL de la lista "
 "de tareas."
 
-#: C/evolution.xml:4555(para)
+#: C/evolution.xml:4569(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
@@ -10352,36 +10325,27 @@ msgstr ""
 "dirección y tipo de ordenación, o pulse con el botón derecho para añadir o "
 "eliminar columnas desde la pantalla."
 
-#: C/evolution.xml:4562(para)
+#: C/evolution.xml:4576(para)
 msgid "Click File &gt; New &gt; Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea."
 
-#: C/evolution.xml:4565(para) C/evolution.xml:4616(para)
+#: C/evolution.xml:4579(para) C/evolution.xml:4630(para)
 msgid "Select a group for the task."
 msgstr "Seleccione un grupo para la tarea."
 
-#: C/evolution.xml:4571(para)
+#: C/evolution.xml:4585(para)
 msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(Opcional) especifique una fecha de comienzo y una fecha de finalización "
 "para la tarea."
 
-#: C/evolution.xml:4574(para)
+#: C/evolution.xml:4588(para)
 msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(Opcional) especifique una hora de comienzo y una hora de finalización para "
 "la tarea."
 
-#: C/evolution.xml:4590(para) C/evolution.xml:4646(para)
-#: C/evolution.xml:4868(para)
-msgid ""
-"(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential)."
-msgstr ""
-"(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
-"clasificación (como Público, Privado o Confidencial)."
-
-#: C/evolution.xml:4593(para) C/evolution.xml:4649(para)
+#: C/evolution.xml:4607(para) C/evolution.xml:4663(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -10389,11 +10353,11 @@ msgstr ""
 "(Opcional) para especificar un estado para la tarea, pulse Opciones &gt; "
 "Detalles del estado."
 
-#: C/evolution.xml:4605(para)
+#: C/evolution.xml:4619(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution se puede usar para asignar una tarea a varias personas."
 
-#: C/evolution.xml:4606(para)
+#: C/evolution.xml:4620(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as <quote>chair</quote> or <quote>required.</quote> When you save the "
@@ -10406,15 +10370,15 @@ msgstr ""
 "datos de la cita y tendrán la opción de responder."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4607(para)
+#: C/evolution.xml:4621(para)
 msgid "To assign a new task:"
 msgstr "Asignar una tarea nueva:"
 
-#: C/evolution.xml:4610(para)
+#: C/evolution.xml:4624(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea asignada."
 
-#: C/evolution.xml:4619(para)
+#: C/evolution.xml:4633(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
 "email addresses of people you want to assign the task. To remove an attendee "
@@ -10429,7 +10393,7 @@ msgstr ""
 "el campo y después pulse Editar. Pulse Ver en la barra de menú para mostrar "
 "u ocultar los campos Tipo, Rol, Estado y RSVP."
 
-#: C/evolution.xml:4625(para)
+#: C/evolution.xml:4639(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -10437,22 +10401,22 @@ msgstr ""
 "(Opcional) especifique una fecha y hora de comienzo y una fecha y hora de "
 "caducidad para la tarea."
 
-#: C/evolution.xml:4655(title)
+#: C/evolution.xml:4669(title)
 msgid "Searching for Task Items"
 msgstr "Buscar elementos de las tareas"
 
-#: C/evolution.xml:4658(para)
+#: C/evolution.xml:4672(para)
 msgid ""
 "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las tareas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4679(para)
+#: C/evolution.xml:4693(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution muestra los elementos de las tareas deseados."
 
-#: C/evolution.xml:4703(para)
+#: C/evolution.xml:4717(para)
 msgid ""
 "Displays all the task items that match the criteria that you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -10461,7 +10425,7 @@ msgstr ""
 "que haya seleccionado de la lista desplegable en la parte superior "
 "izquierda, justo encima del panel de visualización."
 
-#: C/evolution.xml:4705(para)
+#: C/evolution.xml:4719(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10471,19 +10435,19 @@ msgstr ""
 "permite ver rápidamente cuándo vencen las tareas, ya que puede ser "
 "interesante para planificarse si tiene muchas tareas entre manos."
 
-#: C/evolution.xml:4707(title)
+#: C/evolution.xml:4721(title)
 msgid "Any Category:"
 msgstr "Cualquier categoría:"
 
-#: C/evolution.xml:4708(para)
+#: C/evolution.xml:4722(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr "Muestra todas las tareas que están bajo cualquier categoría."
 
-#: C/evolution.xml:4711(title)
+#: C/evolution.xml:4725(title)
 msgid "Unmatched:"
 msgstr "No coincidente:"
 
-#: C/evolution.xml:4712(para)
+#: C/evolution.xml:4726(para)
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
@@ -10491,20 +10455,20 @@ msgstr ""
 "Muestra todas las tareas que no están bajo ninguna de las categorías aquí "
 "listadas."
 
-#: C/evolution.xml:4715(title)
+#: C/evolution.xml:4729(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tareas de los próximos 7 días:"
 
-#: C/evolution.xml:4716(para)
+#: C/evolution.xml:4730(para)
 msgid "Displays all the active tasks that are due within the next seven days."
 msgstr ""
 "Muestra todas las tareas activas que vencerán en los próximos siete días."
 
-#: C/evolution.xml:4719(title)
+#: C/evolution.xml:4733(title)
 msgid "Active Tasks:"
 msgstr "Tareas activas:"
 
-#: C/evolution.xml:4720(para)
+#: C/evolution.xml:4734(para)
 msgid ""
 "Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
@@ -10512,35 +10476,35 @@ msgstr ""
 "Muestra todas las tareas cuya fecha de vencimiento está por llegar. Esto le "
 "permite ver la fecha de vencimiento de las tareas que caducan en el futuro."
 
-#: C/evolution.xml:4723(title)
+#: C/evolution.xml:4737(title)
 msgid "Over Due Tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:4724(para)
+#: C/evolution.xml:4738(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr "Muestra todas las tareas cuya fecha de vencimiento ya ha pasado."
 
-#: C/evolution.xml:4727(title)
+#: C/evolution.xml:4741(title)
 msgid "Completed Tasks:"
 msgstr "Tareas completadas:"
 
-#: C/evolution.xml:4728(para)
+#: C/evolution.xml:4742(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr "Muestra las tareas cuyo estado es 100% completado."
 
-#: C/evolution.xml:4731(title)
+#: C/evolution.xml:4745(title)
 msgid "Tasks With Attachment:"
 msgstr "Tareas con adjuntos:"
 
-#: C/evolution.xml:4732(para)
+#: C/evolution.xml:4746(para)
 msgid "Displays all the tasks with attachments."
 msgstr "Muestra todas las tareas con adjuntos."
 
-#: C/evolution.xml:4735(title)
+#: C/evolution.xml:4749(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Lista de categorías&gt;:"
 
-#: C/evolution.xml:4736(para)
+#: C/evolution.xml:4750(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
 "Anniversary, Holidays, Gifts, etc."
@@ -10548,47 +10512,47 @@ msgstr ""
 "Lista todas las tareas que pertenezcan a una categoría particular tal como "
 "Aniversarios, Vacaciones, Reglados, etc."
 
-#: C/evolution.xml:4738(para)
+#: C/evolution.xml:4752(para)
 msgid "To perform quick search,"
 msgstr "Para realizar una búsqueda rápida,"
 
-#: C/evolution.xml:4741(para)
+#: C/evolution.xml:4755(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Pulse sobre la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4753(para)
+#: C/evolution.xml:4767(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: C/evolution.xml:4756(para)
+#: C/evolution.xml:4770(para)
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: C/evolution.xml:4759(para)
+#: C/evolution.xml:4773(para)
 msgid "Over Due Tasks"
 msgstr "Tareas vencidas"
 
-#: C/evolution.xml:4762(para)
+#: C/evolution.xml:4776(para)
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: C/evolution.xml:4765(para)
+#: C/evolution.xml:4779(para)
 msgid "Tasks With Attachments"
 msgstr "Tareas con adjuntos"
 
-#: C/evolution.xml:4789(para) C/evolution.xml:4984(para)
+#: C/evolution.xml:4803(para) C/evolution.xml:4998(para)
 msgid "Holidays"
 msgstr "Vacaciones"
 
-#: C/evolution.xml:4801(para) C/evolution.xml:4996(para)
+#: C/evolution.xml:4815(para) C/evolution.xml:5010(para)
 msgid "Key Customers"
 msgstr "Clientes clave"
 
-#: C/evolution.xml:4833(para)
+#: C/evolution.xml:4847(para)
 msgid "You can view the desired items listed in the Task view."
 msgstr "Puede ver los elementos deseados listados en la vista de tareas."
 
-#: C/evolution.xml:4839(para)
+#: C/evolution.xml:4853(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10596,23 +10560,23 @@ msgstr ""
 "En Evolution, el componente de Notas le permite crear, editar y almacenar "
 "entradas sin fecha de su diario, usando el sistema de archivos como «backend»."
 
-#: C/evolution.xml:4841(para)
+#: C/evolution.xml:4855(para)
 msgid "To create a new memo entry:"
 msgstr "Crear una nueva nota:"
 
-#: C/evolution.xml:4844(para)
+#: C/evolution.xml:4858(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota."
 
-#: C/evolution.xml:4847(para) C/evolution.xml:5917(para)
+#: C/evolution.xml:4861(para) C/evolution.xml:5929(para)
 msgid "Select the Group in which you would like to create the entry."
 msgstr "Seleccione el grupo en el que quiere crear la entrada."
 
-#: C/evolution.xml:4851(para)
+#: C/evolution.xml:4865(para)
 msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:4857(para) C/evolution.xml:5923(para)
+#: C/evolution.xml:4871(para) C/evolution.xml:5935(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -10620,11 +10584,11 @@ msgstr ""
 "En el campo Fecha de inicio escriba la fecha en la que esta nota "
 "recordatoria debería aparecer en los calendarios de los Destinatarios."
 
-#: C/evolution.xml:4873(title)
+#: C/evolution.xml:4887(title)
 msgid "The Memo List"
 msgstr "La lista de notas"
 
-#: C/evolution.xml:4874(para)
+#: C/evolution.xml:4888(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
 "list is assigned a color, and you can use the side bar to hide and show memo "
@@ -10634,23 +10598,23 @@ msgstr ""
 "notas. Cada lista de notas tendrá su color y podrá usar el selector de Notas "
 "para mostrar y ocultar las notas."
 
-#: C/evolution.xml:4875(para)
+#: C/evolution.xml:4889(para)
 msgid "To create a new memo list:"
 msgstr "Crear una nueva lista de notas:"
 
-#: C/evolution.xml:4878(para)
+#: C/evolution.xml:4892(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de notas."
 
-#: C/evolution.xml:4881(para)
+#: C/evolution.xml:4895(para)
 msgid "Enter the type, name and color for the memo list."
 msgstr "Escriba el tipo, nombre y color para la lista de notas."
 
-#: C/evolution.xml:4890(title)
+#: C/evolution.xml:4904(title)
 msgid "Searching for Memo Items"
 msgstr "Buscar elementos de las notas"
 
-#: C/evolution.xml:4891(para)
+#: C/evolution.xml:4905(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Memo Items."
@@ -10658,18 +10622,18 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos de las notas."
 
-#: C/evolution.xml:4894(para)
+#: C/evolution.xml:4908(para)
 msgid ""
 "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las notas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4924(para)
+#: C/evolution.xml:4938(para)
 msgid "Select the desired search type from the drop-down list."
 msgstr "Seleccione la opción de búsqueda que desea de la lista desplegable."
 
-#: C/evolution.xml:4947(para)
+#: C/evolution.xml:4961(para)
 msgid ""
 "Displays all the Memo items that match the criteria that you have selected "
 "from the Show drop-down list in the Search bar."
@@ -10677,11 +10641,11 @@ msgstr ""
 "Muestra todos los elementos de las notas que coincidan con los criterios que "
 "haya seleccionado ç de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:5026(para)
+#: C/evolution.xml:5040(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr "Puede ver los elementos deseados listados en la vista del notas."
 
-#: C/evolution.xml:5034(para)
+#: C/evolution.xml:5048(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10690,20 +10654,20 @@ msgstr ""
 "archivos de calendario con amigos o compañeros de trabajo es bastante "
 "posible que tenga que configurar su zona horaria."
 
-#: C/evolution.xml:5040(para)
+#: C/evolution.xml:5054(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr ""
 "Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
 
-#: C/evolution.xml:5041(para)
+#: C/evolution.xml:5055(para)
 msgid "Each red dot represents a major city."
 msgstr "Cada punto rojo representa una gran ciudad."
 
-#: C/evolution.xml:5044(para)
+#: C/evolution.xml:5058(para)
 msgid "Select a city, then click OK."
 msgstr "Seleccione una ciudad, después pulse Aceptar."
 
-#: C/evolution.xml:5047(para)
+#: C/evolution.xml:5061(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10720,11 +10684,11 @@ msgstr ""
 "las llamadas con varias horas de diferencia. Usar las zonas horarias "
 "adecuadas en cada cita ayuda a evitar esa confusión potencial."
 
-#: C/evolution.xml:5051(title)
+#: C/evolution.xml:5065(title)
 msgid "Marcus Bains Line"
 msgstr "Línea Marcus Bains"
 
-#: C/evolution.xml:5052(para)
+#: C/evolution.xml:5066(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
 "feature is available in the Evolution calendar."
@@ -10732,7 +10696,7 @@ msgstr ""
 "La línea Marcus Bains es un marcador para mostrar la fecha y hora actuales. "
 "Ahora esta característica está disponible en el calendario de Evolution."
 
-#: C/evolution.xml:5058(para)
+#: C/evolution.xml:5072(para)
 msgid ""
 "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
 "Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
@@ -10743,28 +10707,28 @@ msgstr ""
 "2000 y 2003. Al igual que Evolution, es software libre y está licenciado "
 "bajo la GPL."
 
-#: C/evolution.xml:5061(link) C/evolution.xml:5081(title)
+#: C/evolution.xml:5075(link) C/evolution.xml:5095(title)
 msgid "Evolution Exchange Features"
 msgstr "Características de Evolution Exchange"
 
-#: C/evolution.xml:5064(link) C/evolution.xml:5183(title)
+#: C/evolution.xml:5078(link) C/evolution.xml:5197(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Añadir su cuenta Exchange a Evolution"
 
-#: C/evolution.xml:5067(link) C/evolution.xml:5301(title)
+#: C/evolution.xml:5081(link) C/evolution.xml:5313(title)
 msgid "Accessing the Exchange Server"
 msgstr "Acceder al servidor Exchange"
 
-#: C/evolution.xml:5070(link) C/evolution.xml:5309(title)
+#: C/evolution.xml:5084(link) C/evolution.xml:5321(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Ajustes exclusivos de Evolution Exchange"
 
-#: C/evolution.xml:5073(link) C/evolution.xml:5332(link)
-#: C/evolution.xml:5554(title)
+#: C/evolution.xml:5087(link) C/evolution.xml:5344(link)
+#: C/evolution.xml:5566(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planificar citas según disponibilidad"
 
-#: C/evolution.xml:5077(para)
+#: C/evolution.xml:5091(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10774,24 +10738,24 @@ msgstr ""
 "habilitar el componente Outlook Web Access. Cada usuario debe disponer de "
 "una cuenta válida en el servidor Microsoft Exchange, incluida la licencia."
 
-#: C/evolution.xml:5082(para)
+#: C/evolution.xml:5096(para)
 msgid ""
 "Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange soporta las siguientes características básicas de "
 "Microsoft Exchange:"
 
-#: C/evolution.xml:5085(para) C/evolution.xml:6735(link)
-#: C/evolution.xml:6746(title) C/evolution.xml:6794(link)
-#: C/evolution.xml:6808(title)
+#: C/evolution.xml:5099(para) C/evolution.xml:6750(link)
+#: C/evolution.xml:6761(title) C/evolution.xml:6809(link)
+#: C/evolution.xml:6823(title)
 msgid "General"
 msgstr "General"
 
-#: C/evolution.xml:5089(title)
+#: C/evolution.xml:5103(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Almacén remoto de información de Exchange:"
 
-#: C/evolution.xml:5090(para)
+#: C/evolution.xml:5104(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10800,19 +10764,19 @@ msgstr ""
 "carpeta Lista de direcciones globales), calendarios y carpetas de tareas en "
 "un servidor Exchange desde Evolution."
 
-#: C/evolution.xml:5095(title)
+#: C/evolution.xml:5109(title)
 msgid "Palm Synchronization:"
 msgstr "Sincronización con Palm:"
 
-#: C/evolution.xml:5096(para)
+#: C/evolution.xml:5110(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Compatibilidad con los contactos y calendarios de Exchange."
 
-#: C/evolution.xml:5101(title)
+#: C/evolution.xml:5115(title)
 msgid "Password Management:"
 msgstr "Gestión de contraseñas:"
 
-#: C/evolution.xml:5102(para)
+#: C/evolution.xml:5116(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10820,15 +10784,15 @@ msgstr ""
 "Le permite borrar su contraseña. Si su contraseña ha caducado, Evolution le "
 "pregunta si quiere cambiarla durante el inicio."
 
-#: C/evolution.xml:5108(para) C/evolution.xml:5643(para)
+#: C/evolution.xml:5122(para) C/evolution.xml:5655(para)
 msgid "Mail"
 msgstr "Correo"
 
-#: C/evolution.xml:5112(title)
+#: C/evolution.xml:5126(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Ver correo en carpetas Exchange:"
 
-#: C/evolution.xml:5113(para)
+#: C/evolution.xml:5127(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10836,11 +10800,11 @@ msgstr ""
 "El correo almacenado en el servidor Exchange se verá en el componente de "
 "correo de Evolution."
 
-#: C/evolution.xml:5118(title)
+#: C/evolution.xml:5132(title)
 msgid "Sending Email via Exchange Protocols:"
 msgstr "Envío de correo mediante protocolos Exchange:"
 
-#: C/evolution.xml:5119(para)
+#: C/evolution.xml:5133(para)
 msgid ""
 "If you use the Microsoft Exchange mail transport protocol to send email, "
 "make sure that the address you have entered as your email address is exactly "
@@ -10855,11 +10819,11 @@ msgstr ""
 "<quote>sunombre@exchange-server.ejemplo.com</quote> en lugar de "
 "<quote>sunombre@ejemplo.com.</quote>."
 
-#: C/evolution.xml:5124(title)
+#: C/evolution.xml:5138(title)
 msgid "Out of Office Message:"
 msgstr "Mensaje de Estoy fuera de la oficina:"
 
-#: C/evolution.xml:5125(para)
+#: C/evolution.xml:5139(para)
 msgid ""
 "You can set <quote>out of Office</quote> message that will automatically be "
 "sent to people who send mail to you while you are away from office."
@@ -10868,11 +10832,11 @@ msgstr ""
 "enviará automáticamente a las personas que le envíen correos mientras está "
 "fuera de la oficina."
 
-#: C/evolution.xml:5130(title)
+#: C/evolution.xml:5144(title)
 msgid "Send Options:"
 msgstr "Opciones de envío:"
 
-#: C/evolution.xml:5131(para)
+#: C/evolution.xml:5145(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is. You can also enable "
@@ -10883,16 +10847,16 @@ msgstr ""
 "activar la confirmación de envío de mensaje y de lectura de mensaje para los "
 "mensajes enviados."
 
-#: C/evolution.xml:5137(para) C/evolution.xml:5666(para)
-#: C/evolution.xml:7314(link) C/evolution.xml:7384(title)
+#: C/evolution.xml:5151(para) C/evolution.xml:5678(para)
+#: C/evolution.xml:7328(link) C/evolution.xml:7398(title)
 msgid "Calendar"
 msgstr "Calendario"
 
-#: C/evolution.xml:5141(title)
+#: C/evolution.xml:5155(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Solicitud y convocatoria de reuniones:"
 
-#: C/evolution.xml:5142(para)
+#: C/evolution.xml:5156(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10902,11 +10866,11 @@ msgstr ""
 "cuando están ocupados los otros usuarios de acuerdo con sus calendarios y "
 "enviar peticiones de reunión de forma consecuente."
 
-#: C/evolution.xml:5147(title)
+#: C/evolution.xml:5161(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Añadir solicitudes de reuniones iCalendar al calendario:"
 
-#: C/evolution.xml:5148(para)
+#: C/evolution.xml:5162(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10916,24 +10880,24 @@ msgstr ""
 "calendario Exchange. Nótese que necesita especificar el calendario de la "
 "lista, en la que quiere añadir sus horarios de reuniones."
 
-#: C/evolution.xml:5154(para) C/evolution.xml:5578(para)
-#: C/evolution.xml:5677(para)
+#: C/evolution.xml:5168(para) C/evolution.xml:5590(para)
+#: C/evolution.xml:5689(para)
 msgid "Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:5158(title)
+#: C/evolution.xml:5172(title)
 msgid "Address Completion:"
 msgstr "Autocompletado de direcciones:"
 
-#: C/evolution.xml:5159(para)
+#: C/evolution.xml:5173(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Soporte para sus carpeta de contactos Exchange."
 
-#: C/evolution.xml:5164(title)
+#: C/evolution.xml:5178(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Añadir vCards a la libreta de direcciones:"
 
-#: C/evolution.xml:5165(para)
+#: C/evolution.xml:5179(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book. New Address Book entries can also be created on Exchange from "
@@ -10944,11 +10908,11 @@ msgstr ""
 "también se pueden crear desde mensajes de correo-e recibidos con una sola "
 "pulsación."
 
-#: C/evolution.xml:5171(para)
+#: C/evolution.xml:5185(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "«Trabajar desconectado» (modo desconectado)"
 
-#: C/evolution.xml:5172(para)
+#: C/evolution.xml:5186(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10960,11 +10924,11 @@ msgstr ""
 "carpeta localmente para operación desconectada. Para obtener más información "
 "vea <link linkend=\"usage-mail-getnsend-offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:5177(para)
+#: C/evolution.xml:5191(para)
 msgid "Recall Message function is not available."
 msgstr "La función Recordar mensaje no está disponible."
 
-#: C/evolution.xml:5184(para)
+#: C/evolution.xml:5198(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10972,35 +10936,35 @@ msgstr ""
 "Después de instalar Evolution Exchange, necesita configurar el acceso a su "
 "cuenta Exchange tanto en el servidor Exchange como en Evolution."
 
-#: C/evolution.xml:5187(link) C/evolution.xml:5204(title)
+#: C/evolution.xml:5201(link) C/evolution.xml:5218(title)
 msgid "Exchange Server Settings"
 msgstr "Configuración del servidor Exchange"
 
-#: C/evolution.xml:5190(link) C/evolution.xml:5218(title)
+#: C/evolution.xml:5204(link) C/evolution.xml:5232(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Herramienta de configuración estándar para Evolution Exchange"
 
-#: C/evolution.xml:5193(link) C/evolution.xml:5222(title)
+#: C/evolution.xml:5207(link) C/evolution.xml:5236(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Herramienta sencilla de configuración para Evolution Exchange"
 
-#: C/evolution.xml:5196(link) C/evolution.xml:5229(title)
+#: C/evolution.xml:5210(link) C/evolution.xml:5243(title)
 msgid "Creating a New Exchange Account"
 msgstr "Creación de una nueva cuenta Exchange"
 
-#: C/evolution.xml:5199(link) C/evolution.xml:5253(title)
+#: C/evolution.xml:5213(link) C/evolution.xml:5267(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configurar una cuenta existente para utilizarla con Evolution Exchange"
 
-#: C/evolution.xml:5205(para)
+#: C/evolution.xml:5219(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Compruebe con el administrador del sistema los puntos siguientes:"
 
-#: C/evolution.xml:5208(para)
+#: C/evolution.xml:5222(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Posee una cuenta válida en el servidor Exchange."
 
-#: C/evolution.xml:5211(para)
+#: C/evolution.xml:5225(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -11010,7 +10974,7 @@ msgstr ""
 "predeterminado del servidor Exchange, y no debería sernecesario modificarlo, "
 "a menos que su administrador de sistema lo haya deshabilitado."
 
-#: C/evolution.xml:5214(para)
+#: C/evolution.xml:5228(para)
 msgid ""
 "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
 "\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
@@ -11022,7 +10986,7 @@ msgstr ""
 "información adicional para asegurar que su servidor Exchange acepte las "
 "conexiones de Evolution."
 
-#: C/evolution.xml:5219(para)
+#: C/evolution.xml:5233(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -11030,7 +10994,7 @@ msgstr ""
 "Una vez sepa que su servidor está disponible para conectarse, está preparado "
 "para añadir su cuenta Exchange a Evolution Exchange."
 
-#: C/evolution.xml:5223(para)
+#: C/evolution.xml:5237(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -11038,7 +11002,7 @@ msgstr ""
 "Evolution Exchange proporciona una herramienta de creación de cuentas simple "
 "para cuentas Exchange."
 
-#: C/evolution.xml:5224(para)
+#: C/evolution.xml:5238(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -11051,7 +11015,7 @@ msgstr ""
 "Evolution Exchange determinará por sí mismo el resto de la información "
 "necesaria."
 
-#: C/evolution.xml:5225(para)
+#: C/evolution.xml:5239(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -11063,7 +11027,7 @@ msgstr ""
 "información acerca de ello, vea <link linkend=\"config-exchange-new-account"
 "\">Creación de una nueva cuenta Exchange</link>."
 
-#: C/evolution.xml:5240(para)
+#: C/evolution.xml:5254(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -11074,12 +11038,12 @@ msgstr ""
 "seleccionar el servidor Microsoft Exchange como el tipo de servidor en la "
 "sección Recepción de correo."
 
-#: C/evolution.xml:5246(para)
+#: C/evolution.xml:5260(para)
 msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr ""
 "Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
 
-#: C/evolution.xml:5254(para)
+#: C/evolution.xml:5268(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -11087,23 +11051,19 @@ msgstr ""
 "Use el siguiente procedimiento para configurar su cuenta ya existente para "
 "Evolution Exchange:"
 
-#: C/evolution.xml:5260(para)
-msgid ""
-"Select the account you want to convert, then click Edit to appear the "
-"Account Editor."
-msgstr ""
-"Seleccione la cuenta que quiera convertir, después pulse Editar para que "
-"aparezca el Editor de cuentas."
+#: C/evolution.xml:5274(para) C/evolution.xml:5844(para)
+msgid "Select the account you want to convert, then click Edit."
+msgstr "Seleccione la cuenta que quiere convertir, después pulse Editar."
 
-#: C/evolution.xml:5261(para)
-msgid "You can view Identity tab enabled."
-msgstr "Podrá ver la solapa Identidad activada."
+#: C/evolution.xml:5275(para) C/evolution.xml:5847(para)
+msgid "Click the Identity tab."
+msgstr "Pulse la solapa de Identidad."
 
-#: C/evolution.xml:5266(para) C/evolution.xml:5840(para)
+#: C/evolution.xml:5279(para) C/evolution.xml:5852(para)
 msgid "Change your email address as needed."
 msgstr "Cambie su cuenta de correo electrónico si es necesario."
 
-#: C/evolution.xml:5269(para)
+#: C/evolution.xml:5282(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -11111,7 +11071,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Microsoft "
 "Exchange como tipo de servidor."
 
-#: C/evolution.xml:5274(para)
+#: C/evolution.xml:5286(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -11121,11 +11081,11 @@ msgstr ""
 "Autenticar, después introduzca la contraseña al ser preguntar. El servidor "
 "autenticará su cuenta."
 
-#: C/evolution.xml:5282(para) C/evolution.xml:5854(para)
+#: C/evolution.xml:5294(para) C/evolution.xml:5866(para)
 msgid "Click the Receiving Options tab."
 msgstr "Pulse en la solapa Opciones de recepción."
 
-#: C/evolution.xml:5283(para)
+#: C/evolution.xml:5295(para)
 msgid ""
 "Specify how often to check for new mail, your Global Catalog server name and "
 "whether to apply filters to messages in your Inbox, check for junk, set a "
@@ -11136,25 +11096,29 @@ msgstr ""
 "su Bandeja de entrada, comprobar el correo basura, establecer una caducidad "
 "para la contraseña y cualquier otro ajuste que quiera incluir."
 
-#: C/evolution.xml:5286(para)
+#: C/evolution.xml:5298(para)
+#| msgid ""
+#| "Use the Defaults tab to define folders, send cc: or bcc: messages to "
+#| "certain IDs, and set options for message receipts."
 msgid ""
-"Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
-"IDs, and set options for message receipts."
+"Use the Defaults tab to define folders, send CC or BCC messages to certain "
+"email addresses, and set options for message receipts."
 msgstr ""
 "Use la solapa Predeterminados para definir las carpetas, enviar Cc: o Cco: a "
 "determinadas identidades y establecer opciones para los destinatarios de los "
 "mensajes."
 
-#: C/evolution.xml:5289(para)
-msgid "Use the Security tab to set PGP and s/MIME options."
+#: C/evolution.xml:5301(para)
+#| msgid "Use the Security tab to set PGP and s/MIME options."
+msgid "Use the Security tab to set PGP and S/MIME options."
 msgstr "Use la solapa Seguridad para establecer las opciones PGP y S/MIME."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:5292(para)
+#: C/evolution.xml:5304(para)
 msgid "Quit Evolution and restart it."
 msgstr "Salir de Evolution y reiniciarlo."
 
-#: C/evolution.xml:5293(para)
+#: C/evolution.xml:5305(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -11162,7 +11126,7 @@ msgstr ""
 "Los cambios en la configuración de cuentas de Evolution Exchange no se "
 "activarán hasta después de reiniciar la aplicación."
 
-#: C/evolution.xml:5302(para)
+#: C/evolution.xml:5314(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -11182,16 +11146,24 @@ msgstr ""
 "la de Contactos para los contactos y la herramienta de Calendario para "
 "planificar sus horarios."
 
-#: C/evolution.xml:5303(para)
+#: C/evolution.xml:5315(para)
+#| msgid ""
+#| "If you are using both an Exchange account and a local mail account, you "
+#| "should be aware that whenever you save an email address or appointment "
+#| "from an email message, it is saved in your Exchange contacts list or "
+#| "calendar, rather than in your local account. The same is true for "
+#| "synchronization with Palm OS devices; tasks, and appointments.Addresses "
+#| "from your Palm OS device are synchronized in the Exchange folders rather "
+#| "than in local folders."
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
 "should be aware that whenever you save an email address or appointment from "
 "an email message, it is saved in your Exchange contacts list or calendar, "
 "rather than in your local account. The same is true for synchronization with "
-"Palm OS devices; tasks, and appointments.Addresses from your Palm OS device "
+"Palm OS devices; tasks, and appointments. Addresses from your Palm OS device "
 "are synchronized in the Exchange folders rather than in local folders."
 msgstr ""
-"Cuando utiliza a la vez una cuenta Exchange y una cuenta local, conviene "
+"Si está usando a la vez una cuenta Exchange y una cuenta local, conviene "
 "tener presente que cada vez que guarda una dirección de correo o una cita a "
 "partir de un mensaje de correo-e, ésta se guardará en la lista de contactos "
 "o en el calendario de Exchange, en lugar de hacerlo en su cuenta local. Lo "
@@ -11199,7 +11171,7 @@ msgstr ""
 "direcciones de su dispositivo Palm OS se sincronizarán con las carpetas "
 "correspondientes en Exchange, y no en su equipo local."
 
-#: C/evolution.xml:5304(para)
+#: C/evolution.xml:5316(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -11207,7 +11179,7 @@ msgstr ""
 "Para evitar carga innecesaria en el servidor, la Lista de direcciones "
 "globales (GAL) aparece vacía hasta que busque algo en ella."
 
-#: C/evolution.xml:5310(para)
+#: C/evolution.xml:5322(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
 "Exchange, like delegation and permission handling, creating <quote>Out of "
@@ -11218,31 +11190,31 @@ msgstr ""
 "mensajes <quote>Estoy fuera de la oficina</quote>, cambiar la contraseña y "
 "ver el tamaño de la carpeta."
 
-#: C/evolution.xml:5314(link) C/evolution.xml:5337(title)
+#: C/evolution.xml:5326(link) C/evolution.xml:5349(title)
 msgid "Send Options"
 msgstr "Opciones de envío"
 
-#: C/evolution.xml:5317(link) C/evolution.xml:5418(title)
+#: C/evolution.xml:5329(link) C/evolution.xml:5430(title)
 msgid "Access Delegation"
 msgstr "Delegación de acceso"
 
-#: C/evolution.xml:5320(link) C/evolution.xml:5422(title)
+#: C/evolution.xml:5332(link) C/evolution.xml:5434(title)
 msgid "Delegating Access to Others"
 msgstr "Delegando acceso a terceros"
 
-#: C/evolution.xml:5323(link) C/evolution.xml:5472(title)
+#: C/evolution.xml:5335(link) C/evolution.xml:5484(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Subscribirse a la carpeta de otro usuario"
 
-#: C/evolution.xml:5326(link) C/evolution.xml:5496(title)
+#: C/evolution.xml:5338(link) C/evolution.xml:5508(title)
 msgid "Subscribe to Public Folders"
 msgstr "Suscribirse a carpetas públicas"
 
-#: C/evolution.xml:5329(link) C/evolution.xml:5526(title)
+#: C/evolution.xml:5341(link) C/evolution.xml:5538(title)
 msgid "Setting an Out of Office Message"
 msgstr "Configuración un mensaje de Estoy fuera"
 
-#: C/evolution.xml:5338(para)
+#: C/evolution.xml:5350(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -11259,11 +11231,11 @@ msgstr ""
 "confirmación de envío de mensaje y de lectura de mensaje para los mensajes "
 "enviados."
 
-#: C/evolution.xml:5341(title)
+#: C/evolution.xml:5353(title)
 msgid "Tracking Options"
 msgstr "Opciones de seguimiento"
 
-#: C/evolution.xml:5342(para)
+#: C/evolution.xml:5354(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -11274,30 +11246,32 @@ msgstr ""
 "lectura de mensaje y así podrá saber cuándo llegó el elemento al "
 "destinatario o cuándo lo leyó."
 
-#: C/evolution.xml:5343(para)
+#: C/evolution.xml:5355(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Para establecer la importancia y sensibilidad del mensaje:"
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5349(para)
+#: C/evolution.xml:5361(para)
 msgid "Select the exchange account from the From field."
 msgstr "Seleccione la cuenta de Exchange del campo De."
 
-#: C/evolution.xml:5352(para)
-msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
-msgstr ""
-"Pulse Insertar &gt; Opciones de envío para abrir el cuadro de diálogo de "
-"Opciones de envío"
+#: C/evolution.xml:5364(para)
+#| msgid "Click Folder &gt; Subscriptions."
+msgid "Click Insert &gt; Send Options."
+msgstr "Pulse Insertar &gt; Opciones de envío."
 
-#: C/evolution.xml:5357(para)
+#: C/evolution.xml:5369(para) C/evolution.xml:6058(para)
+#| msgid ""
+#| "Select the priority for your sent message from the given three options "
+#| "(Normal, High, Low)"
 msgid ""
 "Select the priority for your sent message from the given three options "
-"(Normal, High, Low)"
+"(Normal, High, Low)."
 msgstr ""
 "Seleccione la prioridad para su mensaje enviado de las tres opciones "
-"proporcionadas (Normal, Alta, Baja)"
+"proporcionadas (Normal, Alta, Baja)."
 
-#: C/evolution.xml:5360(para)
+#: C/evolution.xml:5372(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -11305,11 +11279,11 @@ msgstr ""
 "Seleccione la sensibilidad para su mensaje enviado de las cuatro opciones "
 "proporcionadas (Normal, Personal, Privado, Confidencial)."
 
-#: C/evolution.xml:5364(title)
+#: C/evolution.xml:5376(title)
 msgid "Message Access Delegation:"
 msgstr "Delegación de acceso a mensajes:"
 
-#: C/evolution.xml:5365(para)
+#: C/evolution.xml:5377(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -11317,7 +11291,7 @@ msgstr ""
 "Pulse Enviar como delegado para enviar el mensaje al destinatario en nombre "
 "de otra persona."
 
-#: C/evolution.xml:5368(para)
+#: C/evolution.xml:5380(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -11327,11 +11301,11 @@ msgstr ""
 "mensaje del delgado y también debe tener asignados los permisos necesarios "
 "por el delegador."
 
-#: C/evolution.xml:5372(para)
+#: C/evolution.xml:5384(para)
 msgid "Click User to open Show Contacts dialog box."
 msgstr "Pulse Usuario para abrir el cuadro de diálogo Mostrar contactos."
 
-#: C/evolution.xml:5375(para)
+#: C/evolution.xml:5387(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
 "the dialog box."
@@ -11339,7 +11313,7 @@ msgstr ""
 "Seleccione el contacto de la Libreta de direcciones deseada y pulse Añadir, "
 "después cierre el cuadro de diálogo."
 
-#: C/evolution.xml:5377(para)
+#: C/evolution.xml:5389(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -11347,7 +11321,7 @@ msgstr ""
 "No se le permite enviar un mensaje en nombre de a más de una persona a la "
 "vez."
 
-#: C/evolution.xml:5379(para)
+#: C/evolution.xml:5391(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
 "<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
@@ -11358,7 +11332,7 @@ msgstr ""
 "delegador&gt;</guilabel> en la barra de cabeceras del panel de vista "
 "preliminar."
 
-#: C/evolution.xml:5384(para)
+#: C/evolution.xml:5396(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -11366,7 +11340,7 @@ msgstr ""
 "Seleccione la casilla de verificación Pedir una confirmación de entrega para "
 "este mensaje para obtener una confirmación de entrega de su destinatario."
 
-#: C/evolution.xml:5387(para)
+#: C/evolution.xml:5399(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -11374,11 +11348,11 @@ msgstr ""
 "Seleccione Pedir una confirmación de lectura para este mensaje para obtener "
 "una confirmación de lectura para este mensaje que ha enviado."
 
-#: C/evolution.xml:5396(title)
+#: C/evolution.xml:5408(title)
 msgid "Delegating Calendar Items"
 msgstr "Delegar elementos del calendario"
 
-#: C/evolution.xml:5397(para)
+#: C/evolution.xml:5409(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -11386,23 +11360,23 @@ msgstr ""
 "Puede enviar Reuniones o Citas en nombre de otra persona si se ha suscrito a "
 "su calendario."
 
-#: C/evolution.xml:5400(para)
+#: C/evolution.xml:5412(para)
 msgid "Select the delegator's Calendar."
 msgstr "Seleccione el calendario del delegado."
 
-#: C/evolution.xml:5403(para)
+#: C/evolution.xml:5415(para)
 msgid "Open a new Meeting composer window."
 msgstr "Abra una ventana del editor de Reuniones."
 
-#: C/evolution.xml:5406(para)
+#: C/evolution.xml:5418(para)
 msgid "Add the recipients."
 msgstr "Añada los destinatarios."
 
-#: C/evolution.xml:5409(para)
+#: C/evolution.xml:5421(para)
 msgid "Fill in the information."
 msgstr "Rellene la información."
 
-#: C/evolution.xml:5411(para)
+#: C/evolution.xml:5423(para)
 msgid ""
 "When the recipient receives the calendar item, a message indicates that the "
 "item was created by someone on behalf of the Delegator."
@@ -11410,7 +11384,7 @@ msgstr ""
 "Cuando el destinatario recibe el elemento del calendario, un mensaje "
 "indicará que el elemento se creó por alguien en nombre del Delegador."
 
-#: C/evolution.xml:5419(para)
+#: C/evolution.xml:5431(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -11423,26 +11397,26 @@ msgstr ""
 "permite a los usuarios hacer cualquier cosa, desde consultarse mutuamente "
 "sus planes hasta gestionar completamente toda su información personal."
 
-#: C/evolution.xml:5423(para)
+#: C/evolution.xml:5435(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Para añadir alguien a su lista de delegados:"
 
-#: C/evolution.xml:5429(para)
+#: C/evolution.xml:5441(para)
 msgid "Click the Exchange Settings tab."
 msgstr "Pulse en la solapa Configuración de Exchange."
 
-#: C/evolution.xml:5432(para)
+#: C/evolution.xml:5444(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Pulse Asistente de delegaciones para abrir el cuadro de diálogo de los "
 "Delegados."
 
-#: C/evolution.xml:5437(para)
+#: C/evolution.xml:5449(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr ""
 "Pulse Añadir, después busque un contacto en la Lista de direcciones global."
 
-#: C/evolution.xml:5438(para)
+#: C/evolution.xml:5450(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -11450,7 +11424,7 @@ msgstr ""
 "Recuerde que la Lista de direcciones globales (GAL) aparecerá vacía hasta "
 "que haya introducido algo para buscar."
 
-#: C/evolution.xml:5441(para)
+#: C/evolution.xml:5453(para)
 msgid ""
 "Select the delegate and click Edit to open the delegate permission dialog "
 "box."
@@ -11458,7 +11432,7 @@ msgstr ""
 "Seleccione el delegado y pulse Editar para abrir el cuadro de diálogo de "
 "permisos del delegado."
 
-#: C/evolution.xml:5446(para)
+#: C/evolution.xml:5458(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -11466,15 +11440,15 @@ msgstr ""
 "Seleccione uno de los siguientes niveles de acceso para cada uno de los "
 "cuatro tipos de carpetas:"
 
-#: C/evolution.xml:5449(para)
+#: C/evolution.xml:5461(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "No permitir a esta persona acceder a ninguna carpeta de este tipo."
 
-#: C/evolution.xml:5452(title)
+#: C/evolution.xml:5464(title)
 msgid "Reviewer (read-only):"
 msgstr "Revisor (sólo lectura):"
 
-#: C/evolution.xml:5453(para)
+#: C/evolution.xml:5465(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -11482,11 +11456,11 @@ msgstr ""
 "Permite al delegado ver elementos en este tipo de carpeta pero no crear "
 "nuevos o modificar los existentes."
 
-#: C/evolution.xml:5456(title)
+#: C/evolution.xml:5468(title)
 msgid "Author (read, create):"
 msgstr "Autor (leer, crear):"
 
-#: C/evolution.xml:5457(para)
+#: C/evolution.xml:5469(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -11494,15 +11468,15 @@ msgstr ""
 "El delegado puede ver elementos en sus carpetas y puede crear otros nuevos "
 "pero no puede modificar ninguno de los existentes."
 
-#: C/evolution.xml:5460(title)
+#: C/evolution.xml:5472(title)
 msgid "Editor (read, create, edit):"
 msgstr "Editor (leer, crear, editar):"
 
-#: C/evolution.xml:5461(para)
+#: C/evolution.xml:5473(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr "El delegado puede ver, crear y cambiar elementos en sus carpetas."
 
-#: C/evolution.xml:5468(para)
+#: C/evolution.xml:5480(para)
 msgid ""
 "The delegate is notified through a separate mail that he or she is being "
 "added to your list of delegates. The mail summarizes all the rights that "
@@ -11512,15 +11486,15 @@ msgstr ""
 "añadido a su lista de delegados. El correo resume todos los permisos que se "
 "le han asignado."
 
-#: C/evolution.xml:5473(para)
+#: C/evolution.xml:5485(para)
 msgid "To access the folders delegated to you:"
 msgstr "Para acceder a las carpetas que le han sido delegadas:"
 
-#: C/evolution.xml:5476(para)
+#: C/evolution.xml:5488(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Pulse Archivo &gt; Suscribirse a la carpeta Exchange de otro usuario."
 
-#: C/evolution.xml:5481(para)
+#: C/evolution.xml:5493(para)
 msgid ""
 "Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
@@ -11528,11 +11502,11 @@ msgstr ""
 "Especifique la dirección de correo-e del usuario que le haya delegado o "
 "pulse el botón Usuario para elegirlo de su libreta de direcciones."
 
-#: C/evolution.xml:5484(para)
+#: C/evolution.xml:5496(para)
 msgid "Select the folder you want to open."
 msgstr "Seleccione la carpeta que quiere abrir."
 
-#: C/evolution.xml:5490(para)
+#: C/evolution.xml:5502(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11545,7 +11519,7 @@ msgstr ""
 "carpeta llamada Ignacio Matamoros en el árbol de carpetas, al mismo nivel "
 "que sus carpetas locales y carpetas públicas."
 
-#: C/evolution.xml:5491(para)
+#: C/evolution.xml:5503(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -11553,31 +11527,31 @@ msgstr ""
 "Si la carpeta no se abre adecuadamente, compruebe con el dueño de la carpeta "
 "que le ha concedido los permisos de acceso correctos."
 
-#: C/evolution.xml:5497(para)
+#: C/evolution.xml:5509(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr ""
 "Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
 
-#: C/evolution.xml:5503(para)
+#: C/evolution.xml:5515(para)
 msgid "Select the Exchange account."
 msgstr "Seleccione la cuenta de Exchange."
 
-#: C/evolution.xml:5506(para)
+#: C/evolution.xml:5518(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Seleccione las carpetas a las que se quiere suscribir."
 
-#: C/evolution.xml:5512(para)
+#: C/evolution.xml:5524(para)
 msgid ""
 "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Las carpetas a las que se ha suscrito para aparecer en la lista de carpetas "
 "a la izquierda."
 
-#: C/evolution.xml:5515(para)
+#: C/evolution.xml:5527(para)
 msgid "To view contents of a folder, click it."
 msgstr "Para ver el contenido de una carpeta, pulse sobre ella."
 
-#: C/evolution.xml:5522(para)
+#: C/evolution.xml:5534(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
@@ -11599,7 +11573,7 @@ msgstr ""
 "guilabel>. Para obtener más información acerca de los Recordatorios consulte "
 "<link linkend=\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:5527(para)
+#: C/evolution.xml:5539(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
 "to messages, explaining why you are not immediately responding to their "
@@ -11614,11 +11588,11 @@ msgstr ""
 "para que la gente sepa que realmente no los está ignorando."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5533(para)
+#: C/evolution.xml:5545(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Seleccione la cuenta de Exchange, después pulse Editar."
 
-#: C/evolution.xml:5536(para)
+#: C/evolution.xml:5548(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -11626,15 +11600,15 @@ msgstr ""
 "Seleccione la solapa Configuración de Exchange. La opción superior le "
 "permitirá establecer un Mensaje para cuando esté fuera de la oficina."
 
-#: C/evolution.xml:5539(para)
+#: C/evolution.xml:5551(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Pulse Ahora no estoy en la oficina."
 
-#: C/evolution.xml:5542(para)
+#: C/evolution.xml:5554(para)
 msgid "Type a short message in the text field."
 msgstr "Escriba un mensaje corto en el campo de texto."
 
-#: C/evolution.xml:5549(para)
+#: C/evolution.xml:5561(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11642,7 +11616,7 @@ msgstr ""
 "Su mensaje se envía automáticamente a cualquiera que le envíe correo hasta "
 "que vuelva y seleccione Ahora estoy en la oficina."
 
-#: C/evolution.xml:5555(para)
+#: C/evolution.xml:5567(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees. Its Free/Busy feature allows you to perform a "
@@ -11656,25 +11630,26 @@ msgstr ""
 "usuarios para saber si están ocupados según sus calendarios Exchange, y de "
 "ser así cambiar la hora de la reunión de una forma conjunta."
 
-#: C/evolution.xml:5559(para)
+#: C/evolution.xml:5571(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Crear una nueva cita en el calendario."
 
-#: C/evolution.xml:5562(para)
-msgid ""
-"Right-click the appointment, then select Schedule Meeting to appear "
-"Evolution Meeting editor."
+#: C/evolution.xml:5574(para)
+#| msgid ""
+#| "Right-click the appointment, then select Schedule Meeting to appear "
+#| "Evolution Meeting editor."
+msgid "Right-click the appointment, then select Schedule Meeting."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la cita, después seleccione "
-"Concertar una reunión para mostrar el editor de citas de Evolution."
+"Concertar una reunión."
 
-#: C/evolution.xml:5565(para)
+#: C/evolution.xml:5577(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 "Pulse sobre la solapa Añadir para introducir las direcciones de correo-e en "
 "la lista."
 
-#: C/evolution.xml:5568(para)
+#: C/evolution.xml:5580(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11682,18 +11657,18 @@ msgstr ""
 "Pulse la solapa Participantes para seleccionar los participantes de Listas "
 "de direcciones globales (GAL)."
 
-#: C/evolution.xml:5569(para)
+#: C/evolution.xml:5581(para)
 msgid ""
 "You can directly select the participants from the following address lists."
 msgstr ""
 "Puede seleccionar directamente a los participantes de la siguiente lista de "
 "direcciones."
 
-#: C/evolution.xml:5575(para)
+#: C/evolution.xml:5587(para)
 msgid "Global Address List"
 msgstr "Lista de direcciones global"
 
-#: C/evolution.xml:5581(para)
+#: C/evolution.xml:5593(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11701,31 +11676,31 @@ msgstr ""
 "También puede especificar la categoría como Aniversario, Cumpleaños, "
 "Negocios etc, de la lista desplegable para cada lista de direcciones dada."
 
-#: C/evolution.xml:5584(para)
+#: C/evolution.xml:5596(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Añada los participantes a las siguientes categorías de asistentes."
 
-#: C/evolution.xml:5587(para)
+#: C/evolution.xml:5599(para)
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: C/evolution.xml:5590(para)
+#: C/evolution.xml:5602(para)
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: C/evolution.xml:5593(para)
+#: C/evolution.xml:5605(para)
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: C/evolution.xml:5596(para)
+#: C/evolution.xml:5608(para)
 msgid "Resources"
 msgstr "Recursos"
 
-#: C/evolution.xml:5601(para)
+#: C/evolution.xml:5613(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "La herramienta de Disponibilidad en la esquina superior derecha."
 
-#: C/evolution.xml:5604(para)
+#: C/evolution.xml:5616(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11734,7 +11709,7 @@ msgstr ""
 "los participantes y, si es posible, actualizar la reunión en los calendarios "
 "de cada uno de los asistentes"
 
-#: C/evolution.xml:5607(para)
+#: C/evolution.xml:5619(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11752,7 +11727,7 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5613(para)
+#: C/evolution.xml:5625(para)
 msgid ""
 "<trademark>Evolution</trademark> can access accounts on <trademark class="
 "\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
@@ -11762,35 +11737,35 @@ msgstr ""
 "<trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark> 7."
 
-#: C/evolution.xml:5616(link) C/evolution.xml:5639(title)
+#: C/evolution.xml:5628(link) C/evolution.xml:5651(title)
 msgid "GroupWise Features"
 msgstr "Características de GroupWise"
 
-#: C/evolution.xml:5619(link) C/evolution.xml:5728(title)
+#: C/evolution.xml:5631(link) C/evolution.xml:5740(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologías GroupWise y Evolution"
 
-#: C/evolution.xml:5622(link) C/evolution.xml:5799(title)
+#: C/evolution.xml:5634(link) C/evolution.xml:5811(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Añadir su cuenta GroupWise a Evolution"
 
-#: C/evolution.xml:5625(link) C/evolution.xml:5940(title)
+#: C/evolution.xml:5637(link) C/evolution.xml:5952(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planificando citas según disponibilidad"
 
-#: C/evolution.xml:5628(link) C/evolution.xml:5962(title)
+#: C/evolution.xml:5640(link) C/evolution.xml:5974(title)
 msgid "Managing Sent Items"
 msgstr "Gestionar los elementos enviados"
 
-#: C/evolution.xml:5631(link) C/evolution.xml:6143(title)
+#: C/evolution.xml:5643(link) C/evolution.xml:6155(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Dar acceso a su Buzón de correo o Calendario a otros"
 
-#: C/evolution.xml:5634(link) C/evolution.xml:6314(title)
+#: C/evolution.xml:5646(link) C/evolution.xml:6326(title)
 msgid "Junk Mail Handling"
 msgstr "Gestión de correo basura"
 
-#: C/evolution.xml:5640(para)
+#: C/evolution.xml:5652(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11798,23 +11773,23 @@ msgstr ""
 "La conectividad de GroupWise en Evolution soporta las siguientes "
 "características básicas de Novell GroupWise:"
 
-#: C/evolution.xml:5646(para)
+#: C/evolution.xml:5658(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr "Ver el correo y las carpetas almacenadas en el sistema GroupWise."
 
-#: C/evolution.xml:5649(para)
+#: C/evolution.xml:5661(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Enviar correo desde su cuenta GroupWise."
 
-#: C/evolution.xml:5652(para)
+#: C/evolution.xml:5664(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Convertir un correo en una tarea o reunión."
 
-#: C/evolution.xml:5655(para)
+#: C/evolution.xml:5667(para)
 msgid "Tracking the status of a message."
 msgstr "Seguir el estado de un mensaje."
 
-#: C/evolution.xml:5658(para)
+#: C/evolution.xml:5670(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11822,11 +11797,11 @@ msgstr ""
 "Marcar un mensaje como correo basura añade al remitente a su lista de correo "
 "basura de GroupWise."
 
-#: C/evolution.xml:5661(para)
+#: C/evolution.xml:5673(para)
 msgid "Improved Status Tracking."
 msgstr "Seguimiento de estado mejorado."
 
-#: C/evolution.xml:5669(para)
+#: C/evolution.xml:5681(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11836,7 +11811,7 @@ msgstr ""
 "usuarios de Evolution programar sus reuniones y examinar la disponibilidad "
 "de asistencia de otros usuarios en GroupWise."
 
-#: C/evolution.xml:5672(para)
+#: C/evolution.xml:5684(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11844,7 +11819,7 @@ msgstr ""
 "Puede recibir una solicitud de reunión con iCalendar y añadirla a su "
 "calendario GroupWise."
 
-#: C/evolution.xml:5680(para)
+#: C/evolution.xml:5692(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11854,7 +11829,7 @@ msgstr ""
 "GruopWise, incluyendo la libreta de direcciones del sistema, los Contactos "
 "frecuentes y su libreta de direcciones personal."
 
-#: C/evolution.xml:5683(para)
+#: C/evolution.xml:5695(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
@@ -11865,7 +11840,7 @@ msgstr ""
 "de las libretas de direcciones nuevas también se pueden añadir a su libreta "
 "de direcciones personal desde mensajes de correo-e recibidos."
 
-#: C/evolution.xml:5686(para)
+#: C/evolution.xml:5698(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
@@ -11879,11 +11854,11 @@ msgstr ""
 "crearlas. La libreta de direcciones del sistema de GroupWise se marca para "
 "uso desconectado de manera predeterminada. Esto acelera el rendimiento."
 
-#: C/evolution.xml:5691(para) C/evolution.xml:5763(para)
+#: C/evolution.xml:5703(para) C/evolution.xml:5775(para)
 msgid "Reminder Note"
 msgstr "Nota de recuerdo"
 
-#: C/evolution.xml:5694(para)
+#: C/evolution.xml:5706(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11894,39 +11869,39 @@ msgstr ""
 "derecha de la vista del Calendario suponiendo que las ha seleccionando bajo "
 "el componente de Notas."
 
-#: C/evolution.xml:5699(para)
+#: C/evolution.xml:5711(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: C/evolution.xml:5702(para)
+#: C/evolution.xml:5714(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Puede asignar acceso proxy a otros usuarios."
 
-#: C/evolution.xml:5705(para)
+#: C/evolution.xml:5717(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr "Puede ver las cuentas de otros usuarios a través de un proxy."
 
-#: C/evolution.xml:5710(para)
+#: C/evolution.xml:5722(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Sin embargo, algunas características no están disponibles:"
 
-#: C/evolution.xml:5713(para)
+#: C/evolution.xml:5725(para)
 msgid "Resending items"
 msgstr "Reenviar elementos"
 
-#: C/evolution.xml:5716(para)
+#: C/evolution.xml:5728(para)
 msgid "Retracting items"
 msgstr "Retractar elementos"
 
-#: C/evolution.xml:5719(para)
+#: C/evolution.xml:5731(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Aceptar citas o reuniones en modo desconectado"
 
-#: C/evolution.xml:5722(para)
+#: C/evolution.xml:5734(para)
 msgid "Archive"
 msgstr "Archivar"
 
-#: C/evolution.xml:5729(para)
+#: C/evolution.xml:5741(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11936,55 +11911,55 @@ msgstr ""
 "tipos de elementos. La siguiente tabla compara la terminología de GroupWise "
 "con la terminología de Evolution."
 
-#: C/evolution.xml:5737(para)
+#: C/evolution.xml:5749(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5747(para) C/evolution.xml:5758(para)
+#: C/evolution.xml:5759(para) C/evolution.xml:5770(para)
 msgid "Appointment"
 msgstr "Cita"
 
-#: C/evolution.xml:5750(para)
+#: C/evolution.xml:5762(para)
 msgid "Meeting"
 msgstr "Reunión"
 
-#: C/evolution.xml:5755(para)
+#: C/evolution.xml:5767(para)
 msgid "Posted Appointment"
 msgstr "Cita postpuesta"
 
-#: C/evolution.xml:5766(para) C/evolution.xml:5790(para)
+#: C/evolution.xml:5778(para) C/evolution.xml:5802(para)
 msgid "None; use a task"
 msgstr "Ninguno, usar una tarea"
 
-#: C/evolution.xml:5771(para)
+#: C/evolution.xml:5783(para)
 msgid "Discussion Note"
 msgstr "Nota de discusión"
 
-#: C/evolution.xml:5774(para)
+#: C/evolution.xml:5786(para)
 msgid "None; use an assigned task"
 msgstr "Ninguno, usar una tarea asignada"
 
-#: C/evolution.xml:5779(para)
+#: C/evolution.xml:5791(para)
 msgid "Phone Message"
 msgstr "Mensajes telefónicos"
 
-#: C/evolution.xml:5782(para)
+#: C/evolution.xml:5794(para)
 msgid "None; use a message"
 msgstr "Ninguno, usar un mensaje"
 
-#: C/evolution.xml:5787(para)
+#: C/evolution.xml:5799(para)
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
-#: C/evolution.xml:5802(link) C/evolution.xml:5810(title)
+#: C/evolution.xml:5814(link) C/evolution.xml:5822(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Crear una nueva cuenta GroupWise"
 
-#: C/evolution.xml:5805(link) C/evolution.xml:5825(title)
+#: C/evolution.xml:5817(link) C/evolution.xml:5837(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modificar una cuenta existente para trabajar con GroupWise"
 
-#: C/evolution.xml:5819(para)
+#: C/evolution.xml:5831(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11992,7 +11967,7 @@ msgstr ""
 "Cree la cuenta siguiendo el procedimiento en <link linkend=\"usage-"
 "mainwindow-starting\">Inicio de Evolution por primera vez</link>."
 
-#: C/evolution.xml:5826(para)
+#: C/evolution.xml:5838(para)
 msgid ""
 "If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
@@ -12000,15 +11975,7 @@ msgstr ""
 "Si ya tiene una cuenta de correo-e existente y quiere convertirla para "
 "usarla con GroupWise:"
 
-#: C/evolution.xml:5832(para)
-msgid "Select the account you want to convert, then click Edit."
-msgstr "Seleccione la cuenta que quiere convertir, después pulse Editar."
-
-#: C/evolution.xml:5835(para)
-msgid "Click the Identity tab."
-msgstr "Pulse la solapa de Identidad."
-
-#: C/evolution.xml:5843(para)
+#: C/evolution.xml:5855(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -12016,7 +11983,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Novell "
 "GroupWise como el tipo de servidor."
 
-#: C/evolution.xml:5848(para)
+#: C/evolution.xml:5860(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -12024,7 +11991,7 @@ msgstr ""
 "Escriba el nombre del servidor de su correo, su nombre de usuario y "
 "seleccione si quiere usar SSL."
 
-#: C/evolution.xml:5875(para)
+#: C/evolution.xml:5887(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
@@ -12032,7 +11999,7 @@ msgstr ""
 "Seleccione si quiere sincronizar automáticamente su calendario remoto y sus "
 "contactos localmente."
 
-#: C/evolution.xml:5876(para)
+#: C/evolution.xml:5888(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -12040,7 +12007,7 @@ msgstr ""
 "Obtiene el calendario y la información del contacto remotos y los almacena "
 "en su unidad local."
 
-#: C/evolution.xml:5878(para)
+#: C/evolution.xml:5890(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -12048,7 +12015,7 @@ msgstr ""
 "Generalmente los calendarios y contactos remotos se almacenan en servidores "
 "en lugar de en discos duros locales."
 
-#: C/evolution.xml:5882(para)
+#: C/evolution.xml:5894(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -12056,7 +12023,7 @@ msgstr ""
 "Especifique su puerto del agente de la oficina de correos SOAP en el campo "
 "Puerto del agente de la oficina de correos SOAP."
 
-#: C/evolution.xml:5886(para)
+#: C/evolution.xml:5898(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -12064,11 +12031,11 @@ msgstr ""
 "(Opcional) pulse sobre la solapa Proxy, después pulse Añadir para añadir "
 "cualquier usuario proxy a su cuenta."
 
-#: C/evolution.xml:5897(title)
+#: C/evolution.xml:5909(title)
 msgid "Reminder Notes"
 msgstr "Notas de recordatorios"
 
-#: C/evolution.xml:5898(para)
+#: C/evolution.xml:5910(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -12083,7 +12050,7 @@ msgstr ""
 "Calendario en la fecha que especifique. No se emplazan en su Buzón de correo "
 "o en el buzón de correo de ningún otro usuario."
 
-#: C/evolution.xml:5899(para)
+#: C/evolution.xml:5911(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -12093,7 +12060,7 @@ msgstr ""
 "que puede ver las Notas de recordatorio listadas bajo las Notas en la parte "
 "inferior derecha de la vista del calendario."
 
-#: C/evolution.xml:5901(para)
+#: C/evolution.xml:5913(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -12101,7 +12068,7 @@ msgstr ""
 "Seleccione la nota o la Nota de recordatorio bajo el componente Notas para "
 "mostrarla en la vista del Calendario."
 
-#: C/evolution.xml:5904(para)
+#: C/evolution.xml:5916(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -12111,15 +12078,15 @@ msgstr ""
 "\">Paso 1</link> hasta el <link linkend=\"b10fqh6r\">Paso 8</link> bajo "
 "<link linkend=\"b1012vdd\">Notas</link>."
 
-#: C/evolution.xml:5905(para)
+#: C/evolution.xml:5917(para)
 msgid "To send a Reminder Note,"
 msgstr "Enviar una nota de recordatorio,"
 
-#: C/evolution.xml:5908(para)
+#: C/evolution.xml:5920(para)
 msgid "Click File &gt; New &gt; Shared Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota compartida."
 
-#: C/evolution.xml:5911(para)
+#: C/evolution.xml:5923(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -12127,7 +12094,7 @@ msgstr ""
 "Seleccione el nombre de la cuenta del Organizador de la lista desplegable "
 "proporcionada junto al campo Organizador."
 
-#: C/evolution.xml:5914(para)
+#: C/evolution.xml:5926(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -12135,15 +12102,15 @@ msgstr ""
 "En el campo Para escriba un nombre de usuario, después pulse Intro. Repita "
 "la operación para añadir usuarios adicionales."
 
-#: C/evolution.xml:5926(para)
+#: C/evolution.xml:5938(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Especifique la categoría bajo la que recae la nota de recordatorio."
 
-#: C/evolution.xml:5932(para)
+#: C/evolution.xml:5944(para)
 msgid "Click Save."
 msgstr "Pulse Guardar."
 
-#: C/evolution.xml:5941(para)
+#: C/evolution.xml:5953(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -12153,7 +12120,7 @@ msgstr ""
 "podrá comprobar la disponibilidad de otros usuarios en el mismo servidor en "
 "función de sus respectivos calendarios GruopWise."
 
-#: C/evolution.xml:5943(para)
+#: C/evolution.xml:5955(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -12166,15 +12133,15 @@ msgstr ""
 "que funcionan desde el mismo momento de iniciar la sesión, sin tener en "
 "cuenta si ejecutó el Evolution durante dicha sesión."
 
-#: C/evolution.xml:5946(para)
+#: C/evolution.xml:5958(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Abra una nueva cita en el calendario."
 
-#: C/evolution.xml:5949(para)
+#: C/evolution.xml:5961(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Pulse Acciones &gt; Planificar una reunión."
 
-#: C/evolution.xml:5952(para)
+#: C/evolution.xml:5964(para)
 msgid ""
 "Add attendees, either by entering their email addresses into the list, or by "
 "clicking the Invite Others button."
@@ -12182,7 +12149,7 @@ msgstr ""
 "Añada participantes, ya sea introduciendo sus direcciones de correo-e en la "
 "lista o pulsando el botón Invitar a otros."
 
-#: C/evolution.xml:5955(para)
+#: C/evolution.xml:5967(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -12191,7 +12158,7 @@ msgstr ""
 "agendas de los participantes y, si es posible, actualizar la reunión en los "
 "calendarios de cada uno de los asistentes."
 
-#: C/evolution.xml:5958(para)
+#: C/evolution.xml:5970(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -12209,24 +12176,24 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5965(link) C/evolution.xml:5985(title)
+#: C/evolution.xml:5977(link) C/evolution.xml:5997(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmar la entrega de los elementos que ha enviado"
 
-#: C/evolution.xml:5968(link) C/evolution.xml:6091(title)
+#: C/evolution.xml:5980(link) C/evolution.xml:6102(title)
 msgid "Displaying Sent Items"
 msgstr "Mostrar elementos enviados"
 
-#: C/evolution.xml:5971(link) C/evolution.xml:6030(title)
+#: C/evolution.xml:5983(link) C/evolution.xml:6041(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Comprobar el estado de un elemento que ha enviado"
 
-#: C/evolution.xml:5974(link) C/evolution.xml:5977(link)
-#: C/evolution.xml:6057(title)
+#: C/evolution.xml:5986(link) C/evolution.xml:5989(link)
+#: C/evolution.xml:6068(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Petición de respuesta para elementos que envíe"
 
-#: C/evolution.xml:5981(para)
+#: C/evolution.xml:5993(para)
 msgid ""
 "You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
@@ -12234,7 +12201,7 @@ msgstr ""
 "Puede gestionar sus elementos enviados para correo electrónico GroupWise "
 "sólo si el destinatario está ubicado en el mismo sistema GruopWise."
 
-#: C/evolution.xml:5986(para)
+#: C/evolution.xml:5998(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
@@ -12246,11 +12213,11 @@ msgstr ""
 "enviado. Por ejemplo, puede ver cuándo se entregó un correo-e y cuándo lo "
 "abrió o borró el destinatario."
 
-#: C/evolution.xml:5988(title)
+#: C/evolution.xml:6000(title)
 msgid "Track an Item You Sent:"
 msgstr "Seguir un elemento que haya enviado:"
 
-#: C/evolution.xml:5989(para)
+#: C/evolution.xml:6001(para)
 msgid ""
 "You can check the status in the Message Status window of an email you have "
 "sent."
@@ -12258,11 +12225,11 @@ msgstr ""
 "Puede comprobar el estado de un correo electrónico que haya enviado en la "
 "ventana Estado del mensaje."
 
-#: C/evolution.xml:5992(title)
+#: C/evolution.xml:6004(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr "Recibir una notificación cuando se abre o borra el elemento:"
 
-#: C/evolution.xml:5993(para)
+#: C/evolution.xml:6005(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -12272,11 +12239,11 @@ msgstr ""
 "mensaje. Para obtener más información consulte <link linkend=\"Ak05sv1"
 "\">Recibir notificaciones acerca de elementos que envíe</link>."
 
-#: C/evolution.xml:5996(title)
+#: C/evolution.xml:6008(title)
 msgid "Request a Reply:"
 msgstr "Pedir una respuesta:"
 
-#: C/evolution.xml:5997(para)
+#: C/evolution.xml:6009(para)
 msgid ""
 "You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
@@ -12289,35 +12256,38 @@ msgstr ""
 "doble flecha. Para obtener más información vea <link linkend=\"Ak05sv1"
 "\">Petición de respuesta para elementos que envíe</link>."
 
-#: C/evolution.xml:6001(title) C/evolution.xml:6115(title)
+#: C/evolution.xml:6013(title) C/evolution.xml:6126(title)
 msgid "Enabling Status Tracking"
 msgstr "Activar el seguimiento de estado"
 
-#: C/evolution.xml:6004(para) C/evolution.xml:6044(para)
-#: C/evolution.xml:6060(para)
+#: C/evolution.xml:6016(para) C/evolution.xml:6055(para)
+#: C/evolution.xml:6071(para)
 msgid "In the Compose Message window, click Insert &gt; Send Options."
 msgstr ""
 "En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
 
-#: C/evolution.xml:6005(para)
+#: C/evolution.xml:6017(para) C/evolution.xml:6130(para)
 msgid "Select Status Tracking."
 msgstr "Seleccione Seguimiento de estado"
 
-#: C/evolution.xml:6010(para) C/evolution.xml:6122(para)
+#: C/evolution.xml:6021(para) C/evolution.xml:6134(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Seleccione la casilla de verificación junto a Crear un elemento enviado para "
 "seguimiento de la información."
 
-#: C/evolution.xml:6013(para) C/evolution.xml:6125(para)
+#: C/evolution.xml:6024(para)
+#| msgid ""
+#| "Select any of the options given (Delivered, Delivered and opened, All "
+#| "information)"
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
-"information)"
+"information)."
 msgstr ""
 "Seleccione cualquiera de las opciones dadas (Entregado, Entregado y abierto, "
-"Toda la información)"
+"Toda la información)."
 
-#: C/evolution.xml:6014(para) C/evolution.xml:6126(para)
+#: C/evolution.xml:6025(para) C/evolution.xml:6138(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -12325,7 +12295,7 @@ msgstr ""
 "Basándose en esta selección, puede ver el estado del mensaje enviado en la "
 "carpeta de Correo enviado."
 
-#: C/evolution.xml:6015(para)
+#: C/evolution.xml:6026(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -12333,7 +12303,7 @@ msgstr ""
 "Para obtener más información, consulte <link linkend=\"Aal54a9\">Comprobar "
 "el estado de un elemento que ha enviado</link>."
 
-#: C/evolution.xml:6018(para)
+#: C/evolution.xml:6029(para) C/evolution.xml:6141(para)
 msgid ""
 "(Optional) Select the check box next to Auto-delete sent item to "
 "automatically delete the sent item from the Sent folder."
@@ -12341,20 +12311,20 @@ msgstr ""
 "(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado para "
 "borrar automáticamente el elemento enviado de la carpeta Correo enviado."
 
-#: C/evolution.xml:6021(para) C/evolution.xml:6132(para)
+#: C/evolution.xml:6032(para) C/evolution.xml:6144(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 "En Devolver notificación, especifique el tipo de notificación que desea "
 "recibir."
 
-#: C/evolution.xml:6033(para)
+#: C/evolution.xml:6044(para)
 msgid ""
 "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Pulse con el botón derecho sobre un correo-e en su carpeta de Correo "
 "enviado, después pulse Seguir el estado del mensaje."
 
-#: C/evolution.xml:6034(para)
+#: C/evolution.xml:6045(para)
 msgid ""
 "With Message Tracking, you know when the item reaches the recipients or is "
 "read by them. You also know exactly who received your message, who read your "
@@ -12364,15 +12334,11 @@ msgstr ""
 "destinatarios o cuándo se leyó. También podrá saber exactamente quién "
 "recibió su mensaje, quién lo leyó y quién lo borró y cuándo."
 
-#: C/evolution.xml:6041(title)
+#: C/evolution.xml:6052(title)
 msgid "Changing the Priority of an Email"
 msgstr "Cambiar la prioridad de un correo-e"
 
-#: C/evolution.xml:6047(para)
-msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
-msgstr "Seleccione Prioridad Alta, Estándar, Baja, o Indefinida."
-
-#: C/evolution.xml:6048(para)
+#: C/evolution.xml:6059(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -12380,13 +12346,13 @@ msgstr ""
 "El pequeño icono junto al elemento en el Buzón de correo será rojo cuando la "
 "prioridad sea alta."
 
-#: C/evolution.xml:6064(para)
+#: C/evolution.xml:6075(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Pulse Respuesta solicitada, después especifique cuando quiere recibir la "
 "respuesta."
 
-#: C/evolution.xml:6065(para)
+#: C/evolution.xml:6076(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -12398,7 +12364,7 @@ msgstr ""
 "días, entonces aparecerá Respuesta solicitada: en <varname>día del mes día "
 "numérico hora año</varname> en la parte superior del mensaje."
 
-#: C/evolution.xml:6068(para)
+#: C/evolution.xml:6079(para)
 msgid ""
 "Click Set Expiration Date, then specify the number of days for this message "
 "to remain in the recipient's Inbox."
@@ -12406,11 +12372,11 @@ msgstr ""
 "Pulse Establecer fecha de caducidad y especifique el número de días durante "
 "el cual este mensaje permanecerá en el buzón de correo del destinatario."
 
-#: C/evolution.xml:6076(title)
+#: C/evolution.xml:6087(title)
 msgid "Setting Message Delivery Options"
 msgstr "Establecer opciones de entrega de los mensajes"
 
-#: C/evolution.xml:6077(para)
+#: C/evolution.xml:6088(para)
 msgid ""
 "You can delay the delivery of an individual message by having it held in the "
 "Outbox for a specified time."
@@ -12418,11 +12384,11 @@ msgstr ""
 "Puede posponer la entrega de un mensaje individual dejándolo en la Bandeja "
 "de salida por un periodo de tiempo especificado."
 
-#: C/evolution.xml:6080(para)
+#: C/evolution.xml:6091(para)
 msgid "Click Delay message delivery."
 msgstr "Pulse Retrasar la entrega del mensaje."
 
-#: C/evolution.xml:6083(para)
+#: C/evolution.xml:6094(para)
 msgid ""
 "Use the Date and Time options to specify how long the message should remain "
 "in the Outbox before it is sent to the recipient."
@@ -12431,11 +12397,11 @@ msgstr ""
 "permanecer el mensaje en la Bandeja de salida antes de que se envíe a su "
 "destinatario."
 
-#: C/evolution.xml:6094(para)
+#: C/evolution.xml:6105(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Pulse en la carpeta Correo enviado en la lista de carpetas."
 
-#: C/evolution.xml:6097(para)
+#: C/evolution.xml:6108(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
 "for sent email in the account editor default settings. For more information, "
@@ -12449,18 +12415,18 @@ msgstr ""
 "el Correo enviado y los Borradores</link> bajo <link linkend=\"b13uhy6r"
 "\">Predeterminados</link>."
 
-#: C/evolution.xml:6100(title)
+#: C/evolution.xml:6111(title)
 msgid "Delegating an Item"
 msgstr "Borrar un elemento"
 
-#: C/evolution.xml:6103(para)
+#: C/evolution.xml:6114(para)
 msgid ""
 "In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho sobre la reunión o cita que "
 "quiere delegar."
 
-#: C/evolution.xml:6106(para)
+#: C/evolution.xml:6117(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -12468,27 +12434,25 @@ msgstr ""
 "Seleccione Delegar reunión, después seleccione los contactos a los que "
 "quiere delegar la reunión o cita."
 
-#: C/evolution.xml:6112(para)
+#: C/evolution.xml:6123(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Cada contacto obtiene una copia de la cita o reunión."
 
-#: C/evolution.xml:6118(para)
-msgid ""
-"In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
-"Tracking"
+#: C/evolution.xml:6129(para)
+#| msgid "In the Compose Message window, click Insert &gt; Send Options."
+msgid "In the Compose Meeting window, click Insert &gt; Send Options."
 msgstr ""
-"En la ventana del editor de mensaje pulse Insertar &gt; Opciones de envío "
-"&gt; Seguimiento de estado"
+"En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
 
-#: C/evolution.xml:6129(para)
+#: C/evolution.xml:6137(para)
 msgid ""
-"(Optional)Select the check box next to Auto-delete sent item to "
-"automatically delete the sent item from the Sent folder."
+"Select any of the options given (Delivered, Delivered and opened, All "
+"information)"
 msgstr ""
-"(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado para "
-"borrar automáticamente el elemento enviado de la carpeta Correo enviado."
+"Seleccione cualquiera de las opciones dadas (Entregado, Entregado y abierto, "
+"Toda la información)"
 
-#: C/evolution.xml:6144(para)
+#: C/evolution.xml:6156(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -12499,7 +12463,7 @@ msgstr ""
 "aceptar y rechazar elementos de parte del otro usuario, con las "
 "restricciones que el otro usuario ajuste."
 
-#: C/evolution.xml:6146(para)
+#: C/evolution.xml:6158(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -12509,27 +12473,27 @@ msgstr ""
 "diferente, siempre que la persona esté en el mismo sistema GroupWise. No "
 "puede establecer el proxy para un usuario en un sistema GroupWise diferente."
 
-#: C/evolution.xml:6151(link) C/evolution.xml:6168(title)
+#: C/evolution.xml:6163(link) C/evolution.xml:6180(title)
 msgid "Receiving Proxy Rights"
 msgstr "Obtener derechos del Proxy"
 
-#: C/evolution.xml:6154(link) C/evolution.xml:6173(title)
+#: C/evolution.xml:6166(link) C/evolution.xml:6185(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Asignar derechos proxy a otro usuario"
 
-#: C/evolution.xml:6157(link) C/evolution.xml:6244(title)
+#: C/evolution.xml:6169(link) C/evolution.xml:6256(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr "Añadir y eliminar nombres y derechos Proxy en su Lista proxy"
 
-#: C/evolution.xml:6160(link) C/evolution.xml:6275(title)
+#: C/evolution.xml:6172(link) C/evolution.xml:6287(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr "Gestionar el buzón de correo o el calendario de otra persona"
 
-#: C/evolution.xml:6163(link) C/evolution.xml:6299(title)
+#: C/evolution.xml:6175(link) C/evolution.xml:6311(title)
 msgid "Marking an Item Private"
 msgstr "Hacer un elemento privado"
 
-#: C/evolution.xml:6169(para)
+#: C/evolution.xml:6181(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -12542,7 +12506,7 @@ msgstr ""
 "seleccionar al usuario de tal forma que pueda acceder a su Buzón de correo o "
 "Calendario."
 
-#: C/evolution.xml:6174(para)
+#: C/evolution.xml:6186(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -12559,19 +12523,19 @@ msgstr ""
 "calendario, deles acceso de lectura para las citas. La siguiente tabla "
 "describe los permisos que puede otorgar a los usuarios:"
 
-#: C/evolution.xml:6182(para)
+#: C/evolution.xml:6194(para)
 msgid "Permission:"
 msgstr "Permiso:"
 
-#: C/evolution.xml:6185(para)
+#: C/evolution.xml:6197(para)
 msgid "Allows your proxy to do:"
 msgstr "Le permite a su proxy hacer:"
 
-#: C/evolution.xml:6192(para)
+#: C/evolution.xml:6204(para)
 msgid "Read"
 msgstr "Leer"
 
-#: C/evolution.xml:6195(para)
+#: C/evolution.xml:6207(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -12579,11 +12543,11 @@ msgstr ""
 "Leer los elementos que reciba. Los proxies no pueden ver su Carpeta de "
 "contactos con éste o cualquier otro derecho."
 
-#: C/evolution.xml:6200(para)
+#: C/evolution.xml:6212(para)
 msgid "Write"
 msgstr "Escribir"
 
-#: C/evolution.xml:6203(para)
+#: C/evolution.xml:6215(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -12592,11 +12556,11 @@ msgstr ""
 "Crear y enviar elementos en su nombre, incluyendo su firma si ha definido "
 "una. Asignar categorías a los elementos y cambiar el asunto de los elementos."
 
-#: C/evolution.xml:6208(para)
+#: C/evolution.xml:6220(para)
 msgid "Subscribe to my alarms"
 msgstr "Suscribirse a sus alertas"
 
-#: C/evolution.xml:6211(para)
+#: C/evolution.xml:6223(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -12604,11 +12568,11 @@ msgstr ""
 "Recibir las mismas alertas que usted reciba. Recibir alertas está soportado "
 "sólo si el proxy está en la misma oficina postal."
 
-#: C/evolution.xml:6216(para)
+#: C/evolution.xml:6228(para)
 msgid "Subscribe to my notifications"
 msgstr "Suscribirse a sus notificaciones"
 
-#: C/evolution.xml:6219(para)
+#: C/evolution.xml:6231(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -12617,11 +12581,11 @@ msgstr ""
 "notificaciones sólo está soportada si el proxy está en la misma oficina "
 "postal."
 
-#: C/evolution.xml:6224(para)
+#: C/evolution.xml:6236(para)
 msgid "Modify options/rules/folders"
 msgstr "Modificar opciones/reglas/carpetas"
 
-#: C/evolution.xml:6227(para)
+#: C/evolution.xml:6239(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -12634,11 +12598,11 @@ msgstr ""
 "modificar reglas y carpetas. Este permiso permite a un proxy añadir, borrar "
 "y modificar categorías."
 
-#: C/evolution.xml:6232(para)
+#: C/evolution.xml:6244(para)
 msgid "Read items marked Private"
 msgstr "Leer elementos marcados como Privado"
 
-#: C/evolution.xml:6235(para)
+#: C/evolution.xml:6247(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -12647,15 +12611,15 @@ msgstr ""
 "Privados a un proxy, todos los elementos marcados como Privado en su Buzón "
 "de correo permanecerán ocultos para ese proxy."
 
-#: C/evolution.xml:6250(para)
+#: C/evolution.xml:6262(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Seleccione la cuenta GruopWise para editarla, después pulse Editar."
 
-#: C/evolution.xml:6253(para)
+#: C/evolution.xml:6265(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Pulse en la solapa Proxy, después en Añadir."
 
-#: C/evolution.xml:6256(para)
+#: C/evolution.xml:6268(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -12663,11 +12627,11 @@ msgstr ""
 "Para añadir un usuario a la lista, escriba el nombre en la caja Nombre o "
 "importe el contacto de la Lista de contactos."
 
-#: C/evolution.xml:6259(para)
+#: C/evolution.xml:6271(para)
 msgid "Select the rights you want to give to the user."
 msgstr "Seleccione los derechos que quiere darle al usuario."
 
-#: C/evolution.xml:6264(para)
+#: C/evolution.xml:6276(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12676,7 +12640,7 @@ msgstr ""
 "\"Aai4sll\">Paso 5</link> para asignar derechos a cada usuario en la lista "
 "proxy."
 
-#: C/evolution.xml:6271(para)
+#: C/evolution.xml:6283(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12684,7 +12648,7 @@ msgstr ""
 "Para borrar un usuario de la lista proxy, seleccione el usuario, después "
 "pulse Quitar usuario."
 
-#: C/evolution.xml:6276(para)
+#: C/evolution.xml:6288(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12694,16 +12658,16 @@ msgstr ""
 "de proxy en su Lista proxy en las Preferencias. La cantidad de acceso que "
 "tenga dependerá de los permisos que le hayan concedido."
 
-#: C/evolution.xml:6279(para)
+#: C/evolution.xml:6291(para)
 msgid "Right-click on the GroupWise account in the folder list."
 msgstr ""
 "Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
 
-#: C/evolution.xml:6282(para)
+#: C/evolution.xml:6294(para)
 msgid "Click Proxy Login."
 msgstr "Pulse Sesión proxy."
 
-#: C/evolution.xml:6287(para)
+#: C/evolution.xml:6299(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12711,11 +12675,11 @@ msgstr ""
 "Escriba el nombre de usuario de la persona que le ha dado acceso proxy o "
 "selecciónelo de la lista."
 
-#: C/evolution.xml:6291(para)
+#: C/evolution.xml:6303(para)
 msgid "The user's data appears in the respective components."
 msgstr "Los datos del usuario aparecerán en los respectivos componentes."
 
-#: C/evolution.xml:6293(para)
+#: C/evolution.xml:6305(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12725,7 +12689,7 @@ msgstr ""
 "citas de cada usuario. También puede seleccionar si quiere mostrar las citas "
 "de un usuario en particular o no hacerlo."
 
-#: C/evolution.xml:6300(para)
+#: C/evolution.xml:6312(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12733,7 +12697,7 @@ msgstr ""
 "Puede limitar el acceso de un proxy a elementos individuales en su Buzón de "
 "correo o Calendario haciéndolos privados."
 
-#: C/evolution.xml:6301(para)
+#: C/evolution.xml:6313(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12743,7 +12707,7 @@ msgstr ""
 "puedan abrirlo. Los proxies no pueden acceder a los elementos marcados como "
 "Privado a no ser que les de esos permisos en su Lista de acceso."
 
-#: C/evolution.xml:6302(para)
+#: C/evolution.xml:6314(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12760,12 +12724,12 @@ msgstr ""
 "búsqueda de Disponibilidad en concordancia con el estado que seleccionó "
 "cuando aceptó la cita."
 
-#: C/evolution.xml:6305(para)
+#: C/evolution.xml:6317(para)
 msgid "In an open item, click Actions, then click Mark Private."
 msgstr ""
 "En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
 
-#: C/evolution.xml:6307(para)
+#: C/evolution.xml:6319(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12773,7 +12737,7 @@ msgstr ""
 "En su Calendario, pulse un elemento en las Citas, Notas de recordatorio o "
 "Lista de tareas, pulse Acciones y después pulse Marcar como privado."
 
-#: C/evolution.xml:6315(para)
+#: C/evolution.xml:6327(para)
 msgid ""
 "Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
@@ -12787,35 +12751,35 @@ msgstr ""
 "Debido a que estos ajustes están en el sistema GroupWise, su lista de SPAM "
 "le sigue de equipo en equipo."
 
-#: C/evolution.xml:6318(link) C/evolution.xml:6335(title)
+#: C/evolution.xml:6330(link) C/evolution.xml:6347(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marcar un mensaje como spam"
 
-#: C/evolution.xml:6321(link) C/evolution.xml:6345(title)
+#: C/evolution.xml:6333(link) C/evolution.xml:6357(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marcar un mensaje como no spam"
 
-#: C/evolution.xml:6324(link) C/evolution.xml:6359(title)
+#: C/evolution.xml:6336(link) C/evolution.xml:6371(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activar o desactivar su lista de correo basura"
 
-#: C/evolution.xml:6327(link) C/evolution.xml:6374(title)
+#: C/evolution.xml:6339(link) C/evolution.xml:6386(title)
 msgid "Adding an Email Address to Your Junk List"
 msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
 
-#: C/evolution.xml:6330(link) C/evolution.xml:6389(title)
+#: C/evolution.xml:6342(link) C/evolution.xml:6401(title)
 msgid "Removing an Email Address from Your Junk List"
 msgstr ""
 "Quitar una dirección de correo electrónico de su lista de correo basura"
 
-#: C/evolution.xml:6338(para)
+#: C/evolution.xml:6350(para)
 msgid ""
 "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Seleccione el mensaje marcado como spam, después pulse el icono de SPAM o "
 "pulse Ctrl+J."
 
-#: C/evolution.xml:6339(para)
+#: C/evolution.xml:6351(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12823,23 +12787,23 @@ msgstr ""
 "El mensaje se moverá a su carpeta de correo basura y el usuario se añadirá a "
 "su lista de spam."
 
-#: C/evolution.xml:6348(para)
+#: C/evolution.xml:6360(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Seleccione el mensaje para marcarlo como no spam en su Carpeta de correo "
 "basura."
 
-#: C/evolution.xml:6351(para)
+#: C/evolution.xml:6363(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Pulse con el botón derecho sobre el mensaje, después pulse Marcar como no "
 "spam."
 
-#: C/evolution.xml:6352(para)
+#: C/evolution.xml:6364(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "O seleccione el mensaje y pulse Mayús+Ctrl+J"
 
-#: C/evolution.xml:6353(para)
+#: C/evolution.xml:6365(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12847,29 +12811,29 @@ msgstr ""
 "El mensaje se moverá a su Bandeja de entrada y el nombre se eliminará de su "
 "lista de correo basura."
 
-#: C/evolution.xml:6362(para) C/evolution.xml:6377(para)
-#: C/evolution.xml:6392(para)
+#: C/evolution.xml:6374(para) C/evolution.xml:6389(para)
+#: C/evolution.xml:6404(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr "Pulse con el botón derecho, después pulse Opciones de spam."
 
-#: C/evolution.xml:6365(para)
+#: C/evolution.xml:6377(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
-#: C/evolution.xml:6380(para)
+#: C/evolution.xml:6392(para)
 msgid "Type the email address to block in the Email field."
 msgstr ""
 "Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
 
-#: C/evolution.xml:6383(para)
+#: C/evolution.xml:6395(para)
 msgid "Click Add, then click OK."
 msgstr "Pulse Añadir, después pulse Aceptar."
 
-#: C/evolution.xml:6395(para)
+#: C/evolution.xml:6407(para)
 msgid "Select the email address to remove, then click Remove."
 msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
-#: C/evolution.xml:6407(para)
+#: C/evolution.xml:6419(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
@@ -12880,39 +12844,39 @@ msgstr ""
 "puede que quiera cambiar su configuración de <trademark>Evolution</"
 "trademark>."
 
-#: C/evolution.xml:6410(link) C/evolution.xml:6464(title)
+#: C/evolution.xml:6422(link) C/evolution.xml:6476(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilización de cuentas de correo"
 
-#: C/evolution.xml:6413(link) C/evolution.xml:6507(title)
+#: C/evolution.xml:6425(link) C/evolution.xml:6521(title)
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:6416(link) C/evolution.xml:6562(title)
+#: C/evolution.xml:6428(link) C/evolution.xml:6577(title)
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: C/evolution.xml:6419(link) C/evolution.xml:6731(title)
+#: C/evolution.xml:6431(link) C/evolution.xml:6746(title)
 msgid "Composer Preferences"
 msgstr "Editor de correo"
 
-#: C/evolution.xml:6422(link) C/evolution.xml:6790(title)
+#: C/evolution.xml:6434(link) C/evolution.xml:6805(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6425(link) C/evolution.xml:7033(title)
+#: C/evolution.xml:6437(link) C/evolution.xml:7048(title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/evolution.xml:6428(link) C/evolution.xml:7016(title)
+#: C/evolution.xml:6440(link) C/evolution.xml:7031(title)
 msgid "Certificates"
 msgstr "Certificados"
 
-#: C/evolution.xml:6431(link) C/evolution.xml:7166(title)
+#: C/evolution.xml:6443(link) C/evolution.xml:7181(title)
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: C/evolution.xml:6434(para)
+#: C/evolution.xml:6446(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12926,15 +12890,15 @@ msgstr ""
 "de Evolution personalizar. La parte derecha de la ventana es donde realmente "
 "realizará cambios."
 
-#: C/evolution.xml:6436(para)
+#: C/evolution.xml:6448(para)
 msgid "There are six items you can customize."
 msgstr "Existen seis elementos que puede personalizar."
 
-#: C/evolution.xml:6438(title)
+#: C/evolution.xml:6450(title)
 msgid "Mail Accounts:"
 msgstr "Cuentas de correo:"
 
-#: C/evolution.xml:6439(para)
+#: C/evolution.xml:6451(para)
 msgid ""
 "Add or change information about your email accounts, such as the servers you "
 "connect to, the way you download mail, and your password authentication "
@@ -12947,11 +12911,11 @@ msgstr ""
 "complejo de la lista y está descrito en <link linkend=\"config-prefs-mail-"
 "identity\">Utilización de cuentas de correo</link>."
 
-#: C/evolution.xml:6442(title)
+#: C/evolution.xml:6454(title)
 msgid "Autocompletion:"
 msgstr "Autocompletado:"
 
-#: C/evolution.xml:6443(para)
+#: C/evolution.xml:6455(para)
 msgid ""
 "Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
@@ -12961,11 +12925,11 @@ msgstr ""
 "correo-e en el editor de mensajes. Para obtener más información vea <link "
 "linkend=\"bshoq5l\">Autocompletado</link>."
 
-#: C/evolution.xml:6446(title)
+#: C/evolution.xml:6458(title)
 msgid "Mail Preferences:"
 msgstr "Opciones de correo:"
 
-#: C/evolution.xml:6447(para)
+#: C/evolution.xml:6459(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12980,11 +12944,11 @@ msgstr ""
 "link>, pero la mayoría de los ajustes de correo están en <link linkend="
 "\"config-prefs-mail\">Opciones de correo</link>."
 
-#: C/evolution.xml:6450(title)
+#: C/evolution.xml:6462(title)
 msgid "Composer Preferences:"
 msgstr "Preferencias del editor:"
 
-#: C/evolution.xml:6451(para)
+#: C/evolution.xml:6463(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
 "signatures, and spelling. This includes the ability to substitute graphical "
@@ -12999,11 +12963,11 @@ msgstr ""
 "en las <link linkend=\"config-prefs-mail-composer\">Preferencias del editor</"
 "link>."
 
-#: C/evolution.xml:6454(title)
+#: C/evolution.xml:6466(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendario y tareas:"
 
-#: C/evolution.xml:6455(para)
+#: C/evolution.xml:6467(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -13014,11 +12978,11 @@ msgstr ""
 "más información vea <link linkend=\"config-prefs-cal\">Preferencias del "
 "calendario y de las tareas</link>."
 
-#: C/evolution.xml:6458(title)
+#: C/evolution.xml:6470(title)
 msgid "Certificates:"
 msgstr "Certificados:"
 
-#: C/evolution.xml:6459(para)
+#: C/evolution.xml:6471(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -13027,7 +12991,7 @@ msgstr ""
 "MIME. Para obtener más información vea <link linkend=\"bshoty0"
 "\">Certificados</link>."
 
-#: C/evolution.xml:6461(para)
+#: C/evolution.xml:6473(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -13043,7 +13007,7 @@ msgstr ""
 "botón derecho sobre la carpeta, y la delegación para Exchange está "
 "disponible en el menú Mensaje de la herramienta Exchange."
 
-#: C/evolution.xml:6465(para)
+#: C/evolution.xml:6477(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
 "are writing an email message, you can choose which account to use by "
@@ -13055,7 +13019,7 @@ msgstr ""
 "cuanta quiere usar seleccionándola de una lista desplegable junto al campo "
 "De: en el editor de mensajes."
 
-#: C/evolution.xml:6466(para)
+#: C/evolution.xml:6478(para)
 msgid ""
 "Click Send/Receive to update all mail sources that are not disabled. If you "
 "don't want to check mail for a given account, select the account in Edit "
@@ -13066,26 +13030,29 @@ msgstr ""
 "seleccione la cuenta en la página Editar &gt; Preferencias &gt; Cuentas de "
 "correo y pulse el botón Desactivar."
 
-#: C/evolution.xml:6467(para)
+#: C/evolution.xml:6479(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
-"assistant. To alter an existing account, select it in the Preferences "
-"window, then click Edit to open the account editor dialog box."
+"assistant."
+msgstr ""
+"Para añadir una cuenta nueva pulse Añadir para abrir el Asistente de "
+"configuración de Evolution."
+
+#: C/evolution.xml:6480(para)
+msgid "To alter an existing account, select it in the Preferences window."
 msgstr ""
-"Para añadir una cuenta nueva, pulse en Añadir para abrir el asistente de "
-"configuración de Evolution. Para modificar una cuenta existente, "
-"selecciónela y pulse en Editar para abrir el cuadro de diálogo del editor de "
-"cuentas."
+"Para modificar una cuenta existente selecciónela en la ventana de "
+"preferencias."
 
-#: C/evolution.xml:6468(para)
+#: C/evolution.xml:6482(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "El cuadro de diálogo del editor de cuentas cuenta con siete secciones:"
 
-#: C/evolution.xml:6470(title)
+#: C/evolution.xml:6484(title)
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: C/evolution.xml:6471(para)
+#: C/evolution.xml:6485(para)
 msgid ""
 "Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
@@ -13094,11 +13061,11 @@ msgstr ""
 "puede elegir una firma predeterminada para añadirla al final de los mensajes "
 "enviados desde esta cuenta."
 
-#: C/evolution.xml:6474(title)
+#: C/evolution.xml:6488(title)
 msgid "Receiving Email:"
 msgstr "Recibir correo electrónico:"
 
-#: C/evolution.xml:6475(para)
+#: C/evolution.xml:6489(para)
 msgid ""
 "Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
@@ -13117,7 +13084,7 @@ msgstr ""
 "seleccionar una de las tres opciones proporcionadas: Sin cifrado, Cifrado "
 "TLS o Cifrado SSL."
 
-#: C/evolution.xml:6477(para)
+#: C/evolution.xml:6491(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -13131,7 +13098,7 @@ msgstr ""
 "servidor SMTP.ejemplo.net, especifique SMTP.ejemplo.net:142 como nombre del "
 "servidor."
 
-#: C/evolution.xml:6478(para)
+#: C/evolution.xml:6492(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -13139,11 +13106,11 @@ msgstr ""
 "Para obtener información adicional, vea <link linkend=\"second-step"
 "\">Recepción de correo</link>."
 
-#: C/evolution.xml:6480(title)
+#: C/evolution.xml:6494(title)
 msgid "Receiving Options:"
 msgstr "Opciones de recepción:"
 
-#: C/evolution.xml:6481(para)
+#: C/evolution.xml:6495(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -13151,7 +13118,7 @@ msgstr ""
 "Decida si quiere descargar su correo automáticamente y con qué frecuencia, "
 "así como otras opciones de recuperación de los mensajes."
 
-#: C/evolution.xml:6483(para)
+#: C/evolution.xml:6497(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -13161,11 +13128,11 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:6485(title)
+#: C/evolution.xml:6499(title)
 msgid "Sending Mail:"
 msgstr "Envío de correo:"
 
-#: C/evolution.xml:6486(para)
+#: C/evolution.xml:6500(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
@@ -13177,7 +13144,7 @@ msgstr ""
 "instalado Evolution Connector para Microsoft Exchange), <link linkend="
 "\"sendmail\">Sendmail</link> o muchas otras opciones."
 
-#: C/evolution.xml:6488(para)
+#: C/evolution.xml:6502(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -13185,11 +13152,11 @@ msgstr ""
 "Para obtener información adicional vea <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
-#: C/evolution.xml:6490(title)
+#: C/evolution.xml:6504(title)
 msgid "Defaults:"
 msgstr "Predeterminados:"
 
-#: C/evolution.xml:6491(para)
+#: C/evolution.xml:6505(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
@@ -13199,7 +13166,7 @@ msgstr ""
 "los guardados como borradores. Si quiere restaurar la configuración "
 "predeterminada pulse el botón Revertir."
 
-#: C/evolution.xml:6493(para)
+#: C/evolution.xml:6507(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -13209,7 +13176,7 @@ msgstr ""
 "active la casilla Siempre enviar copia de carbón (Cc) a: o Siempre enviar "
 "copia de carbón oculta (Cco) a: e introduzca una o más direcciones."
 
-#: C/evolution.xml:6494(para)
+#: C/evolution.xml:6508(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -13220,7 +13187,7 @@ msgstr ""
 "por cada mensaje. Para obtener más información consulte <link linkend="
 "\"b13uhy6r\">Ajustes predeterminados</link>."
 
-#: C/evolution.xml:6495(para)
+#: C/evolution.xml:6509(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -13235,11 +13202,11 @@ msgstr ""
 "concordancia. Active el seguimiento de estado así como Devolver notificación "
 "para el correo, el calendario y las tareas."
 
-#: C/evolution.xml:6497(title)
+#: C/evolution.xml:6511(title)
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: C/evolution.xml:6498(para)
+#: C/evolution.xml:6512(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -13251,11 +13218,11 @@ msgstr ""
 "\"encryption\">Cifrado</link>) y elija, entre las cuatro opciones "
 "disponibles, la manera de manejar su clave y firma."
 
-#: C/evolution.xml:6501(title)
+#: C/evolution.xml:6515(title)
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: C/evolution.xml:6502(para)
+#: C/evolution.xml:6516(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -13264,7 +13231,7 @@ msgstr ""
 "ajustar el acceso proxy para que otros usuarios accedan a su Bandeja de "
 "correo o Calendario."
 
-#: C/evolution.xml:6508(para)
+#: C/evolution.xml:6522(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
 "for you in the mail composer. This functionality requires accessibility to "
@@ -13278,16 +13245,23 @@ msgstr ""
 "autocompletado, seleccione cada una de las libretas de direcciones que "
 "quiere usar en la página Autocompletado."
 
-#: C/evolution.xml:6512(title)
+#: C/evolution.xml:6526(title)
 msgid "IMAP Mail Headers"
 msgstr "Cabeceras de correo IMAP"
 
-#: C/evolution.xml:6513(para)
+#: C/evolution.xml:6527(para)
+#| msgid ""
+#| "Evolution allows you to choose the headers that you want to download so "
+#| "that you can reduce the download time and filter or move your mail around "
+#| "the way you like it. Evolution help you customize your IMAP Mail header "
+#| "preferences and thus save the download time. The IMAP Mail header options "
+#| "are as follows:"
 msgid ""
 "Evolution allows you to choose the headers that you want to download so that "
 "you can reduce the download time and filter or move your mail around the way "
-"you like it. Evolution help you customize your IMAP Mail header preferences "
-"and thus save the download time. The IMAP Mail header options are as follows:"
+"you like it. Evolution helps you to customize your IMAP Mail header "
+"preferences and thus save the download time. The IMAP Mail header options "
+"are as follows:"
 msgstr ""
 "Evolution le permite elegir las cabeceras que quiere descargar para reducir "
 "el tiempo de descarga y al mismo tiempo tener un control para filtrar o "
@@ -13295,23 +13269,21 @@ msgstr ""
 "las preferencias de las cabeceras de corroe IMAP y así ahorrar tiempo de "
 "descarga. Las cabeceras de correo IMAP son las siguientes:"
 
-#: C/evolution.xml:6515(title)
+#: C/evolution.xml:6529(title)
 msgid "All Headers:"
 msgstr "Todas las cabeceras:"
 
-#: C/evolution.xml:6516(para)
+#: C/evolution.xml:6530(para)
 msgid ""
-"This includes all the available IMAP Mail headers. By choosing this option, "
-"Evolution will download all the headers for all the messages."
+"All available IMAP mail headers for all the messages will be downloaded."
 msgstr ""
-"Esto incluye todas las cabeceras de correo IMAP disponibles. Eligiendo esta "
-"opción Evolution descargará todas las cabeceras de todos los mensajes."
+"Se descargarán todas las cabeceras IMAP disponibles para todos los mensajes."
 
-#: C/evolution.xml:6519(title)
+#: C/evolution.xml:6533(title)
 msgid "Basic Headers:"
 msgstr "Cabeceras básicas:"
 
-#: C/evolution.xml:6520(para)
+#: C/evolution.xml:6534(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -13325,11 +13297,11 @@ msgstr ""
 "en sus listas de correo, elija esta opción. Esto hará que Evolution trabaje "
 "más rápido y generalmente se recomienda para usuarios normales."
 
-#: C/evolution.xml:6523(title)
+#: C/evolution.xml:6537(title)
 msgid "Mailing List Headers:"
 msgstr "Cabeceras de las listas de correo:"
 
-#: C/evolution.xml:6524(para)
+#: C/evolution.xml:6538(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
@@ -13344,7 +13316,7 @@ msgstr ""
 "correo, el propietario de la lista de correo y demás, con lo que puede crear "
 "un filtro para listas de correo."
 
-#: C/evolution.xml:6526(para)
+#: C/evolution.xml:6540(para)
 msgid ""
 "This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
@@ -13359,16 +13331,16 @@ msgstr ""
 "correo. Si no tiene ningún filtro en Evolution, se recomienda que cambie a "
 "la opción «Cabeceras básicas»."
 
-#: C/evolution.xml:6527(para)
+#: C/evolution.xml:6541(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Para establecer las cabeceras de correo IMAP:"
 
-#: C/evolution.xml:6533(para)
-msgid "Select the IMAP account and click Edit to open the Account Editor."
-msgstr ""
-"Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
+#: C/evolution.xml:6547(para)
+#| msgid "Select the Exchange account."
+msgid "Select the IMAP account."
+msgstr "Seleccione la cuenta IMAP."
 
-#: C/evolution.xml:6536(para)
+#: C/evolution.xml:6551(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
@@ -13376,14 +13348,14 @@ msgstr ""
 "En el Editor de cuentas, pulse la solapa Cabeceras IMAP para abrir las "
 "Cabeceras IMAP en el Editor de cuentas."
 
-#: C/evolution.xml:6541(para)
+#: C/evolution.xml:6556(para)
 msgid ""
 "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Pulse Obtener todas las cabeceras para descargar toda la información "
 "disponible sobre las cabeceras."
 
-#: C/evolution.xml:6543(para)
+#: C/evolution.xml:6558(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -13391,25 +13363,25 @@ msgstr ""
 "Cuantas más cabeceras tenga más tiempo llevará descargarlas. No se "
 "recomienda esta opción."
 
-#: C/evolution.xml:6547(para)
+#: C/evolution.xml:6562(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr "Pulse Cabeceras básicas para descargar las cabeceras básicas."
 
-#: C/evolution.xml:6550(para)
+#: C/evolution.xml:6565(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Pulse Cabeceras básicas y de listas de correo predeterminadas para descargar "
 "ambas."
 
-#: C/evolution.xml:6553(para)
+#: C/evolution.xml:6568(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr "Pulse Añadir para añadir cualquier cabecera predefinida."
 
-#: C/evolution.xml:6556(para)
+#: C/evolution.xml:6571(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Pulse Eliminar para eliminar las cabeceras personalizadas."
 
-#: C/evolution.xml:6563(para)
+#: C/evolution.xml:6578(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -13419,35 +13391,35 @@ msgstr ""
 "así como otros ajustes de representación del correo."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:6566(link) C/evolution.xml:6590(title)
+#: C/evolution.xml:6581(link) C/evolution.xml:6605(title)
 msgid "General Mail Settings"
 msgstr "Ajustes generales del correo"
 
-#: C/evolution.xml:6569(link) C/evolution.xml:6612(title)
+#: C/evolution.xml:6584(link) C/evolution.xml:6627(title)
 msgid "HTML Mail Preferences"
 msgstr "Preferencias del correo en HTML"
 
-#: C/evolution.xml:6572(link) C/evolution.xml:6630(title)
+#: C/evolution.xml:6587(link) C/evolution.xml:6645(title)
 msgid "Label Preferences"
 msgstr "Preferencias de las etiquetas"
 
-#: C/evolution.xml:6575(link) C/evolution.xml:6664(title)
+#: C/evolution.xml:6590(link) C/evolution.xml:6679(title)
 msgid "Mail Header Preferences"
 msgstr "Opciones de las cabeceras del correo"
 
-#: C/evolution.xml:6578(link) C/evolution.xml:6676(title)
+#: C/evolution.xml:6593(link) C/evolution.xml:6691(title)
 msgid "Junk Mail Preferences"
 msgstr "Opciones de correo spam"
 
-#: C/evolution.xml:6581(link) C/evolution.xml:6719(title)
+#: C/evolution.xml:6596(link) C/evolution.xml:6734(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Preferencias de los contactos automáticos"
 
-#: C/evolution.xml:6584(link) C/evolution.xml:6725(title)
+#: C/evolution.xml:6599(link) C/evolution.xml:6740(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6587(para)
+#: C/evolution.xml:6602(para)
 msgid ""
 "For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
@@ -13456,15 +13428,18 @@ msgstr ""
 "<link linkend=\"config-prefs-mail-identity\">Utilización de cuentas de "
 "correo</link>."
 
-#: C/evolution.xml:6591(para) C/evolution.xml:6747(para)
-msgid "The General page has the following options:"
-msgstr "La página General tiene las siguientes opciones:"
+#: C/evolution.xml:6606(para) C/evolution.xml:6628(para)
+#: C/evolution.xml:6762(para) C/evolution.xml:6824(para)
+#: C/evolution.xml:6910(para)
+#| msgid "The following server types are available:"
+msgid "The following options are available:"
+msgstr "Las siguientes opciones están disponibles:"
 
-#: C/evolution.xml:6593(title)
+#: C/evolution.xml:6608(title)
 msgid "Message Fonts:"
 msgstr "Tipografías del mensaje:"
 
-#: C/evolution.xml:6594(para)
+#: C/evolution.xml:6609(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
@@ -13475,18 +13450,31 @@ msgstr ""
 "las mismas tipografías que en otras aplicaciones y elija una tipografía "
 "estándar y otra de tamaño fijo."
 
-#: C/evolution.xml:6597(title)
+#: C/evolution.xml:6612(title)
 msgid "Message Display:"
 msgstr "Vista de los mensajes:"
 
-#: C/evolution.xml:6598(para)
+#: C/evolution.xml:6613(para)
+#| msgid ""
+#| "Choose how long you want to wait before marking a message read, how to "
+#| "highlight quotations, and the default encoding. Enable <guilabel>Fall "
+#| "back to threading message by subject</guilabel> to group the messages as "
+#| "message threads. You can also set the limit to the number of addresses "
+#| "displayed in the message header by enabling <guilabel>Shrink To/CC/BCC "
+#| "header to</guilabel> option.You can also set the limit for rendering text "
+#| "content in the message you receive. By default, when you receive a "
+#| "message with text content more than 4096 Kilo Bytes, Evolution will not "
+#| "render the message in the preview pane. You can view unformatted text "
+#| "either inline or using an external application. You can also enable the "
+#| "<link linkend=\"b17rgdac\">Magic spacebar</link> and <link linkend="
+#| "\"usage-mail-organize-vfolders\">search folders</link>."
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
 "highlight quotations, and the default encoding. Enable <guilabel>Fall back "
 "to threading message by subject</guilabel> to group the messages as message "
 "threads. You can also set the limit to the number of addresses displayed in "
 "the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
-"guilabel> option.You can also set the limit for rendering text content in "
+"guilabel> option. You can also set the limit for rendering text content in "
 "the message you receive. By default, when you receive a message with text "
 "content more than 4096 Kilo Bytes, Evolution will not render the message in "
 "the preview pane. You can view unformatted text either inline or using an "
@@ -13508,7 +13496,7 @@ msgstr ""
 "\">Barra espaciadora mágica</link> y las <link linkend=\"usage-mail-organize-"
 "vfolders\">carpetas de búsqueda</link>."
 
-#: C/evolution.xml:6600(para)
+#: C/evolution.xml:6615(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
 "Ctrl+T."
@@ -13516,11 +13504,11 @@ msgstr ""
 "Para agrupar mensajes por conversaciones, seleccione Ver &gt; Agrupar por "
 "conversaciones o pulse Ctrl +T."
 
-#: C/evolution.xml:6602(title)
+#: C/evolution.xml:6617(title)
 msgid "Deleting Mail:"
 msgstr "Borrar correo:"
 
-#: C/evolution.xml:6603(para)
+#: C/evolution.xml:6618(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
@@ -13535,11 +13523,11 @@ msgstr ""
 "frecuencia para la eliminación: Cada vez, Una vez por día, Una vez por "
 "semana y Una vez por mes."
 
-#: C/evolution.xml:6606(title)
+#: C/evolution.xml:6621(title)
 msgid "New Mail Notifications:"
 msgstr "Notificaciones de correo nuevo:"
 
-#: C/evolution.xml:6607(para)
+#: C/evolution.xml:6622(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -13550,23 +13538,19 @@ msgstr ""
 "ninguno, tal como prefiera. Puede elegir no notificar la llegada de correo "
 "nuevo."
 
-#: C/evolution.xml:6613(para)
-msgid "The HTML Mail page has the following options:"
-msgstr "La página Correo HTML tiene las siguientes opciones:"
-
-#: C/evolution.xml:6615(title)
+#: C/evolution.xml:6630(title)
 msgid "Show Image Animations:"
 msgstr "Mostrar imágenes animadas:"
 
-#: C/evolution.xml:6616(para)
+#: C/evolution.xml:6631(para)
 msgid "Turns image animation (e.g. GIF files) on or off."
 msgstr "Activar o desactivar las animaciones (ej. archivos GIF)."
 
-#: C/evolution.xml:6619(title)
+#: C/evolution.xml:6634(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr "Preguntar al mandar mensajes HTML a contactos que no los quieren:"
 
-#: C/evolution.xml:6620(para)
+#: C/evolution.xml:6635(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -13577,11 +13561,11 @@ msgstr ""
 "HTML a personas a las que previamente ha anotado en su libreta de "
 "direcciones que no quieren recibirlo."
 
-#: C/evolution.xml:6623(title)
+#: C/evolution.xml:6638(title)
 msgid "Loading Images:"
 msgstr "Cargar imágenes:"
 
-#: C/evolution.xml:6624(para)
+#: C/evolution.xml:6639(para)
 msgid ""
 "You can embed a image in an email and have it load only when the message "
 "arrives. However, spammers can use image loading patterns to confirm "
@@ -13596,7 +13580,7 @@ msgstr ""
 "carguen las imágenes automáticamente, hacerlo solamente si el remitente está "
 "en su libreta de direcciones o cargarlas siempre."
 
-#: C/evolution.xml:6626(para)
+#: C/evolution.xml:6641(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
@@ -13606,7 +13590,7 @@ msgstr ""
 "imágenes en cada mensaje seleccionando Ver &gt; Cargar imágenes o pulsando "
 "Ctrl+I."
 
-#: C/evolution.xml:6631(para)
+#: C/evolution.xml:6646(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
 "of messages. You can add, edit, or remove the labels. You can also assign "
@@ -13616,47 +13600,47 @@ msgstr ""
 "color para diferentes tipos de mensajes. Puede añadir, editar o eliminar las "
 "etiquetas. También puede asignar colores a cada etiqueta que haya creado."
 
-#: C/evolution.xml:6633(para)
+#: C/evolution.xml:6648(para)
 msgid "To create a label:"
 msgstr "Para crear una etiqueta:"
 
-#: C/evolution.xml:6636(para)
+#: C/evolution.xml:6651(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 "Pulse Añadir y especifique el nombre en la caja de diálogo Nombre de la "
 "etiqueta."
 
-#: C/evolution.xml:6639(para)
+#: C/evolution.xml:6654(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr "Pulse la solapa de color y seleccione el color, después pulse Aceptar."
 
-#: C/evolution.xml:6642(para)
+#: C/evolution.xml:6657(para)
 msgid "To edit label properties:"
 msgstr "Para editar las propiedades de la etiqueta:"
 
-#: C/evolution.xml:6645(para)
+#: C/evolution.xml:6660(para)
 msgid "Select the label and click Edit."
 msgstr "Seleccione la etiqueta y pulse Editar."
 
-#: C/evolution.xml:6648(para)
+#: C/evolution.xml:6663(para)
 msgid "Edit name and color, then click OK."
 msgstr "Edite el nombre y color, después pulse Aceptar."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:6651(para)
+#: C/evolution.xml:6666(para)
 msgid "To assign a label to a specific email message:"
 msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
-#: C/evolution.xml:6654(para)
+#: C/evolution.xml:6669(para)
 msgid "Right-click the message from the message preview."
 msgstr ""
 "Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
 
-#: C/evolution.xml:6657(para)
+#: C/evolution.xml:6672(para)
 msgid "Click Label and select the desired label for the message."
 msgstr "Pulse Etiqueta y seleccione la etiqueta deseada para el mensaje."
 
-#: C/evolution.xml:6665(para)
+#: C/evolution.xml:6680(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13671,11 +13655,11 @@ msgstr ""
 "puede añadir o quitar cabeceras a la lista. Las cabeceras predeterminadas no "
 "se pueden eliminar."
 
-#: C/evolution.xml:6667(title)
+#: C/evolution.xml:6682(title)
 msgid "Sender Photograph:"
 msgstr "Foto del remitente:"
 
-#: C/evolution.xml:6668(para)
+#: C/evolution.xml:6683(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13683,7 +13667,7 @@ msgstr ""
 "Esta característica añade soporte para ver la fotografía del remitente en la "
 "parte derecha del panel de vista preliminar."
 
-#: C/evolution.xml:6670(para)
+#: C/evolution.xml:6685(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13694,7 +13678,7 @@ msgstr ""
 "vista preliminar del correo-e. Deseleccione esta opción para desactivar esta "
 "característica."
 
-#: C/evolution.xml:6671(para)
+#: C/evolution.xml:6686(para)
 msgid ""
 "By default it searches only in the local address books enabled for "
 "autocompletion. If you deselect the option <guilabel>Search for sender "
@@ -13715,7 +13699,7 @@ msgstr ""
 "tomará el primer contacto independientemente de que tenga o no una "
 "fotografía."
 
-#: C/evolution.xml:6672(para)
+#: C/evolution.xml:6687(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13723,7 +13707,7 @@ msgstr ""
 "Esta característica está desactivada de forma predeterminada ya que causa "
 "retraso al obtener los correos."
 
-#: C/evolution.xml:6677(para)
+#: C/evolution.xml:6692(para)
 msgid ""
 "You can check your incoming messages for junk content by using Bogofilter "
 "and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
@@ -13734,11 +13718,11 @@ msgstr ""
 "Debeactivar los respectivos complementos de SPAM para activar el filtro de "
 "SPAM."
 
-#: C/evolution.xml:6678(para)
+#: C/evolution.xml:6693(para)
 msgid "To enable Junk plugins:"
 msgstr "Activar complementos anti SPAM:"
 
-#: C/evolution.xml:6684(para)
+#: C/evolution.xml:6699(para)
 msgid ""
 "Select the junk plugins you want. You can select either Bogofilter or "
 "SpamAssassin, or you can select both."
@@ -13746,11 +13730,11 @@ msgstr ""
 "Seleccione los complementos de filtro de SPAM que quiera. Puede seleccionar "
 "tanto Bogofilter como SpamAssasin, o puede seleccionar los dos."
 
-#: C/evolution.xml:6688(title)
+#: C/evolution.xml:6703(title)
 msgid "General:"
 msgstr "General:"
 
-#: C/evolution.xml:6689(para)
+#: C/evolution.xml:6704(para)
 msgid ""
 "You can check incoming email for junk contents and also decide how often you "
 "want to delete junk mail. You also have the option to choose either "
@@ -13760,20 +13744,20 @@ msgstr ""
 "frecuencia quiere borrar el correo basura. También tiene la opción de elegir "
 "entre SpamAssasin, Bogofilter o ambos."
 
-#: C/evolution.xml:6692(title)
+#: C/evolution.xml:6707(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Detectar si el correo entrante es spam:"
 
-#: C/evolution.xml:6693(para)
+#: C/evolution.xml:6708(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr ""
 "Esta opción activa los filtros de comprobación automática de correo basura."
 
-#: C/evolution.xml:6696(title)
+#: C/evolution.xml:6711(title)
 msgid "Delete junk mail on exit:"
 msgstr "Borrar los correos SPAM al salir:"
 
-#: C/evolution.xml:6697(para)
+#: C/evolution.xml:6712(para)
 msgid ""
 "This option deletes junk messages when you exit. You can also specify when "
 "to delete the junk messages (every time, once per day, once per week, once "
@@ -13783,11 +13767,11 @@ msgstr ""
 "cuándo se deben borrar los correos basura de las opciones (Cada vez, Una vez "
 "por día, Una vez por semana, Una vez por mes)."
 
-#: C/evolution.xml:6700(title)
+#: C/evolution.xml:6715(title)
 msgid "Default junk plugin:"
 msgstr "Complemento spam predeterminado:"
 
-#: C/evolution.xml:6701(para)
+#: C/evolution.xml:6716(para)
 msgid ""
 "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
 "can view them only if you have enabled the respective plugins. When you "
@@ -13799,11 +13783,11 @@ msgstr ""
 "Cuando seleccione cualquier opción, también le informa si el binario "
 "correspondiente está disponible o no."
 
-#: C/evolution.xml:6705(title)
+#: C/evolution.xml:6720(title)
 msgid "SpamAssassin Options:"
 msgstr "Opciones de SpamAssasin:"
 
-#: C/evolution.xml:6706(para)
+#: C/evolution.xml:6721(para)
 msgid ""
 "Remote Test performs junk mail filtering on remote servers. It also includes "
 "online tests, like checking for blacklisted message senders and ISPs."
@@ -13812,7 +13796,7 @@ msgstr ""
 "También incluyen pruebas en línea como comprobación de remitentes e ISP en "
 "listas negras."
 
-#: C/evolution.xml:6708(para)
+#: C/evolution.xml:6723(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
@@ -13829,11 +13813,11 @@ msgstr ""
 "eficacia. Cuando seleccione esta opción, no necesitará ninguna configuración "
 "adicional para que funcione."
 
-#: C/evolution.xml:6710(title)
+#: C/evolution.xml:6725(title)
 msgid "Bogofilter Options:"
 msgstr "Opciones de Bogofilter:"
 
-#: C/evolution.xml:6711(para)
+#: C/evolution.xml:6726(para)
 msgid ""
 "Select Convert mail text to Unicode to enable Unicode* filtering. For more "
 "information on Bogofilter, see the <ulink url=\"http://bogofilter."
@@ -13844,7 +13828,7 @@ msgstr ""
 "consulte el <ulink url=\"http://bogofilter.sourceforge.net/\">sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:6714(para)
+#: C/evolution.xml:6729(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
 "Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
@@ -13857,7 +13841,7 @@ msgstr ""
 "bajo Editar &gt; Preferencias &gt; Opciones de correo &gt; SPAM &gt; General "
 "se refiere sólo al correo POP y Correo local."
 
-#: C/evolution.xml:6720(para)
+#: C/evolution.xml:6735(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13868,7 +13852,7 @@ msgstr ""
 "direcciones. Puede seleccionar la libreta de direcciones predeterminada para "
 "los contactos automáticos de la lista."
 
-#: C/evolution.xml:6721(para)
+#: C/evolution.xml:6736(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13880,7 +13864,7 @@ msgstr ""
 "Actualmente esto sólo funciona con Pidgin. Su libreta de direcciones no debe "
 "ser de sólo lectura para que ambas características funcionen correctamente."
 
-#: C/evolution.xml:6726(para)
+#: C/evolution.xml:6741(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13889,7 +13873,7 @@ msgstr ""
 "También le permite seleccionar calendarios para buscar conflictos entre "
 "reuniones."
 
-#: C/evolution.xml:6732(para)
+#: C/evolution.xml:6747(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
 "composer preferences. The General tab covers assorted behavior, the "
@@ -13901,19 +13885,19 @@ msgstr ""
 "configurar el comportamiento, la solapa Firma le permite establecer su firma "
 "y la solapa Ortografía controla la corrección ortográfica."
 
-#: C/evolution.xml:6738(link) C/evolution.xml:6778(title)
+#: C/evolution.xml:6753(link) C/evolution.xml:6793(title)
 msgid "Signature"
 msgstr "Firma"
 
-#: C/evolution.xml:6741(link) C/evolution.xml:6783(title)
+#: C/evolution.xml:6756(link) C/evolution.xml:6798(title)
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: C/evolution.xml:6749(title)
+#: C/evolution.xml:6764(title)
 msgid "Default Behavior:"
 msgstr "Comportamiento predeterminado:"
 
-#: C/evolution.xml:6750(para)
+#: C/evolution.xml:6765(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13923,7 +13907,7 @@ msgstr ""
 "caracteres usará, si desea utilizar el formato HTML y en ese caso, si desea "
 "utilizar emoticones."
 
-#: C/evolution.xml:6752(para)
+#: C/evolution.xml:6767(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13933,11 +13917,11 @@ msgstr ""
 "citado. Elija la forma de responder de la lista desplegable: Citar el "
 "mensaje original, No citar el mensaje original, Adjuntar mensaje original."
 
-#: C/evolution.xml:6754(title)
+#: C/evolution.xml:6769(title)
 msgid "Top Posting Options:"
 msgstr "Opciones de publicar por encima:"
 
-#: C/evolution.xml:6755(para)
+#: C/evolution.xml:6770(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13952,28 +13936,28 @@ msgstr ""
 "del correo electrónico."
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6758(title) C/evolution.xml:6831(title)
+#: C/evolution.xml:6773(title) C/evolution.xml:6846(title)
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: C/evolution.xml:6759(para)
+#: C/evolution.xml:6774(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Hay dos alertas opcionales que puede seleccionar:"
 
-#: C/evolution.xml:6764(title)
+#: C/evolution.xml:6779(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Preguntar al mandar mensajes con el asunto vacío:"
 
-#: C/evolution.xml:6765(para)
+#: C/evolution.xml:6780(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr ""
 "El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
 
-#: C/evolution.xml:6770(title)
+#: C/evolution.xml:6785(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr "Preguntar al mandar mensajes que sólo tengan definido Cco:"
 
-#: C/evolution.xml:6771(para)
+#: C/evolution.xml:6786(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13985,7 +13969,7 @@ msgstr ""
 "correo sólo aceptarán copias ocultas cuando el mensaje contiene al menos un "
 "destinatario visible para todos los lectores."
 
-#: C/evolution.xml:6779(para)
+#: C/evolution.xml:6794(para)
 msgid ""
 "The signature editor allows you to create several different signatures in "
 "plain text or in HTML, and to specify which of them will be added to email "
@@ -13998,7 +13982,7 @@ msgstr ""
 "una firma alternativa, o no utilizar ninguna, desde el propio editor de "
 "correo."
 
-#: C/evolution.xml:6784(para)
+#: C/evolution.xml:6799(para)
 msgid ""
 "To choose a spell-checking language, select it here. You must install gnome-"
 "spell, aspell, and an aspell language package (like for example aspell-en "
@@ -14017,56 +14001,52 @@ msgstr ""
 "ortografía mientras se escribe. Puede ajustar el color de las palabras mal "
 "escritas."
 
-#: C/evolution.xml:6791(para)
+#: C/evolution.xml:6806(para)
 msgid "The calendar configuration tool has several pages:"
 msgstr "La herramienta de configuración del calendario tiene varias páginas:"
 
-#: C/evolution.xml:6797(link) C/evolution.xml:6837(title)
+#: C/evolution.xml:6812(link) C/evolution.xml:6852(title)
 msgid "Display"
 msgstr "Mostrar"
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6800(link) C/evolution.xml:6870(title)
+#: C/evolution.xml:6815(link) C/evolution.xml:6885(title)
 msgid "Alarms"
 msgstr "Alertas"
 
-#: C/evolution.xml:6803(link) C/evolution.xml:6883(title)
+#: C/evolution.xml:6818(link) C/evolution.xml:6898(title)
 msgid "Calendar Publishing"
 msgstr "Publicar el calendario"
 
-#: C/evolution.xml:6809(para)
-msgid "The General page lets you set the following options:"
-msgstr "La página General le permite establecer los siguientes valores:"
-
-#: C/evolution.xml:6811(title)
+#: C/evolution.xml:6826(title)
 msgid "Time Zone:"
 msgstr "Zona horaria:"
 
-#: C/evolution.xml:6812(para)
+#: C/evolution.xml:6827(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr "La ciudad en la que se encuentra, para calcular su zona horaria."
 
-#: C/evolution.xml:6815(title)
+#: C/evolution.xml:6830(title)
 msgid "Time Format:"
 msgstr "Formato de la hora:"
 
-#: C/evolution.xml:6816(para)
+#: C/evolution.xml:6831(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
 
-#: C/evolution.xml:6819(title)
+#: C/evolution.xml:6834(title)
 msgid "Week Starts:"
 msgstr "La semana empieza en:"
 
-#: C/evolution.xml:6820(para)
+#: C/evolution.xml:6835(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Seleccione el día a mostrar como el primer día de cada semana."
 
-#: C/evolution.xml:6823(title)
+#: C/evolution.xml:6838(title)
 msgid "Day Begins:"
 msgstr "El día comienza a las:"
 
-#: C/evolution.xml:6824(para)
+#: C/evolution.xml:6839(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
 "select your preferred hours."
@@ -14074,15 +14054,15 @@ msgstr ""
 "Para Evolution, un día normal de trabajo comienza a las 9 horas y termina a "
 "las 17 horas. Puede seleccionar su horario de trabajo preferido."
 
-#: C/evolution.xml:6827(title)
+#: C/evolution.xml:6842(title)
 msgid "Day Ends:"
 msgstr "El día acaba a las:"
 
-#: C/evolution.xml:6828(para)
+#: C/evolution.xml:6843(para)
 msgid "Sets the end of a normal workday."
 msgstr "Establece el final de un día de trabajo normal."
 
-#: C/evolution.xml:6832(para)
+#: C/evolution.xml:6847(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -14090,7 +14070,7 @@ msgstr ""
 "Active las casillas si desea mostrar una advertencia antes de eliminar "
 "cualquier cita, o recibir recordatorios automáticos para cada acontecimiento."
 
-#: C/evolution.xml:6838(para)
+#: C/evolution.xml:6853(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -14098,11 +14078,11 @@ msgstr ""
 "La sección Vista sirve para elegir la presentación de sus citas y tareas "
 "dentro del calendario."
 
-#: C/evolution.xml:6840(title)
+#: C/evolution.xml:6855(title)
 msgid "Time Divisions:"
 msgstr "Divisiones de horas:"
 
-#: C/evolution.xml:6841(para)
+#: C/evolution.xml:6856(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -14110,12 +14090,12 @@ msgstr ""
 "Establece el incremento de tiempo mostrado como líneas finas en la vista "
 "diaria del calendario."
 
-#: C/evolution.xml:6844(title)
+#: C/evolution.xml:6859(title)
 msgid "Show appointment end times in week and month views:"
 msgstr ""
 "Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
 
-#: C/evolution.xml:6845(para)
+#: C/evolution.xml:6860(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -14123,11 +14103,11 @@ msgstr ""
 "Si hay espacio suficiente, el cliente Evolution mostrará las horas finales "
 "en las vistas semanales y mensajes para cada cita."
 
-#: C/evolution.xml:6848(title)
+#: C/evolution.xml:6863(title)
 msgid "Compress weekends in month view:"
 msgstr "Comprimir fines de semana en la vista mensual:"
 
-#: C/evolution.xml:6849(para)
+#: C/evolution.xml:6864(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -14135,37 +14115,37 @@ msgstr ""
 "Seleccione esta opción para mostrar los fines de semana en una caja en lugar "
 "de dos en la vista mensual."
 
-#: C/evolution.xml:6852(title)
+#: C/evolution.xml:6867(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Muestra los números de las semanas en el navegador de fechas:"
 
-#: C/evolution.xml:6853(para)
+#: C/evolution.xml:6868(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 "Muestra los números de la semana junto a las respectivas semanas en el "
 "calendario."
 
-#: C/evolution.xml:6856(title)
+#: C/evolution.xml:6871(title)
 msgid "Tasks due today:"
 msgstr "Tareas que vencen hoy:"
 
-#: C/evolution.xml:6857(para)
+#: C/evolution.xml:6872(para)
 msgid "Select the color for tasks due today."
 msgstr "Establece el color para las tareas que vencen hoy."
 
-#: C/evolution.xml:6860(title)
+#: C/evolution.xml:6875(title)
 msgid "Overdue tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:6861(para)
+#: C/evolution.xml:6876(para)
 msgid "Select the color for overdue tasks."
 msgstr "Establece el color para las tareas vencidas."
 
-#: C/evolution.xml:6864(title)
+#: C/evolution.xml:6879(title)
 msgid "Hide completed tasks after:"
 msgstr "Ocultar las tareas completadas tras:"
 
-#: C/evolution.xml:6865(para)
+#: C/evolution.xml:6880(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -14176,11 +14156,11 @@ msgstr ""
 "opción, las tareas completadas se mantendrán en su lista de tareas, marcadas "
 "como completadas."
 
-#: C/evolution.xml:6872(title)
+#: C/evolution.xml:6887(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Seleccionar los calendarios para las notificaciones de alerta:"
 
-#: C/evolution.xml:6873(para)
+#: C/evolution.xml:6888(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -14190,15 +14170,15 @@ msgstr ""
 "Si no selecciona el calendario no tendrá notificaciones de alerta para "
 "ningún acontecimiento en este calendario."
 
-#: C/evolution.xml:6878(title)
+#: C/evolution.xml:6893(title)
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: C/evolution.xml:6885(title)
+#: C/evolution.xml:6900(title)
 msgid "Publishing:"
 msgstr "Publicación:"
 
-#: C/evolution.xml:6886(para)
+#: C/evolution.xml:6901(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -14209,24 +14189,19 @@ msgstr ""
 "publicación, la frecuencia de publicación, qué calendario publicará y cómo "
 "qué persona autenticarse."
 
-#: C/evolution.xml:6892(title)
+#: C/evolution.xml:6907(title)
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
-#: C/evolution.xml:6893(para)
+#: C/evolution.xml:6908(para)
 msgid "This interface lets you configure your network proxy settings."
 msgstr "Esta interfaz le permite configurar sus ajustes del proxy de la red."
 
-#: C/evolution.xml:6895(para)
-msgid "Use the following four options to configure the proxy settings:"
-msgstr ""
-"Use las siguientes cuatro opciones para configurar los ajustes del proxy:"
-
-#: C/evolution.xml:6897(title)
+#: C/evolution.xml:6912(title)
 msgid "Use system defaults:"
 msgstr "Usar los valores predeterminados del sistema:"
 
-#: C/evolution.xml:6898(para)
+#: C/evolution.xml:6913(para)
 msgid ""
 "Select this option to use the system wide proxy settings configured through "
 "Control Center &gt; Network Proxies in GNOME. When this option is selected, "
@@ -14238,7 +14213,7 @@ msgstr ""
 "está seleccionada Evolution usa los ajustes del proxy en las claves /system/"
 "http_proxy y /system/proxy/gconf."
 
-#: C/evolution.xml:6901(para)
+#: C/evolution.xml:6916(para)
 msgid ""
 "If these keys do not reflect the settings configured through Control Center "
 "&gt; Network Proxies, Evolution does not work with the proxy and you must "
@@ -14248,19 +14223,19 @@ msgstr ""
 "control &gt; Proxy de la red, Evolution no trabajará con el proxy y deberá "
 "actualizar esas claves de gconf o elegir Configuración manual del proxy."
 
-#: C/evolution.xml:6904(title)
+#: C/evolution.xml:6919(title)
 msgid "Direct connection to the Internet:"
 msgstr "Conexión directa a Internet:"
 
-#: C/evolution.xml:6905(para)
+#: C/evolution.xml:6920(para)
 msgid "Select this option to connect directly to the internet."
 msgstr "Seleccione esta opción para conectarse directamente a Internet."
 
-#: C/evolution.xml:6908(title)
+#: C/evolution.xml:6923(title)
 msgid "Manual proxy configuration:"
 msgstr "Configuración manual del proxy:"
 
-#: C/evolution.xml:6909(para)
+#: C/evolution.xml:6924(para)
 msgid ""
 "This option helps you costomize proxy settings regardless of the desktop you "
 "use. Specify hosts and ports for HTTP and optionally for other protocols. In "
@@ -14281,60 +14256,60 @@ msgstr ""
 "Usar autenticación para activar los campos usuario y contraseña. Los ajustes "
 "personalizados del proxy son los siguientes:"
 
-#: C/evolution.xml:6918(para)
+#: C/evolution.xml:6933(para)
 msgid "Proxy Configuration Settings"
 msgstr "Ajustes de configuración del proxy"
 
-#: C/evolution.xml:6928(para)
+#: C/evolution.xml:6943(para)
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: C/evolution.xml:6931(para)
+#: C/evolution.xml:6946(para)
 msgid "The machine name to proxy HTTP through."
 msgstr "El nombre de la máquina sobre la que pasar a través del proxy HTTP."
 
-#: C/evolution.xml:6936(para) C/evolution.xml:6952(para)
-#: C/evolution.xml:6968(para)
+#: C/evolution.xml:6951(para) C/evolution.xml:6967(para)
+#: C/evolution.xml:6983(para)
 msgid "Port"
 msgstr "Puerto"
 
-#: C/evolution.xml:6939(para)
+#: C/evolution.xml:6954(para)
 msgid ""
 "The port for the machine defined by the HTTP Proxy field that you proxy "
 "through."
 msgstr "El puerto para la máquina definida por el campo puerto del Proxy HTTP."
 
-#: C/evolution.xml:6944(para)
+#: C/evolution.xml:6959(para)
 msgid "Secure HTTP Proxy"
 msgstr "Proxy HTTP seguro"
 
-#: C/evolution.xml:6947(para)
+#: C/evolution.xml:6962(para)
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 "El nombre de la máquina sobre la que pasar a través del proxy HTTP seguro"
 
-#: C/evolution.xml:6955(para)
+#: C/evolution.xml:6970(para)
 msgid "The port for the machine defined by the Secure HTTP Proxy port field."
 msgstr ""
 "El puerto para la máquina definida por el campo puerto del Proxy HTTP seguro."
 
-#: C/evolution.xml:6960(para)
+#: C/evolution.xml:6975(para)
 msgid "SOCKS Host"
 msgstr "Equipo SOCKS"
 
-#: C/evolution.xml:6963(para)
+#: C/evolution.xml:6978(para)
 msgid "The machine name to proxy SOCKS through."
 msgstr "El nombre de la máquina sobre la que pasar a través de proxy SOCKS."
 
-#: C/evolution.xml:6971(para)
+#: C/evolution.xml:6986(para)
 msgid "The port for the machine defined by the SOCKS host."
 msgstr "El puerto para la máquina definida por el equipo SOCKS."
 
-#: C/evolution.xml:6976(para)
+#: C/evolution.xml:6991(para)
 msgid "No proxy domain"
 msgstr "Sin dominio proxy"
 
-#: C/evolution.xml:6979(para)
+#: C/evolution.xml:6994(para)
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -14347,11 +14322,11 @@ msgstr ""
 "direcciones IP de equipos (tanto de IPv4 como de IPv6) y direcciones de red "
 "con una máscara de red similar a 192.168.0.0/24."
 
-#: C/evolution.xml:6984(para)
+#: C/evolution.xml:6999(para)
 msgid "Use authentication"
 msgstr "Usar autenticación"
 
-#: C/evolution.xml:6987(para)
+#: C/evolution.xml:7002(para)
 msgid ""
 "If this option is enabled, it uses authentication to connect via the proxy "
 "server."
@@ -14359,27 +14334,27 @@ msgstr ""
 "Si esta opción está activada, usa autenticación para conectarse a través del "
 "servidor proxy."
 
-#: C/evolution.xml:6992(para)
+#: C/evolution.xml:7007(para)
 msgid "Username"
 msgstr "Usuario"
 
-#: C/evolution.xml:6995(para)
+#: C/evolution.xml:7010(para)
 msgid "Username used to authenticate when performing an HTTP proxying."
 msgstr "Usuario que usar para autenticarse al pasar por un proxy HTTP."
 
-#: C/evolution.xml:7000(para)
+#: C/evolution.xml:7015(para)
 msgid "Password"
 msgstr "Contraseña"
 
-#: C/evolution.xml:7003(para)
+#: C/evolution.xml:7018(para)
 msgid "Password used to authenticate when performing an HTTP proxying."
 msgstr "Contraseña que usar para autenticarse al pasar por un proxy HTTP."
 
-#: C/evolution.xml:7010(title)
+#: C/evolution.xml:7025(title)
 msgid "Automatic proxy configuration URL:"
 msgstr "URL para la configuración automática del proxy:"
 
-#: C/evolution.xml:7011(para)
+#: C/evolution.xml:7026(para)
 msgid ""
 "Specify the automatic proxy configuration URL for Evolution to use in the "
 "autoconfig script to configure the proxy."
@@ -14387,7 +14362,7 @@ msgstr ""
 "Especifique el URL para la configuración automática del proxy que Evolution "
 "usará en el script de autoconfiguración para configurar el proxy."
 
-#: C/evolution.xml:7017(para)
+#: C/evolution.xml:7032(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -14399,11 +14374,11 @@ msgstr ""
 "una conexión cifrada o firmar un mensaje confirmando su identidad al "
 "contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
 
-#: C/evolution.xml:7019(title)
+#: C/evolution.xml:7034(title)
 msgid "Your Certificates:"
 msgstr "Sus certificados:"
 
-#: C/evolution.xml:7020(para)
+#: C/evolution.xml:7035(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
 "own. You can import, view and delete your certificates from this page."
@@ -14412,11 +14387,11 @@ msgstr ""
 "certificados que posee. Desde esta página puede importar, ver y borrar sus "
 "certificados."
 
-#: C/evolution.xml:7023(title)
+#: C/evolution.xml:7038(title)
 msgid "Contact Certificates:"
 msgstr "Certificados de los contactos:"
 
-#: C/evolution.xml:7024(para)
+#: C/evolution.xml:7039(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -14429,11 +14404,11 @@ msgstr ""
 "página puede importar, ver, respaldar y borrar los certificados de sus "
 "contactos."
 
-#: C/evolution.xml:7027(title)
+#: C/evolution.xml:7042(title)
 msgid "Authorities:"
 msgstr "Autoridades:"
 
-#: C/evolution.xml:7028(para)
+#: C/evolution.xml:7043(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -14444,64 +14419,64 @@ msgstr ""
 "es válido. Puede importar, ver, editar y borrar las autoridades de "
 "certificados desde esta página."
 
-#: C/evolution.xml:7034(para)
+#: C/evolution.xml:7049(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr ""
 "Existen dos tareas principales para configurar la información de un contacto:"
 
-#: C/evolution.xml:7037(link) C/evolution.xml:7045(title)
+#: C/evolution.xml:7052(link) C/evolution.xml:7060(title)
 msgid "Creating a Contact"
 msgstr "Crear un contacto"
 
-#: C/evolution.xml:7040(link) C/evolution.xml:7067(title)
+#: C/evolution.xml:7055(link) C/evolution.xml:7082(title)
 msgid "Creating an Address Book"
 msgstr "Crear una libreta de direcciones"
 
-#: C/evolution.xml:7046(para)
+#: C/evolution.xml:7061(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr "Para añadir una nueva lista de contactos, local o remota:"
 
-#: C/evolution.xml:7049(para)
+#: C/evolution.xml:7064(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Pulse Contactos en el Selector."
 
-#: C/evolution.xml:7052(para)
+#: C/evolution.xml:7067(para)
 msgid "Click the down-arrow next to New."
 msgstr "Pulse la flecha abajo junto a Nuevo."
 
-#: C/evolution.xml:7055(para)
+#: C/evolution.xml:7070(para)
 msgid "Select Contact List."
 msgstr "Seleccione una lista de contactos."
 
-#: C/evolution.xml:7058(para)
+#: C/evolution.xml:7073(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Escriba un nombre y un lugar para la libreta de direcciones."
 
-#: C/evolution.xml:7073(para)
+#: C/evolution.xml:7088(para)
 msgid "Select the type of Address Book."
 msgstr "Seleccione el tipo de libreta de direcciones."
 
-#: C/evolution.xml:7075(title)
+#: C/evolution.xml:7090(title)
 msgid "On This Computer:"
 msgstr "En este equipo:"
 
-#: C/evolution.xml:7076(para)
+#: C/evolution.xml:7091(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crea una libreta de direcciones local en el equipo."
 
-#: C/evolution.xml:7079(title)
+#: C/evolution.xml:7094(title)
 msgid "On LDAP Server:"
 msgstr "En un servidor LDAP:"
 
-#: C/evolution.xml:7080(para)
+#: C/evolution.xml:7095(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crea una libreta de direcciones en el servidor LDAP."
 
-#: C/evolution.xml:7083(title)
+#: C/evolution.xml:7098(title)
 msgid "Specific Account:"
 msgstr "Cuenta específica:"
 
-#: C/evolution.xml:7084(para)
+#: C/evolution.xml:7099(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -14509,7 +14484,7 @@ msgstr ""
 "Si tiene una cuenta que le permite crear una libreta de direcciones en ese "
 "servidor, puede seleccionar esa cuenta."
 
-#: C/evolution.xml:7088(para)
+#: C/evolution.xml:7103(para)
 msgid ""
 "If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
@@ -14518,7 +14493,7 @@ msgstr ""
 "direcciones y elija dónde quiere que se almacene su nueva libreta de "
 "direcciones como su carpeta predeterminada."
 
-#: C/evolution.xml:7090(para)
+#: C/evolution.xml:7105(para)
 msgid ""
 "If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
 "server, enter the server information as requested by the assistant:"
@@ -14527,19 +14502,19 @@ msgstr ""
 "\"ldap\">LDAP</link>, introduzca la información del servidor solicitada por "
 "el asistente:"
 
-#: C/evolution.xml:7092(title)
+#: C/evolution.xml:7107(title)
 msgid "Server Name:"
 msgstr "Nombre del servidor:"
 
-#: C/evolution.xml:7093(para)
+#: C/evolution.xml:7108(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "La dirección de internet del servidor de contactos que está usando."
 
-#: C/evolution.xml:7096(title)
+#: C/evolution.xml:7111(title)
 msgid "Login Method:"
 msgstr "Método de inicio de sesión:"
 
-#: C/evolution.xml:7097(para)
+#: C/evolution.xml:7112(para)
 msgid ""
 "Specify whether your login is anonymous, uses an email address, or uses a "
 "distinguished name. If the login is not anonymous, specify the email address "
@@ -14550,11 +14525,11 @@ msgstr ""
 "sesión anónimo, especifique la dirección de correo-e o el «nombre "
 "distinguido» (DN) requerido por el servidor."
 
-#: C/evolution.xml:7100(title)
+#: C/evolution.xml:7115(title)
 msgid "Port:"
 msgstr "Puerto:"
 
-#: C/evolution.xml:7101(para)
+#: C/evolution.xml:7116(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -14562,11 +14537,11 @@ msgstr ""
 "El puerto de Internet al que se conecta Evolution para acceder a la base de "
 "datos LDAP. Normalmente es el puerto 389."
 
-#: C/evolution.xml:7104(title)
+#: C/evolution.xml:7119(title)
 msgid "Use SSL/TLS:"
 msgstr "Usar SSL/TLS:"
 
-#: C/evolution.xml:7105(para)
+#: C/evolution.xml:7120(para)
 msgid ""
 "SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
 "will send your password unencrypted. By using SSL or TLS, a secure "
@@ -14576,11 +14551,11 @@ msgstr ""
 "enviará su contraseña sin cifrar. Usando SSL o TSL se usará una conexión "
 "segura y su contraseña se enviará cifrada."
 
-#: C/evolution.xml:7108(title)
+#: C/evolution.xml:7123(title)
 msgid "Details: Search Base:"
 msgstr "Detalles: Base de búsqueda:"
 
-#: C/evolution.xml:7109(para)
+#: C/evolution.xml:7124(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -14590,11 +14565,11 @@ msgstr ""
 "punto de partida utilizado para las búsquedas en directorios. Consulte a su "
 "administrador para obtener información acerca de los ajustes adecuados."
 
-#: C/evolution.xml:7112(title)
+#: C/evolution.xml:7127(title)
 msgid "Search Scope:"
 msgstr "Rango de búsqueda:"
 
-#: C/evolution.xml:7113(para)
+#: C/evolution.xml:7128(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -14602,27 +14577,27 @@ msgstr ""
 "El <glossterm linkend=\"search-scope\">rango de búsqueda</glossterm> es la "
 "extensión de una búsqueda dada. Están disponibles las siguientes:"
 
-#: C/evolution.xml:7118(title)
+#: C/evolution.xml:7133(title)
 msgid "One:"
 msgstr "Uno:"
 
-#: C/evolution.xml:7119(para)
+#: C/evolution.xml:7134(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr "Busca dentro de la raíz y un nivel de subdirectorios."
 
-#: C/evolution.xml:7124(title)
+#: C/evolution.xml:7139(title)
 msgid "Sub:"
 msgstr "Sub:"
 
-#: C/evolution.xml:7125(para)
+#: C/evolution.xml:7140(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr "Busca dentro de la raíz y en todos los subdirectorios."
 
-#: C/evolution.xml:7130(title)
+#: C/evolution.xml:7145(title)
 msgid "Timeout (minutes):"
 msgstr "Tiempo de expiración (minutos):"
 
-#: C/evolution.xml:7131(para)
+#: C/evolution.xml:7146(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -14630,11 +14605,11 @@ msgstr ""
 "Es el tiempo de espera máximo para descargar los datos del servidor, antes "
 "de abandonar."
 
-#: C/evolution.xml:7136(title)
+#: C/evolution.xml:7151(title)
 msgid "Download Limit:"
 msgstr "Límite de descarga:"
 
-#: C/evolution.xml:7137(para)
+#: C/evolution.xml:7152(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -14644,11 +14619,11 @@ msgstr ""
 "aceptan enviar más de 500 respuestas, pero puede fijar un número inferior "
 "para reducir el volumen de descargas, en caso de búsquedas muy amplias."
 
-#: C/evolution.xml:7142(title)
+#: C/evolution.xml:7157(title)
 msgid "Display Name:"
 msgstr "Nombre a mostrar:"
 
-#: C/evolution.xml:7143(para)
+#: C/evolution.xml:7158(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
@@ -14656,18 +14631,18 @@ msgstr ""
 "Este es el nombre que quiere usar como etiqueta para esta carpeta. Puede ser "
 "cualquier nombre que elija."
 
-#: C/evolution.xml:7148(title)
+#: C/evolution.xml:7163(title)
 msgid "Search Filter:"
 msgstr "Filtro de búsquedas:"
 
-#: C/evolution.xml:7149(para)
+#: C/evolution.xml:7164(para)
 msgid ""
 "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Se puede establecer aquí el filtro de búsqueda para todas las consultas "
 "LDAP. Por ejemplo:"
 
-#: C/evolution.xml:7151(para)
+#: C/evolution.xml:7166(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
 "only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
@@ -14680,7 +14655,7 @@ msgstr ""
 "de contactos. (&amp;(mail=*)(ObjectClass=*)): Lista los objetos asociados "
 "con las direcciones de correo-e."
 
-#: C/evolution.xml:7153(para)
+#: C/evolution.xml:7168(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -14688,7 +14663,7 @@ msgstr ""
 "Si cambia cualquier configuración de la libreta de direcciones LDAP deberá "
 "reiniciar Evolution y Evolution Data Server para que puedan ver los cambios."
 
-#: C/evolution.xml:7156(para)
+#: C/evolution.xml:7171(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -14699,7 +14674,7 @@ msgstr ""
 "direcciones se almacene localmente cuando esté desconectado, y si quiere que "
 "la libreta de direcciones sea su carpeta predeterminada."
 
-#: C/evolution.xml:7167(para)
+#: C/evolution.xml:7182(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
 "the error messages that appear in the statusbar. When an error occurs, "
@@ -14711,20 +14686,17 @@ msgstr ""
 "barra de estado muestra el mensaje de error durante el tiempo especificado y "
 "después el mensaje se mueve al archivo de depuración."
 
-#: C/evolution.xml:7170(para)
+#: C/evolution.xml:7185(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr "Desde el menú Ayuda seleccione la Depuración de sucesos."
 
-#: C/evolution.xml:7174(para)
-msgid "Specify the display duration for the error messages."
-msgstr "Especifique la duración del mostrado de los mensajes de error."
-
-#: C/evolution.xml:7175(para)
-msgid "The messages remain in the statusbar for this specified time."
+#: C/evolution.xml:7189(para)
+msgid "Specify for how long error messages will be displayed in the statusbar."
 msgstr ""
-"El mensaje permanece en la barra de estado durante el tiempo especificado."
+"Especifique la longitud de los mensajes de error que mostrar en la barra de "
+"estado."
 
-#: C/evolution.xml:7179(para)
+#: C/evolution.xml:7193(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message is a warning. The <inlinegraphic "
@@ -14736,7 +14708,7 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> se "
 "muestra con un mensaje «para-su-información»."
 
-#: C/evolution.xml:7186(para)
+#: C/evolution.xml:7200(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
@@ -14750,19 +14722,19 @@ msgstr ""
 "sólo soporta dispositivos Palm OS como PalmPilot* y Handspring Visor. "
 "Tercero, debe decidir que tipo de sincronización quiere."
 
-#: C/evolution.xml:7189(link) C/evolution.xml:7200(title)
+#: C/evolution.xml:7203(link) C/evolution.xml:7214(title)
 msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
-#: C/evolution.xml:7192(link) C/evolution.xml:7205(title)
+#: C/evolution.xml:7206(link) C/evolution.xml:7219(title)
 msgid "Selecting Conduits"
 msgstr "Seleccionar un conducto"
 
-#: C/evolution.xml:7195(link) C/evolution.xml:7228(title)
+#: C/evolution.xml:7209(link) C/evolution.xml:7242(title)
 msgid "Synchronizing Information"
 msgstr "Sincronizar la información"
 
-#: C/evolution.xml:7201(para)
+#: C/evolution.xml:7215(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
@@ -14785,7 +14757,7 @@ msgstr ""
 "crean dos nodos de dispositivo, ttyUSB0 y ttyUSB1. El segundo nodo es el que "
 "se debe usar al configurar el dispositivo."
 
-#: C/evolution.xml:7206(para)
+#: C/evolution.xml:7220(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -14802,7 +14774,7 @@ msgstr ""
 "libreta de direcciones, ECalendar, para el calendario y ETodo, para la lista "
 "de tareas."
 
-#: C/evolution.xml:7207(para)
+#: C/evolution.xml:7221(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -14812,19 +14784,19 @@ msgstr ""
 "vez activado. Las opciones pueden variar en función del conducto, pero "
 "habitualmente son las siguientes:"
 
-#: C/evolution.xml:7209(title)
+#: C/evolution.xml:7223(title)
 msgid "Disabled:"
 msgstr "Deshabilitado:"
 
-#: C/evolution.xml:7210(para)
+#: C/evolution.xml:7224(para)
 msgid "Do nothing."
 msgstr "No hacer nada."
 
-#: C/evolution.xml:7213(title)
+#: C/evolution.xml:7227(title)
 msgid "Synchronize:"
 msgstr "Sincronizar:"
 
-#: C/evolution.xml:7214(para)
+#: C/evolution.xml:7228(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14834,24 +14806,24 @@ msgstr ""
 "direcciones. Elimina los elementos que se encontraban en los dos sistemas, "
 "pero que fueron eliminados en uno de ellos."
 
-#: C/evolution.xml:7217(title)
+#: C/evolution.xml:7231(title)
 msgid "Copy From Pilot:"
 msgstr "Copiar desde Pilot:"
 
-#: C/evolution.xml:7218(para)
+#: C/evolution.xml:7232(para)
 msgid ""
 "If there is any new data on the handheld device, copy it to the computer."
 msgstr "Si el dispositivo de mano contiene datos nuevos, los copia al equipo."
 
-#: C/evolution.xml:7221(title)
+#: C/evolution.xml:7235(title)
 msgid "Copy To Pilot:"
 msgstr "Copiar hacia Pilot:"
 
-#: C/evolution.xml:7222(para)
+#: C/evolution.xml:7236(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr "Copia los datos nuevos del equipo hacia el dispositivo de mano."
 
-#: C/evolution.xml:7224(para)
+#: C/evolution.xml:7238(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14859,7 +14831,7 @@ msgstr ""
 "Seleccione el comportamiento de cada conducto elegido. Si no está seguro, "
 "use Sincronizar."
 
-#: C/evolution.xml:7229(para)
+#: C/evolution.xml:7243(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14867,7 +14839,7 @@ msgstr ""
 "Use el siguiente procedimiento para sincronizar los datos en su dispositivo "
 "Palm Os con sus datos almacenados en Evolution."
 
-#: C/evolution.xml:7230(para)
+#: C/evolution.xml:7244(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
 "the <command>.evolution</command> directory inside your home directory."
@@ -14876,11 +14848,11 @@ msgstr ""
 "sincronizar, haga una copia del directorio <command>.evolution</command> "
 "dentro de su directorio de inicio."
 
-#: C/evolution.xml:7233(para)
+#: C/evolution.xml:7247(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr "Coloque el dispositivo de mano en su base y pulse el botón HotSync."
 
-#: C/evolution.xml:7234(para)
+#: C/evolution.xml:7248(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14894,7 +14866,7 @@ msgstr ""
 "dispositivo de mano, realice la sincronización con su equipo de sobremesa y "
 "vuelva a habilitar la protección de su dispositivo."
 
-#: C/evolution.xml:7237(para)
+#: C/evolution.xml:7251(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14902,7 +14874,7 @@ msgstr ""
 "Si siguió las instrucciones de configuración adecuadamente, los datos de su "
 "dispositivo Palm OS se podrán sincronizar con Evolution."
 
-#: C/evolution.xml:7243(para)
+#: C/evolution.xml:7257(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
 "helps you switch to <trademark>Evolution</trademark>."
@@ -14910,11 +14882,11 @@ msgstr ""
 "Si está usando Microsoft Outlook pero no Microsoft Exchange, esta sección le "
 "ayuda a cambiarse a <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7246(title)
+#: C/evolution.xml:7260(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migrar las carpetas de correo locales de Outlook"
 
-#: C/evolution.xml:7247(para)
+#: C/evolution.xml:7261(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14924,11 +14896,11 @@ msgstr ""
 "tiene que migrarlo a su partición Linux*. No obstante si ha almacenado "
 "correo en su equipo, quizá quiera hacerlo accesible a Evolution."
 
-#: C/evolution.xml:7248(para)
+#: C/evolution.xml:7262(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Primero, mientras usa Windows, prepare sus mensajes para importarlos:"
 
-#: C/evolution.xml:7251(para)
+#: C/evolution.xml:7265(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14938,7 +14910,7 @@ msgstr ""
 "Archivo &gt; Carpetas &gt; Propiedades &gt; Avanzadas &gt; Compactar para "
 "borrar los mensajes antiguos y borrados de su archivo PST."
 
-#: C/evolution.xml:7254(para)
+#: C/evolution.xml:7268(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14948,7 +14920,7 @@ msgstr ""
 "subcarpetas para poder saber a qué carpeta pertenecen. Debe volverlas a "
 "anidar después de cargarlas en Evolution."
 
-#: C/evolution.xml:7257(para)
+#: C/evolution.xml:7271(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14956,7 +14928,7 @@ msgstr ""
 "Importe los archivos en Mozilla Mail (o en otro cliente de correo que "
 "utilice el formato mbox estándar, como Netscape o Eudora)."
 
-#: C/evolution.xml:7258(para)
+#: C/evolution.xml:7272(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14966,7 +14938,7 @@ msgstr ""
 "sólo bajo Windows. En Mozilla, importe seleccionando Window Mail &amp; "
 "Newsgroups Tools Import."
 
-#: C/evolution.xml:7261(para)
+#: C/evolution.xml:7275(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14978,7 +14950,7 @@ msgstr ""
 "\\Local Folders\\OutlookMail\\</command>. Los archivos de datos son los que "
 "no tienen extensión de archivo."
 
-#: C/evolution.xml:7262(para)
+#: C/evolution.xml:7276(para)
 msgid ""
 "If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
 "hard drive is probably in the NTFS format, which some Linux systems cannot "
@@ -14990,7 +14962,7 @@ msgstr ""
 "pueden leer sin software adicional. Quizá encuentre más fácil copiar las "
 "carpetas de correo a una unidad diferente o grabar un CD."
 
-#: C/evolution.xml:7263(para)
+#: C/evolution.xml:7277(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -15000,64 +14972,64 @@ msgstr ""
 "bajo Linux. Continúe entonces con el siguiente procedimiento. Para crear "
 "nuevas carpetas para sus archivos:"
 
-#: C/evolution.xml:7266(para)
+#: C/evolution.xml:7280(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Monte su unidad Windows o el disco donde tenga guardados los archivos de "
 "correo."
 
-#: C/evolution.xml:7269(para)
+#: C/evolution.xml:7283(para)
 msgid ""
 "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copie todos los archivos de correo en su carpeta personal o cualquier otro "
 "lugar conveniente."
 
-#: C/evolution.xml:7272(para)
+#: C/evolution.xml:7286(para)
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
-#: C/evolution.xml:7275(para)
+#: C/evolution.xml:7289(para)
 msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
 msgstr ""
 "Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
 
-#: C/evolution.xml:7278(para)
+#: C/evolution.xml:7292(para)
 msgid "To import the data files:"
 msgstr "Importar los archivos de datos:"
 
-#: C/evolution.xml:7281(para)
+#: C/evolution.xml:7295(para)
 msgid ""
 "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "En Evolution, abra el asistente de Importación de archivos pulsando Archivo "
 "&gt; Importar."
 
-#: C/evolution.xml:7284(para)
+#: C/evolution.xml:7298(para)
 msgid "Click Next, then select Import a single file."
 msgstr "Pulse Siguiente, después seleccione Importar un solo archivo."
 
-#: C/evolution.xml:7287(para)
+#: C/evolution.xml:7301(para)
 msgid "Click on the filechooser to select the data file."
 msgstr "Pulse en el selector de archivos para seleccionar el archivo de datos."
 
-#: C/evolution.xml:7288(para)
+#: C/evolution.xml:7302(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Recuerde, los archivos de datos son los archivos que no tienen extensión de "
 "archivo."
 
-#: C/evolution.xml:7291(para)
+#: C/evolution.xml:7305(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr ""
 "Seleccione la carpeta donde quiere poner sus archivos de datos importados."
 
-#: C/evolution.xml:7297(para)
+#: C/evolution.xml:7311(para)
 msgid "Repeat the import steps until you have imported all your mail."
 msgstr ""
 "Repita los pasos de importación hasta que haya importado todo su correo."
 
-#: C/evolution.xml:7305(para)
+#: C/evolution.xml:7319(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
 "things you want to do with <trademark>Evolution</trademark>. You can also "
@@ -15068,23 +15040,23 @@ msgstr ""
 "trademark>. También puede encontrar esta información seleccionando Ayuda "
 "&gt; Referencia rápida en la barra de menú."
 
-#: C/evolution.xml:7308(link) C/evolution.xml:7322(title)
+#: C/evolution.xml:7322(link) C/evolution.xml:7336(title)
 msgid "Opening or Creating Items"
 msgstr "Apertura o cierre de elementos"
 
-#: C/evolution.xml:7311(link) C/evolution.xml:7347(title)
+#: C/evolution.xml:7325(link) C/evolution.xml:7361(title)
 msgid "Mail Tasks"
 msgstr "Tareas de correo"
 
-#: C/evolution.xml:7317(link) C/evolution.xml:7397(title)
+#: C/evolution.xml:7331(link) C/evolution.xml:7411(title)
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: C/evolution.xml:7325(title)
+#: C/evolution.xml:7339(title)
 msgid "New Item:"
 msgstr "Nuevo elemento:"
 
-#: C/evolution.xml:7326(para)
+#: C/evolution.xml:7340(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -15097,28 +15069,28 @@ msgstr ""
 "direcciones, Ctrl+N creará una nueva tarjeta para un contacto; y en el "
 "calendario se abrirá una nueva cita."
 
-#: C/evolution.xml:7329(title)
+#: C/evolution.xml:7343(title)
 msgid "Creating a New Email Message:"
 msgstr "Crear un nuevo mensaje de correo-e:"
 
-#: C/evolution.xml:7330(para)
+#: C/evolution.xml:7344(para)
 msgid "Select File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr "Seleccione Archivo &gt; Nuevo &gt; Mensaje de correo o Mayús.+Ctrl+M."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7333(title) C/evolution.xml:7386(title)
+#: C/evolution.xml:7347(title) C/evolution.xml:7400(title)
 msgid "Creating a New Appointment:"
 msgstr "Crear una cita nueva:"
 
-#: C/evolution.xml:7334(para) C/evolution.xml:7387(para)
+#: C/evolution.xml:7348(para) C/evolution.xml:7401(para)
 msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr "Use Archivo &gt; Nuevo &gt; Cita o Mayús+Ctrl+A."
 
-#: C/evolution.xml:7337(title)
+#: C/evolution.xml:7351(title)
 msgid "Entering a New Contact:"
 msgstr "Introducir un contacto nuevo:"
 
-#: C/evolution.xml:7338(para)
+#: C/evolution.xml:7352(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
@@ -15128,19 +15100,19 @@ msgstr ""
 "Nuevo &gt; Contacto o Mayús.+Ctrl+C."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7341(title) C/evolution.xml:7391(title)
+#: C/evolution.xml:7355(title) C/evolution.xml:7405(title)
 msgid "Creating a New Task:"
 msgstr "Crear una tarea nueva:"
 
-#: C/evolution.xml:7342(para) C/evolution.xml:7392(para)
+#: C/evolution.xml:7356(para) C/evolution.xml:7406(para)
 msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea o Mayús.+Ctrl+T."
 
-#: C/evolution.xml:7349(title)
+#: C/evolution.xml:7363(title)
 msgid "Send and Receive Mail:"
 msgstr "Enviar y recibir correo:"
 
-#: C/evolution.xml:7350(para)
+#: C/evolution.xml:7364(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -15148,11 +15120,11 @@ msgstr ""
 "Pulse F9, pulse el botón Enviar/Recibir en la barra de herramientas, o pulse "
 "Archivo &gt; Enviar/Recibir."
 
-#: C/evolution.xml:7353(title)
+#: C/evolution.xml:7367(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navegar por la lista de mensajes mediante el teclado:"
 
-#: C/evolution.xml:7354(para)
+#: C/evolution.xml:7368(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -15162,22 +15134,22 @@ msgstr ""
 "al anterior mensaje no leído. Use las teclas del cursor para moverse arriba "
 "y abajo por toda la lista de mensajes."
 
-#: C/evolution.xml:7357(title)
+#: C/evolution.xml:7371(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Moverse adelante y atrás en el panel de visualización de mensajes:"
 
-#: C/evolution.xml:7358(para)
+#: C/evolution.xml:7372(para)
 msgid ""
 "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Pulse la barra espaciadora para avanzar una página. Pulse la tecla Retroceso "
 "para volver hacia atrás una página."
 
-#: C/evolution.xml:7361(title)
+#: C/evolution.xml:7375(title)
 msgid "Replying To a Message:"
 msgstr "Responder un mensaje:"
 
-#: C/evolution.xml:7362(para)
+#: C/evolution.xml:7376(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -15185,7 +15157,7 @@ msgstr ""
 "Para responder sólo al remitente del mensaje, pulse Responder en la barra de "
 "herramientas o pulse Ctrl+R."
 
-#: C/evolution.xml:7364(para)
+#: C/evolution.xml:7378(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -15193,11 +15165,11 @@ msgstr ""
 "Para responder al remitente y a todos los destinatarios visibles pulse en "
 "Responder a todos o seleccione el mensaje y pulse Mayús.+Ctrl+R."
 
-#: C/evolution.xml:7366(title)
+#: C/evolution.xml:7380(title)
 msgid "Forwarding a Message:"
 msgstr "Reenviar un mensaje:"
 
-#: C/evolution.xml:7367(para)
+#: C/evolution.xml:7381(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -15205,11 +15177,11 @@ msgstr ""
 "Seleccione el o los mensajes que quiera reenviar y pulse en Reenviar en la "
 "barra de herramientas o pulse Ctrl+F."
 
-#: C/evolution.xml:7370(title)
+#: C/evolution.xml:7384(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Abrir un mensaje en una nueva ventana:"
 
-#: C/evolution.xml:7371(para)
+#: C/evolution.xml:7385(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -15217,11 +15189,11 @@ msgstr ""
 "Pulse dos veces sobre el mensaje que quiera ver o selecciónelo y pulse Intro "
 "o Ctrl+O."
 
-#: C/evolution.xml:7374(title)
+#: C/evolution.xml:7388(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Crear filtros y carpetas de búsqueda:"
 
-#: C/evolution.xml:7375(para)
+#: C/evolution.xml:7389(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -15230,17 +15202,17 @@ msgstr ""
 "mensaje. También puede crear filtros y carpetas de búsqueda desde el menú "
 "Editar."
 
-#: C/evolution.xml:7378(title)
+#: C/evolution.xml:7392(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Añadir un remitente a la libreta de direcciones:"
 
-#: C/evolution.xml:7379(para)
+#: C/evolution.xml:7393(para)
 msgid "Right-click on any email address to add it to your address book."
 msgstr ""
 "Pulse con el botón derecho sobre cualquier dirección de correo-e para "
 "añadirla a su libreta de direcciones."
 
-#: C/evolution.xml:7389(para)
+#: C/evolution.xml:7403(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -15248,21 +15220,21 @@ msgstr ""
 "También puede pulsar en cualquier lugar vacío del calendario y empezar a "
 "escribir para crear una nueva cita."
 
-#: C/evolution.xml:7399(title)
+#: C/evolution.xml:7413(title)
 msgid "Editing a Contact:"
 msgstr "Editar un contacto:"
 
-#: C/evolution.xml:7400(para)
+#: C/evolution.xml:7414(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Pulse dos veces en la dirección de la tarjeta del contacto para modificar "
 "los detalles."
 
-#: C/evolution.xml:7403(title)
+#: C/evolution.xml:7417(title)
 msgid "Deleting a Contact:"
 msgstr "Borrar un contacto:"
 
-#: C/evolution.xml:7404(para)
+#: C/evolution.xml:7418(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -15271,21 +15243,21 @@ msgstr ""
 "seleccione el contacto y después pulse el botón Borrar en la barra de "
 "herramientas."
 
-#: C/evolution.xml:7407(title)
+#: C/evolution.xml:7421(title)
 msgid "Sending Emails to a Contact:"
 msgstr "Enviar correos-e a un contacto:"
 
-#: C/evolution.xml:7408(para)
+#: C/evolution.xml:7422(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Pulse con el botón derecho sobre un contacto, después pulse Enviar un "
 "mensaje al contacto."
 
-#: C/evolution.xml:7411(title)
+#: C/evolution.xml:7425(title)
 msgid "Creating a New Contact:"
 msgstr "Crear un contacto nuevo:"
 
-#: C/evolution.xml:7412(para)
+#: C/evolution.xml:7426(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -15296,7 +15268,7 @@ msgstr ""
 "cualquier parte de la libreta de direcciones y seleccione Contacto nuevo. "
 "También puede pulsar Archivo &gt; Nuevo &gt; Contacto o pulsar Mayús+Ctrl+C."
 
-#: C/evolution.xml:7419(para)
+#: C/evolution.xml:7433(para)
 msgid ""
 "<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
 "\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
@@ -15310,7 +15282,7 @@ msgstr ""
 "información de errores de GNOME (conocida como bug-buddy en la línea de "
 "comandos)."
 
-#: C/evolution.xml:7420(para)
+#: C/evolution.xml:7434(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -15323,7 +15295,7 @@ msgstr ""
 "\"http://gnome.org/projects/evolution/developer.shtml\">web para "
 "desarrolladores de Evolution</ulink>."
 
-#: C/evolution.xml:7425(para)
+#: C/evolution.xml:7439(para)
 msgid ""
 "Evolution was written by the <trademark>Evolution</trademark> team and "
 "numerous other dedicated GNOME programmers. You can see their names by "
@@ -15334,7 +15306,7 @@ msgstr ""
 "nombres, seleccione Ayuda &gt; Acerca de en cualquiera de las ventanas de "
 "Evolution."
 
-#: C/evolution.xml:7426(para)
+#: C/evolution.xml:7440(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -15345,7 +15317,7 @@ msgstr ""
 "reconocen los esfuerzos y contribuciones de todos los que trabajaron en "
 "estos proyectos."
 
-#: C/evolution.xml:7427(para)
+#: C/evolution.xml:7441(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
 "gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
@@ -15363,51 +15335,51 @@ msgstr ""
 "información de errores de GNOME bug-buddy para enviar notificaciones de "
 "fallos."
 
-#: C/evolution.xml:7428(para)
+#: C/evolution.xml:7442(para)
 msgid "This manual was written by:"
 msgstr "Este manual lo escribieron:"
 
-#: C/evolution.xml:7431(para)
+#: C/evolution.xml:7445(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7434(para)
+#: C/evolution.xml:7448(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7437(para)
+#: C/evolution.xml:7451(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7440(para)
+#: C/evolution.xml:7454(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7443(para)
+#: C/evolution.xml:7457(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7446(para)
+#: C/evolution.xml:7460(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7449(para)
+#: C/evolution.xml:7463(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7452(para)
+#: C/evolution.xml:7466(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7455(para)
+#: C/evolution.xml:7469(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7458(para)
+#: C/evolution.xml:7472(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7461(para)
+#: C/evolution.xml:7475(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -15415,7 +15387,7 @@ msgstr ""
 "Con la ayuda de los programadores de aplicaciones y del Proyecto de "
 "documentación de GNOME."
 
-#: C/evolution.xml:7464(para)
+#: C/evolution.xml:7478(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
@@ -15428,34 +15400,7 @@ msgstr ""
 "com) o Srinivasa Ragavan (sragavan@novell.com) y cualquiera de ellos le "
 "añadirá."
 
-#: C/evolution.xml:7465(para)
-msgid ""
-"Partial list of Documentation Translators (application translated to "
-"numerous additional languages):"
-msgstr ""
-"Lista parcial de todos los traductores de la documentación (la aplicación "
-"está traducida a numerosos idiomas adicionales):"
-
-#: C/evolution.xml:7468(para)
-msgid "Daniel Persson for Swedish (.se)"
-msgstr "Daniel Persson al sueco"
-
-#: C/evolution.xml:7471(para)
-msgid ""
-"Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
-msgstr ""
-"Hector García Álvarez, Franciso Javier F. Serrador y Jorge González para el "
-"español (.es)"
-
-#: C/evolution.xml:7474(para)
-msgid "Kjartan Maraas for Norwegian (.no)"
-msgstr "Kjartan Maraas al noruego"
-
-#: C/evolution.xml:7477(para)
-msgid "Sergey V. Mironov for Russian (.ru)"
-msgstr "Sergey V. Mironov al ruso (.ru)"
-
-#: C/evolution.xml:7484(para)
+#: C/evolution.xml:7483(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
 "as in <trademark>Evolution</trademark>."
@@ -15463,11 +15408,11 @@ msgstr ""
 "Este glosario contiene términos que se usan frecuentemente en esta guía así "
 "como en <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7486(glossterm)
+#: C/evolution.xml:7485(glossterm)
 msgid "Assistant"
 msgstr "Asistente"
 
-#: C/evolution.xml:7488(para)
+#: C/evolution.xml:7487(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -15476,11 +15421,11 @@ msgstr ""
 "generalmente para configurar o ajustar un programa. Es equivalente a un "
 "Druida."
 
-#: C/evolution.xml:7492(glossterm)
+#: C/evolution.xml:7491(glossterm)
 msgid "attachment"
 msgstr "adjunto"
 
-#: C/evolution.xml:7494(para)
+#: C/evolution.xml:7493(para)
 msgid ""
 "Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
@@ -15488,21 +15433,21 @@ msgstr ""
 "Cualquier archivo enviado con un correo-e. Los adjuntos se pueden empotrar "
 "en un mensaje o adjuntarse a él."
 
-#: C/evolution.xml:7498(glossterm)
+#: C/evolution.xml:7497(glossterm)
 msgid "automatic indexing"
 msgstr "indexado automático"
 
-#: C/evolution.xml:7500(para)
+#: C/evolution.xml:7499(para)
 msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
 "Una característica que permite a Evolution buscar y ordenar datos "
 "rápidamente."
 
-#: C/evolution.xml:7504(glossterm)
+#: C/evolution.xml:7503(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cco (Copia de carbón oculta)"
 
-#: C/evolution.xml:7506(para)
+#: C/evolution.xml:7505(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -15516,11 +15461,11 @@ msgstr ""
 "Responder a todos, el destinatario en la copia de carbón oculta no recibirá "
 "la respuesta."
 
-#: C/evolution.xml:7510(glossterm)
+#: C/evolution.xml:7509(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (Copia de carbón)"
 
-#: C/evolution.xml:7512(para)
+#: C/evolution.xml:7511(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -15533,11 +15478,11 @@ msgstr ""
 "Todos los destinatarios pueden ver que se envió la copia de carbón. También "
 "pueden ver todos los nombres de los destinatarios de la Cc."
 
-#: C/evolution.xml:7516(glossterm)
+#: C/evolution.xml:7515(glossterm)
 msgid "conduit"
 msgstr "conducto"
 
-#: C/evolution.xml:7518(para)
+#: C/evolution.xml:7517(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -15545,15 +15490,15 @@ msgstr ""
 "Pequeña aplicación que controla la transferencia de datos entre un "
 "dispositivo portátil y el escritorio del equipo."
 
-#: C/evolution.xml:7524(para)
+#: C/evolution.xml:7523(para)
 msgid "The GNOME groupware application."
 msgstr "La aplicación groupware de GNOME."
 
-#: C/evolution.xml:7528(glossterm)
+#: C/evolution.xml:7527(glossterm)
 msgid "execute"
 msgstr "ejecutar"
 
-#: C/evolution.xml:7530(para)
+#: C/evolution.xml:7529(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -15571,11 +15516,11 @@ msgstr ""
 "archivos consulte la documentación de su administrador de archivos o de su "
 "intérprete de órdenes."
 
-#: C/evolution.xml:7534(glossterm)
+#: C/evolution.xml:7533(glossterm)
 msgid "expunge"
 msgstr "purgar"
 
-#: C/evolution.xml:7536(para)
+#: C/evolution.xml:7535(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -15585,11 +15530,11 @@ msgstr ""
 "purgan. Cuando se purga un mensaje se borra permanentemente, siempre y "
 "cuando estuviese marcado para su borrado."
 
-#: C/evolution.xml:7540(glossterm)
+#: C/evolution.xml:7539(glossterm)
 msgid "file tree"
 msgstr "árbol de archivos"
 
-#: C/evolution.xml:7542(para)
+#: C/evolution.xml:7541(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -15604,11 +15549,11 @@ msgstr ""
 "(«root») ni con el directorio de inicio del superusuario <command>/root</"
 "command>."
 
-#: C/evolution.xml:7546(glossterm)
+#: C/evolution.xml:7545(glossterm)
 msgid "filter"
 msgstr "filtro"
 
-#: C/evolution.xml:7548(para)
+#: C/evolution.xml:7547(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -15619,11 +15564,11 @@ msgstr ""
 "acciones sobre un mensaje que cumpla una (o todas) las condiciones, "
 "definidas entre una amplia gama de posibilidades."
 
-#: C/evolution.xml:7552(glossterm)
+#: C/evolution.xml:7551(glossterm)
 msgid "forward"
 msgstr "reenviar"
 
-#: C/evolution.xml:7554(para)
+#: C/evolution.xml:7553(para)
 msgid ""
 "Forwards a copy of the message and any additional comments to a different "
 "email address."
@@ -15631,11 +15576,11 @@ msgstr ""
 "Reenvía una copia del mensaje y cualquier comentario adicional a distintas "
 "direcciones de correo-e."
 
-#: C/evolution.xml:7558(glossterm)
+#: C/evolution.xml:7557(glossterm)
 msgid "groupware"
 msgstr "groupware"
 
-#: C/evolution.xml:7560(para)
+#: C/evolution.xml:7559(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
@@ -15646,11 +15591,11 @@ msgstr ""
 "varias funciones de productividad integradas en un único programa: correo "
 "electrónico, calendario y gestión de contactos."
 
-#: C/evolution.xml:7564(glossterm)
+#: C/evolution.xml:7563(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7566(para)
+#: C/evolution.xml:7565(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
 "electronic documents such as Web pages, help files, and email messages. HTML "
@@ -15663,21 +15608,21 @@ msgstr ""
 "envíos a los grupos de noticias para insertar imágenes y darle formato al "
 "texto."
 
-#: C/evolution.xml:7570(glossterm)
+#: C/evolution.xml:7569(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7572(para)
+#: C/evolution.xml:7571(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal es un protocolo que Evolution usa para gestionar la sección del "
 "calendario."
 
-#: C/evolution.xml:7576(glossterm)
+#: C/evolution.xml:7575(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7578(para)
+#: C/evolution.xml:7577(para)
 msgid ""
 "Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
@@ -15687,11 +15632,11 @@ msgstr ""
 "electrónico que normalmente se almacena remotamente en el servidor en lugar "
 "de en el disco duro local. IMAP suele ser la alternativa a POP."
 
-#: C/evolution.xml:7582(glossterm)
+#: C/evolution.xml:7581(glossterm)
 msgid "inline"
 msgstr "en línea"
 
-#: C/evolution.xml:7584(para)
+#: C/evolution.xml:7583(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -15699,11 +15644,11 @@ msgstr ""
 "Que se muestra empotrado, como parte de un mensaje u otro documento en lugar "
 "de estar anexo a un archivo. Alternativo a <emphasis>adjunto</emphasis>."
 
-#: C/evolution.xml:7588(glossterm)
+#: C/evolution.xml:7587(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7590(para)
+#: C/evolution.xml:7589(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -15712,11 +15657,11 @@ msgstr ""
 "buscar a través de grandes bases de datos, alojadas en un servidor, de "
 "direcciones, números de teléfono y personas."
 
-#: C/evolution.xml:7594(glossterm)
+#: C/evolution.xml:7593(glossterm)
 msgid "mail client"
 msgstr "cliente de correo"
 
-#: C/evolution.xml:7596(para)
+#: C/evolution.xml:7595(para)
 msgid ""
 "The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
@@ -15727,11 +15672,11 @@ msgstr ""
 "autenticación de usuarios y dirigen los mensajes del remitente al "
 "destinatario."
 
-#: C/evolution.xml:7600(glossterm)
+#: C/evolution.xml:7599(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7602(para)
+#: C/evolution.xml:7601(para)
 msgid ""
 "Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
@@ -15741,11 +15686,11 @@ msgstr ""
 "electrónico. En contraste con IMAP sólo se usa para descargar el correo y "
 "almacenarlo localmente en el disco duro."
 
-#: C/evolution.xml:7606(glossterm)
+#: C/evolution.xml:7605(glossterm)
 msgid "protocol"
 msgstr "protocolo"
 
-#: C/evolution.xml:7608(para)
+#: C/evolution.xml:7607(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
@@ -15757,11 +15702,11 @@ msgstr ""
 "POP (Protocolo de Oficina Postal) para correo electrónico y HTTP (Protocolo "
 "de Transferencia de HiperTexto) para páginas web."
 
-#: C/evolution.xml:7612(glossterm)
+#: C/evolution.xml:7611(glossterm)
 msgid "public key encryption"
 msgstr "cifrado de clave pública"
 
-#: C/evolution.xml:7614(para)
+#: C/evolution.xml:7613(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -15773,11 +15718,11 @@ msgstr ""
 "pública sólo pueden ser descifrados con la clave privada. Cuanto más largas "
 "sean las claves más difícil será romper el cifrado."
 
-#: C/evolution.xml:7618(glossterm)
+#: C/evolution.xml:7617(glossterm)
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: C/evolution.xml:7620(para)
+#: C/evolution.xml:7619(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
@@ -15795,11 +15740,11 @@ msgstr ""
 "<quote>fly in soap</quote>. Para obtener más información introduzca "
 "<command>man grep</command> en la línea de comandos."
 
-#: C/evolution.xml:7624(glossterm)
+#: C/evolution.xml:7623(glossterm)
 msgid "script"
 msgstr "script"
 
-#: C/evolution.xml:7626(para)
+#: C/evolution.xml:7625(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -15811,11 +15756,11 @@ msgstr ""
 "órdenes pregrabadas o acciones dentro de una aplicación. Su utilización en "
 "tareas tediosas y repetitivas puede ahorrar mucho tiempo al usuario."
 
-#: C/evolution.xml:7630(glossterm)
+#: C/evolution.xml:7629(glossterm)
 msgid "search base"
 msgstr "base de búsqueda"
 
-#: C/evolution.xml:7632(para)
+#: C/evolution.xml:7631(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -15825,11 +15770,11 @@ msgstr ""
 "búsqueda le informa a LDAP el número de grupos a usar. La profundidad de la "
 "búsqueda base se ajusta con la opción Rango de búsqueda."
 
-#: C/evolution.xml:7636(glossterm)
+#: C/evolution.xml:7635(glossterm)
 msgid "search folder"
 msgstr "carpeta de búsqueda"
 
-#: C/evolution.xml:7638(para)
+#: C/evolution.xml:7637(para)
 msgid ""
 "An email organization tool. Search folders allow you to create a folder that "
 "contains the results of a complex search. Search folder contents are updated "
@@ -15839,19 +15784,19 @@ msgstr ""
 "permiten crear una carpeta que contenga los resultados de una búsqueda "
 "compleja. El contenido de una carpeta de búsqueda se actualiza dinámicamente."
 
-#: C/evolution.xml:7642(glossterm)
+#: C/evolution.xml:7641(glossterm)
 msgid "search scope"
 msgstr "rango de búsqueda"
 
-#: C/evolution.xml:7644(para)
+#: C/evolution.xml:7643(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "El rango de búsqueda indica cómo de profunda será la búsqueda base."
 
-#: C/evolution.xml:7648(glossterm)
+#: C/evolution.xml:7647(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7650(para)
+#: C/evolution.xml:7649(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15861,11 +15806,11 @@ msgstr ""
 "de SMTP, algunas personas lo prefieren porque ofrece mayor flexibilidad; no "
 "obstante es más difícil de configurar."
 
-#: C/evolution.xml:7654(glossterm)
+#: C/evolution.xml:7653(glossterm)
 msgid "switcher"
 msgstr "selector"
 
-#: C/evolution.xml:7656(para)
+#: C/evolution.xml:7655(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15873,11 +15818,11 @@ msgstr ""
 "Un área de Evolution que ofrece a los usuarios acceso rápido a la mayoría de "
 "las características usadas de la aplicación."
 
-#: C/evolution.xml:7660(glossterm)
+#: C/evolution.xml:7659(glossterm)
 msgid "signature"
 msgstr "firma"
 
-#: C/evolution.xml:7662(para)
+#: C/evolution.xml:7661(para)
 msgid ""
 "Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
@@ -15889,11 +15834,11 @@ msgstr ""
 "desde una cita favorita hasta un enlace a una página web; la cortesía dicta "
 "que debe tener menos de cuatro líneas de longitud."
 
-#: C/evolution.xml:7666(glossterm)
+#: C/evolution.xml:7665(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7668(para)
+#: C/evolution.xml:7667(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15901,11 +15846,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La forma más común de transportar mensajes de "
 "correo desde su equipo al servidor."
 
-#: C/evolution.xml:7672(glossterm)
+#: C/evolution.xml:7671(glossterm)
 msgid "tooltip"
 msgstr "consejo"
 
-#: C/evolution.xml:7674(para)
+#: C/evolution.xml:7673(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15913,11 +15858,11 @@ msgstr ""
 "Una pequeña caja con texto explicativo que aparece cuando el puntero del "
 "ratón se mantiene sobre un botón u otro elemento del interfaz."
 
-#: C/evolution.xml:7678(glossterm)
+#: C/evolution.xml:7677(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: C/evolution.xml:7680(para)
+#: C/evolution.xml:7679(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15929,11 +15874,11 @@ msgstr ""
 "un daño sustancial saturando redes o discos duros, borrando archivos o "
 "abriendo agujeros de seguridad."
 
-#: C/evolution.xml:7684(glossterm)
+#: C/evolution.xml:7683(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7686(para)
+#: C/evolution.xml:7685(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
 "address card attached to an email, it is probably in vCard format."
@@ -15942,11 +15887,11 @@ msgstr ""
 "obtiene una tarjeta de dirección adjuntada a un correo-e, probablemente esté "
 "en formato vCard."
 
-#: C/evolution.xml:7692(title)
+#: C/evolution.xml:7691(title)
 msgid "Legal Notices"
 msgstr "Notas legales"
 
-#: C/evolution.xml:7694(member)
+#: C/evolution.xml:7693(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15963,7 +15908,7 @@ msgstr ""
 "momento, sin obligación de notificar a ninguna persona o entidad tales "
 "cambios o revisiones."
 
-#: C/evolution.xml:7695(member)
+#: C/evolution.xml:7694(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15980,7 +15925,7 @@ msgstr ""
 "software de Novell en cualquier momento, sin obligación de notificar a "
 "ninguna persona o entidad tales cambios o revisiones."
 
-#: C/evolution.xml:7698(member)
+#: C/evolution.xml:7697(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15990,7 +15935,7 @@ msgstr ""
 "regulaciones aplicables incluyendo, sin limitación, las regulaciones de "
 "exportación de los EE.UU. o las leyes del país en el que resida."
 
-#: C/evolution.xml:7701(member)
+#: C/evolution.xml:7700(member)
 msgid ""
 "Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
 "or modify this document under the terms of the GNU Free Documentation "
@@ -16006,7 +15951,7 @@ msgstr ""
 "portada ni textos de contraportada. Podrá encontrar una copia de la GFDL en "
 "http://www.fsf.org/licenses/fdl.html."
 
-#: C/evolution.xml:7702(member)
+#: C/evolution.xml:7701(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -16016,7 +15961,7 @@ msgstr ""
 "LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
 "(GFDL) Y TENIENDO EN CUENTA QUE:"
 
-#: C/evolution.xml:7703(member)
+#: C/evolution.xml:7702(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -16043,7 +15988,7 @@ msgstr ""
 "NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
 "DE LA RENUNCIA;Y"
 
-#: C/evolution.xml:7704(member)
+#: C/evolution.xml:7703(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -16068,31 +16013,31 @@ msgstr ""
 "MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
 "SE PRODUJESEN DICHOS DAÑOS."
 
-#: C/evolution.xml:7707(member)
+#: C/evolution.xml:7706(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/evolution.xml:7708(member)
+#: C/evolution.xml:7707(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7709(member)
+#: C/evolution.xml:7708(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7710(member)
+#: C/evolution.xml:7709(member)
 msgid "U.S.A."
 msgstr "EE. UU."
 
-#: C/evolution.xml:7711(member)
+#: C/evolution.xml:7710(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7714(para)
+#: C/evolution.xml:7713(para)
 msgid "July 2007"
 msgstr "Julio de 2007"
 
-#: C/evolution.xml:7716(member)
+#: C/evolution.xml:7715(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -16101,11 +16046,11 @@ msgstr ""
 "Novell así como para obtener actualizaciones, consulte www.novell.com/"
 "documentation."
 
-#: C/evolution.xml:7719(member)
+#: C/evolution.xml:7718(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution es una marca comercial de Novell, Inc."
 
-#: C/evolution.xml:7720(member)
+#: C/evolution.xml:7719(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16113,7 +16058,7 @@ msgstr ""
 "GroupWise es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7721(member)
+#: C/evolution.xml:7720(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16121,12 +16066,12 @@ msgstr ""
 "Novell es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7722(member)
+#: C/evolution.xml:7721(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr ""
 "SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
 
-#: C/evolution.xml:7723(member)
+#: C/evolution.xml:7722(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16134,7 +16079,7 @@ msgstr ""
 "Ximian es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7726(member)
+#: C/evolution.xml:7725(member)
 msgid "All third-party trademarks are the property of their respective owners."
 msgstr ""
 "Todas las marcas comerciales de terceras partes son propiedad de sus "
@@ -16147,6 +16092,231 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
+#~ msgid ""
+#~ "Select this option if you connect to Novell <trademark class=\"registered"
+#~ "\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
+#~ "contact information on the server. For configuration instructions, see "
+#~ "<link linkend=\"bstfw13\">Remote Configuration Options</link>."
+#~ msgstr ""
+#~ "Seleccione esta opción si se conecta a Novell <trademark class="
+#~ "\"registered\">GroupWise</trademark>. Novell GroupWise conserva la "
+#~ "información de correo-e, calendario, y contactos en el servidor. Para las "
+#~ "instrucciones de configuración, consulte <link linkend=\"bstfw13"
+#~ "\">Opciones de configuración remotas</link>."
+
+#~ msgid ""
+#~ "Available only if you have installed the Connector for Microsoft* "
+#~ "Exchange. It allows you to connect to a Microsoft Exchange 2000 or 2003 "
+#~ "server, which stores email, calendar, and contact information on the "
+#~ "server. For configuration instructions, see <link linkend=\"bstfw13"
+#~ "\">Remote Configuration Options</link>."
+#~ msgstr ""
+#~ "Sólo disponible si ha instalado el Conector para Microsoft* Exchange, "
+#~ "permite conectarse a un servidor Microsoft* Exchange Server 2000 o 2003, "
+#~ "que almacena la información de calendario, contacto y correo electrónico "
+#~ "en el servidor. Para las instrucciones de configuración, consulte <link "
+#~ "linkend=\"bstfw13\">Opciones de configuración remota</link>."
+
+#~ msgid ""
+#~ "If you download your email using MH or another MH-style program, you "
+#~ "should use this option. You need to provide the path to the mail "
+#~ "directory you want to use. For configuration instructions, see <link "
+#~ "linkend=\"bstgbqn\">Local Configuration Options</link>."
+#~ msgstr ""
+#~ "Si descarga el correo utilizando «mh» u otro programa tipo MH querrá "
+#~ "utilizar esta opción. Debe escribir la ruta de acceso al directorio de "
+#~ "correo que quiere usar. Para las instrucciones de configuración, consulte "
+#~ "<link linkend=\"bstgbqn\">Opciones de configuración local</link>."
+
+#~ msgid ""
+#~ "If you download your email using Qmail or another Maildir-style program, "
+#~ "you should use this option. You need to provide the path to the mail "
+#~ "directory you want to use. For configuration instructions, see <link "
+#~ "linkend=\"bstgbqn\">Local Configuration Options</link>."
+#~ msgstr ""
+#~ "Si descarga su correo usando Qmail u otro programa tipo Maildir, querrá "
+#~ "usar esta opción. Debe escribir la ruta de acceso al directorio de correo "
+#~ "que quiere usar. Para las instrucciones de configuración, consulte <link "
+#~ "linkend=\"bstgbqn\">Opciones de configuración local</link>."
+
+#~ msgid ""
+#~ "If you select Novell GroupWise as your receiving server type, you need to "
+#~ "specify the following options:"
+#~ msgstr ""
+#~ "Si seleccione Novell GroupWise como su tipo de servidor para recepción, "
+#~ "necesita especificar las opciones siguientes:"
+
+#~ msgid ""
+#~ "If you select Microsoft Exchange as your receiving server type, you need "
+#~ "to specify the following options:"
+#~ msgstr ""
+#~ "Si ha elegido un servidor de correo Microsoft Exchange como su servidor "
+#~ "para recepción, necesitará especificar la  siguiente información:"
+
+#~ msgid ""
+#~ "If you select IMAP as your receiving server type, you need to specify the "
+#~ "following options:"
+#~ msgstr ""
+#~ "Si selecciona IMAP como su tipo de servidor de recepción, necesita "
+#~ "especificar las siguientes opciones:"
+
+#~ msgid ""
+#~ "If you select POP as your receiving server type, you need to specify the "
+#~ "following options:"
+#~ msgstr ""
+#~ "Si selecciona POP como su tipo de servidor de recepción, necesita "
+#~ "especificar las opciones siguientes:"
+
+#~ msgid ""
+#~ "If you select USENET News as your receiving server type, you need to "
+#~ "specify the following options:"
+#~ msgstr ""
+#~ "Si selecciona noticias USENET como si tipo de servidor, entonces necesita "
+#~ "especificar las siguientes opciones:"
+
+#~ msgid ""
+#~ "If you select Local Delivery as your receiving server type, you need to "
+#~ "specify the following options:"
+#~ msgstr ""
+#~ "Si selecciona «Entrega local» como su tipo de servidor de recepción, "
+#~ "necesita especificar las siguientes opciones:"
+
+#~ msgid ""
+#~ "If you select MH-Format Mail Directories as your receiving server type, "
+#~ "you need to specify the following options:"
+#~ msgstr ""
+#~ "Si selecciona directorios en formato MH como su tipo de servidor de "
+#~ "recepción, necesita especificar las opciones siguientes:"
+
+#~ msgid ""
+#~ "If you select Maildir-Format Mail Directories as your receiving server "
+#~ "type, you need to specify the following options:"
+#~ msgstr ""
+#~ "Si selecciona directorios en formato Maildir como su tipo de servidor de "
+#~ "recepción, necesita especificar las opciones siguientes:"
+
+#~ msgid ""
+#~ "If you select Standard Unix mbox Spool Directory as your receiving server "
+#~ "type, you need to specify the following options:"
+#~ msgstr ""
+#~ "Si selecciona directorios mbox estándar de Unix de correo como su tipo de "
+#~ "servidor de recepción, necesita especificar las opciones siguientes:"
+
+#~ msgid ""
+#~ "Click Check for Supported Types to have Evolution check for supported "
+#~ "types. Some servers do not announce the authentication mechanisms they "
+#~ "support, so clicking this button is not a guarantee that available "
+#~ "mechanisms actually work."
+#~ msgstr ""
+#~ "Pulse «Comprobar tipos soportados» para que Evolution compruebe qué tipos "
+#~ "están soportados. Algunos servidores no anuncian los mecanismos de "
+#~ "autenticación que soportan, así que pulsar este botón no garantiza que el "
+#~ "mecanismo disponible funcione realmente."
+
+#~ msgid ""
+#~ "(Optional) Select a classification (Public, Private, or Confidential) by "
+#~ "clicking &gt; Options &gt; Classifications."
+#~ msgstr ""
+#~ "(Opcional) seleccione una clasificación (Pública, Privada o Confidencial) "
+#~ "pulsando Opciones &gt; Clasificaciones."
+
+#~ msgid ""
+#~ "Select the account you want to convert, then click Edit to appear the "
+#~ "Account Editor."
+#~ msgstr ""
+#~ "Seleccione la cuenta que quiera convertir, después pulse Editar para que "
+#~ "aparezca el Editor de cuentas."
+
+#~ msgid "You can view Identity tab enabled."
+#~ msgstr "Podrá ver la solapa Identidad activada."
+
+#~ msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
+#~ msgstr ""
+#~ "Pulse Insertar &gt; Opciones de envío para abrir el cuadro de diálogo de "
+#~ "Opciones de envío"
+
+#~ msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
+#~ msgstr "Seleccione Prioridad Alta, Estándar, Baja, o Indefinida."
+
+#~ msgid ""
+#~ "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
+#~ "Tracking"
+#~ msgstr ""
+#~ "En la ventana del editor de mensaje pulse Insertar &gt; Opciones de envío "
+#~ "&gt; Seguimiento de estado"
+
+#~ msgid ""
+#~ "(Optional)Select the check box next to Auto-delete sent item to "
+#~ "automatically delete the sent item from the Sent folder."
+#~ msgstr ""
+#~ "(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado "
+#~ "para borrar automáticamente el elemento enviado de la carpeta Correo "
+#~ "enviado."
+
+#~ msgid ""
+#~ "To add a new account, click Add to open the Evolution configuration "
+#~ "assistant. To alter an existing account, select it in the Preferences "
+#~ "window, then click Edit to open the account editor dialog box."
+#~ msgstr ""
+#~ "Para añadir una cuenta nueva, pulse en Añadir para abrir el asistente de "
+#~ "configuración de Evolution. Para modificar una cuenta existente, "
+#~ "selecciónela y pulse en Editar para abrir el cuadro de diálogo del editor "
+#~ "de cuentas."
+
+#~ msgid ""
+#~ "This includes all the available IMAP Mail headers. By choosing this "
+#~ "option, Evolution will download all the headers for all the messages."
+#~ msgstr ""
+#~ "Esto incluye todas las cabeceras de correo IMAP disponibles. Eligiendo "
+#~ "esta opción Evolution descargará todas las cabeceras de todos los "
+#~ "mensajes."
+
+#~ msgid "Select the IMAP account and click Edit to open the Account Editor."
+#~ msgstr ""
+#~ "Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
+
+#~ msgid "The General page has the following options:"
+#~ msgstr "La página General tiene las siguientes opciones:"
+
+#~ msgid "The HTML Mail page has the following options:"
+#~ msgstr "La página Correo HTML tiene las siguientes opciones:"
+
+#~ msgid "The General page lets you set the following options:"
+#~ msgstr "La página General le permite establecer los siguientes valores:"
+
+#~ msgid "Use the following four options to configure the proxy settings:"
+#~ msgstr ""
+#~ "Use las siguientes cuatro opciones para configurar los ajustes del proxy:"
+
+#~ msgid "Specify the display duration for the error messages."
+#~ msgstr "Especifique la duración del mostrado de los mensajes de error."
+
+#~ msgid "The messages remain in the statusbar for this specified time."
+#~ msgstr ""
+#~ "El mensaje permanece en la barra de estado durante el tiempo especificado."
+
+#~ msgid ""
+#~ "Partial list of Documentation Translators (application translated to "
+#~ "numerous additional languages):"
+#~ msgstr ""
+#~ "Lista parcial de todos los traductores de la documentación (la aplicación "
+#~ "está traducida a numerosos idiomas adicionales):"
+
+#~ msgid "Daniel Persson for Swedish (.se)"
+#~ msgstr "Daniel Persson al sueco"
+
+#~ msgid ""
+#~ "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+#~ msgstr ""
+#~ "Hector García Álvarez, Franciso Javier F. Serrador y Jorge González para "
+#~ "el español (.es)"
+
+#~ msgid "Kjartan Maraas for Norwegian (.no)"
+#~ msgstr "Kjartan Maraas al noruego"
+
+#~ msgid "Sergey V. Mironov for Russian (.ru)"
+#~ msgstr "Sergey V. Mironov al ruso (.ru)"
+
 #~ msgid "User's Guide to the Evolution Groupware Suite and Email Client"
 #~ msgstr ""
 #~ "Guía de usuario de la Suite de trabajo en grupo y cliente de correo-e "
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ea7e85313f..bad1191117 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #204891
+
+	* filtertypes.xml:
+	* em-composer-utils.h: (em_utils_forward_message_raw):
+	* em-composer-utils.c: (emu_forward_raw_done),
+	(em_utils_forward_message_raw):
+	* mail-session.c: (ms_forward_to), (class_init):
+	Implement "forward-to" rule for message filters.
+
 2009-01-13  Felix Riemann  <friemann@svn.gnome.org>
 
 	** Fix for bug #563867
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index a7b982386e..75a237c472 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1557,6 +1557,102 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 	mail_append_mail (out_folder, receipt, info, em_utils_receipt_done, NULL);
 }
 
+static void
+emu_forward_raw_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info,
+		       int queued, const char *appended_uid, void *data)
+{
+	camel_message_info_free (info);
+	/* do not call mail send, just pile them all in the outbox */
+	/* mail_send (); */
+}
+
+/**
+ * em_utils_forward_message_raw:
+ * @param folder Where's a message located.
+ * @param message Message to forward.
+ * @param address Forward to whom.
+ * @param ex Exception.
+ * Forwards message to the address, in very similar way as redirect does.
+ **/
+void
+em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex)
+{
+	EAccount *account;
+	CamelMimeMessage *forward;
+	CamelStream *mem;
+	CamelInternetAddress *addr;
+	CamelFolder *out_folder;
+	CamelMessageInfo *info;
+	struct _camel_header_raw *xev;
+	char *subject;
+
+	g_return_if_fail (folder != NULL);
+	g_return_if_fail (message != NULL);
+	g_return_if_fail (address != NULL);
+
+	if (!*address) {
+		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("No destination address provided, forward of the message has been cancelled."));
+		return;
+	}
+
+	account = guess_account (message, folder);
+	if (!account) {
+		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("No account found to use, forward of the message has been cancelled."));
+		return;
+	}
+
+	forward = camel_mime_message_new ();
+
+	/* make copy of the message, because we are going to modify it */
+	mem = camel_stream_mem_new ();
+	camel_data_wrapper_write_to_stream ((CamelDataWrapper *)message, mem);
+	camel_seekable_stream_seek (CAMEL_SEEKABLE_STREAM (mem), 0, CAMEL_STREAM_SET);
+	camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)forward, mem);
+	camel_object_unref (mem);
+
+	/* clear previous recipients */
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, NULL);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_CC, NULL);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_BCC, NULL);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_RESENT_TO, NULL);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_RESENT_CC, NULL);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_RESENT_BCC, NULL);
+
+	/* remove all delivery and notification headers */
+	while (camel_medium_get_header (CAMEL_MEDIUM (forward), "Disposition-Notification-To"))
+		camel_medium_remove_header (CAMEL_MEDIUM (forward), "Disposition-Notification-To");
+
+	while (camel_medium_get_header (CAMEL_MEDIUM (forward), "Delivered-To"))
+		camel_medium_remove_header (CAMEL_MEDIUM (forward), "Delivered-To");
+
+	/* remove any X-Evolution-* headers that may have been set */
+	xev = mail_tool_remove_xevolution_headers (forward);
+	camel_header_raw_clear (&xev);
+
+	/* from */
+	addr = camel_internet_address_new ();
+	camel_internet_address_add (addr, account->id->name, account->id->address);
+	camel_mime_message_set_from (forward, addr);
+	camel_object_unref (addr);
+
+	/* to */
+	addr = camel_internet_address_new ();
+	camel_address_decode (CAMEL_ADDRESS (addr), address);
+	camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, addr);
+	camel_object_unref (addr);
+
+	/* subject */
+	subject = mail_tool_generate_forward_subject (message);
+	camel_mime_message_set_subject (forward, subject);
+	g_free (subject);
+
+	/* and send it */
+	out_folder = mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_OUTBOX);
+	info = camel_message_info_new (NULL);
+	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+	mail_append_mail (out_folder, forward, info, emu_forward_raw_done, NULL);
+}
+
 /* Replying to messages... */
 
 static GHashTable *
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index f943408605..00e7a10395 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -33,6 +33,7 @@ extern "C" {
 
 struct _CamelFolder;
 struct _CamelMimeMessage;
+struct _CamelException;
 struct _EMsgComposer;
 struct _EMFormat;
 struct _EAccount;
@@ -57,6 +58,8 @@ void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, co
 void em_utils_redirect_message (struct _CamelMimeMessage *message);
 void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const char *uid);
 
+void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *address, struct _CamelException *ex);
+
 void em_utils_handle_receipt (struct _CamelFolder *folder, const char *uid, struct _CamelMimeMessage *msg);
 void em_utils_send_receipt   (struct _CamelFolder *folder, struct _CamelMimeMessage *message);
 
diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml
index 69c1ddbaae..f2f69c4c06 100644
--- a/mail/filtertypes.xml
+++ b/mail/filtertypes.xml
@@ -1012,5 +1012,11 @@
   <code>(pipe-message "/bin/sh" "-c" ${command})</code>
   <input type="command" name="command"/>
  </part>
+
+ <part name="forward">
+  <title>Forward to</title>
+  <code>(forward-to ${address})</code>
+  <input type="address" name="address"/>
+ </part>
 </actionset>
 </filterdescription>
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 0e978ecdd0..e4af8e1c29 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -49,6 +49,7 @@
 #include "e-account-combo-box.h"
 #include "shell/e-shell.h"
 
+#include "em-composer-utils.h"
 #include "em-filter-context.h"
 #include "em-filter-rule.h"
 #include "em-utils.h"
@@ -95,6 +96,7 @@ static gboolean lookup_addressbook(CamelSession *session, const char *name);
 static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const char *text, int pc);
 static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);
 static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m);
+static void ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex);
 
 static void
 init (MailSession *session)
@@ -126,6 +128,7 @@ class_init (MailSessionClass *mail_session_class)
 	camel_session_class->thread_msg_new = ms_thread_msg_new;
 	camel_session_class->thread_msg_free = ms_thread_msg_free;
 	camel_session_class->thread_status = ms_thread_status;
+	camel_session_class->forward_to = ms_forward_to;
 }
 
 static CamelType
@@ -622,6 +625,16 @@ static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg,
 	printf("Thread status '%s' %d%%\n", text, pc);
 }
 
+static void
+ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex)
+{
+	g_return_if_fail (session != NULL);
+	g_return_if_fail (message != NULL);
+	g_return_if_fail (address != NULL);
+
+	em_utils_forward_message_raw (folder, message, address, ex);
+}
+
 char *
 mail_session_get_password (const char *url_string)
 {
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index c04825312f..874875d906 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,21 @@
+2009-01-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #225712
+
+	* itip-view.h:
+	* itip-view.c: (itip_view_set_show_keep_alarm_check),
+	(itip_view_get_keep_alarm_check_state),
+	(itip_view_set_show_inherit_alarm_check),
+	(itip_view_get_inherit_alarm_check_state): New functions to new
+	options to either inherit reminder from the incoming event or to
+	preserve users reminders in already existing event in the calendar.
+	* itip-view.c: (struct _ItipViewPrivate), (alarm_check_toggled_cb),
+	(itip_view_init): Properly initialize new option's members.
+	* itip-formatter.c: (find_cal_opened_cb), (update_item),
+	(send_comp_to_attendee), (update_attendee_status), (send_item),
+	(extract_itip_data), (view_response_cb), (format_itip_object):
+	Setup new options based on the actual data.
+
 2008-11-28  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #561467
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 61d2234bd8..83ea0036fb 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -630,6 +630,16 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 
 	if (!pitip->current_ecal && e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL)) {
+		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
+		    (icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) ||
+		    icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) ||
+		    icalcomponent_get_first_component (icalcomp, ICAL_XDISPLAYALARM_COMPONENT) ||
+		    icalcomponent_get_first_component (icalcomp, ICAL_XPROCEDUREALARM_COMPONENT) ||
+		    icalcomponent_get_first_component (icalcomp, ICAL_XEMAILALARM_COMPONENT)))
+			itip_view_set_show_keep_alarm_check (ITIP_VIEW (pitip->view), TRUE);
+		else
+			itip_view_set_show_keep_alarm_check (ITIP_VIEW (pitip->view), FALSE);
+
 		icalcomponent_free (icalcomp);
 
 		pitip->current_ecal = ecal;
@@ -652,7 +662,8 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 						      _("Found the appointment in the calendar '%s'"), e_source_peek_name (source));
 
 		set_buttons_sensitive (pitip);
-	}
+	} else if (!pitip->current_ecal)
+		itip_view_set_show_keep_alarm_check (ITIP_VIEW (pitip->view), FALSE);
 
 	if (pitip->current_ecal) {
 		if (e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
@@ -991,6 +1002,19 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response)
 	icalcomponent_add_component (pitip->top_level, clone);
 	icalcomponent_set_method (pitip->top_level, pitip->method);
 
+	if (!itip_view_get_inherit_alarm_check_state (ITIP_VIEW (pitip->view))) {
+		icalcomponent *alarm_comp;
+		icalcompiter alarm_iter;
+
+		alarm_iter = icalcomponent_begin_component (clone, ICAL_VALARM_COMPONENT);
+		while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
+			icalcompiter_next (&alarm_iter);
+
+			icalcomponent_remove_component (clone, alarm_comp);
+			icalcomponent_free (alarm_comp);
+		}
+	}
+
 	clone_comp = e_cal_component_new ();
 	if (!e_cal_component_set_icalcomponent (clone_comp, clone)) {
 		itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, _("Unable to parse item"));
@@ -999,6 +1023,35 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response)
 	}
 	source = e_cal_get_source (pitip->current_ecal);
 
+	if (itip_view_get_keep_alarm_check_state (ITIP_VIEW (pitip->view))) {
+		ECalComponent *real_comp;
+		GList *alarms, *l;
+		ECalComponentAlarm *alarm;
+
+		real_comp = get_real_item (pitip);
+		if (real_comp != NULL) {
+			alarms = e_cal_component_get_alarm_uids (real_comp);
+
+			for (l = alarms; l; l = l->next) {
+				alarm = e_cal_component_get_alarm (real_comp, (const char *)l->data);
+
+				if (alarm) {
+					ECalComponentAlarm *aclone = e_cal_component_alarm_clone (alarm);
+
+					if (aclone) {
+						e_cal_component_add_alarm (clone_comp, aclone);
+						e_cal_component_alarm_free (aclone);
+					}
+
+					e_cal_component_alarm_free (alarm);
+				}
+			}
+
+			cal_obj_uid_list_free (alarms);
+			g_object_unref (real_comp);
+		}
+	}
+
 	if ((response != ITIP_VIEW_RESPONSE_CANCEL)
 		&& (response != ITIP_VIEW_RESPONSE_DECLINE)){
 		GSList *attachments = NULL, *new_attachments = NULL, *l;
@@ -1160,7 +1213,7 @@ send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, cons
 	}
 
 	/* FIXME send the attachments in the request */
-	status = itip_send_comp (method, send_comp, client, NULL, NULL, NULL);
+	status = itip_send_comp (method, send_comp, client, NULL, NULL, NULL, TRUE);
 
 	g_object_unref (send_comp);
 
@@ -1310,7 +1363,7 @@ update_attendee_status (struct _itip_puri *pitip)
 
 		if (itip_view_get_update (ITIP_VIEW (pitip->view))) {
 			e_cal_component_commit_sequence (comp);
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL);
+			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL, TRUE);
 		}
 
 		if (!e_cal_modify_object (pitip->current_ecal, icalcomp, rid ? CALOBJ_MOD_THIS : CALOBJ_MOD_ALL, &error)) {
@@ -1340,7 +1393,7 @@ send_item (struct _itip_puri *pitip)
 	comp = get_real_item (pitip);
 
 	if (comp != NULL) {
-		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL);
+		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL, TRUE);
 		g_object_unref (comp);
 
 		switch (pitip->type) {
@@ -1421,7 +1474,7 @@ set_itip_error (struct _itip_puri *pitip, GtkContainer *container, const char *p
 }
 
 static gboolean
-extract_itip_data (struct _itip_puri *pitip, GtkContainer *container)
+extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean *have_alarms)
 {
 	icalproperty *prop;
 	icalcomponent_kind kind = ICAL_NO_COMPONENT;
@@ -1581,14 +1634,24 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container)
 			prop = icalcomponent_get_next_property (pitip->ical_comp, ICAL_X_PROPERTY);
 		}
 
-		/* Strip out alarms for security purposes */
+		/* Strip out procedural alarms for security purposes */
 		alarm_iter = icalcomponent_begin_component (pitip->ical_comp, ICAL_VALARM_COMPONENT);
 		while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) {
+			icalproperty *p;
+
 			icalcompiter_next (&alarm_iter);
 
-			icalcomponent_remove_component (pitip->ical_comp, alarm_comp);
+			p = icalcomponent_get_first_property (alarm_comp, ICAL_ACTION_PROPERTY);
+			if (icalproperty_get_action (p) == ICAL_ACTION_PROCEDURE)
+				icalcomponent_remove_component (pitip->ical_comp, alarm_comp);
+
 			icalcomponent_free (alarm_comp);
 		}
+
+		if (have_alarms) {
+			alarm_iter = icalcomponent_begin_component (pitip->ical_comp, ICAL_VALARM_COMPONENT);
+			*have_alarms = icalcompiter_deref (&alarm_iter) != NULL;
+		}
 	}
 
 	pitip->comp = e_cal_component_new ();
@@ -1911,7 +1974,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 		}
 
                 e_cal_component_rescan (comp);
-                if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL)) {
+                if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL, TRUE)) {
 			camel_folder_set_message_flags (pitip->folder, pitip->uid, CAMEL_MESSAGE_ANSWERED, CAMEL_MESSAGE_ANSWERED);
 		}
 
@@ -1974,6 +2037,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	const char *string, *org;
 	int i;
 	gboolean response_enabled;
+	gboolean have_alarms = FALSE;
 
 	info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid);
 	
@@ -1991,7 +2055,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	}
 
 	/* FIXME Handle multiple VEVENTS with the same UID, ie detached instances */
-	if (!extract_itip_data (info, GTK_CONTAINER (eb)))
+	if (!extract_itip_data (info, GTK_CONTAINER (eb), &have_alarms))
 		return TRUE;
 
 	info->view = itip_view_new ();
@@ -2003,6 +2067,8 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	if (!response_enabled) {
 		itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_HIDE_ALL);
 	} else {
+		itip_view_set_show_inherit_alarm_check (ITIP_VIEW (info->view), have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method ==  ICAL_METHOD_REQUEST));
+
 		switch (info->method) {
 		case ICAL_METHOD_PUBLISH:
 		case ICAL_METHOD_REQUEST:
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 92a8460e48..8c36da53d3 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -121,6 +121,8 @@ struct _ItipViewPrivate {
 
 	GtkWidget *options_box;
 	GtkWidget *free_time_check;
+	GtkWidget *keep_alarm_check;
+	GtkWidget *inherit_alarm_check;
 
 	GtkWidget *button_box;
 	gboolean buttons_sensitive;
@@ -947,6 +949,18 @@ recur_toggled_cb (GtkWidget *widget, gpointer data)
 	itip_view_set_mode (view, priv->mode);
 }
 
+/*
+  alarm_check_toggled_cb
+  check1 was changed, so make the second available based on state of the first check.
+*/
+static void
+alarm_check_toggled_cb (GtkWidget *check1, GtkWidget *check2)
+{
+	g_return_if_fail (check1 != NULL);
+	g_return_if_fail (check2 != NULL);
+
+	gtk_widget_set_sensitive (check2, !(GTK_WIDGET_VISIBLE (check1) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check1))));
+}
 
 static void
 itip_view_init (ItipView *view)
@@ -1119,6 +1133,17 @@ itip_view_init (ItipView *view)
 	priv->free_time_check = gtk_check_button_new_with_mnemonic (_("Show time as _free"));
 	gtk_box_pack_start (GTK_BOX (priv->options_box), priv->free_time_check, FALSE, FALSE, 0);
 
+	priv->keep_alarm_check = gtk_check_button_new_with_mnemonic (_("_Preserve my reminder"));
+	/* default value is to keep user's alarms */
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->keep_alarm_check), TRUE);
+	gtk_box_pack_start (GTK_BOX (priv->options_box), priv->keep_alarm_check, FALSE, FALSE, 0);
+
+	priv->inherit_alarm_check = gtk_check_button_new_with_mnemonic (_("_Inherit reminder"));
+	gtk_box_pack_start (GTK_BOX (priv->options_box), priv->inherit_alarm_check, FALSE, FALSE, 0);
+
+	g_signal_connect (priv->keep_alarm_check, "toggled", G_CALLBACK (alarm_check_toggled_cb), priv->inherit_alarm_check);
+	g_signal_connect (priv->inherit_alarm_check, "toggled", G_CALLBACK (alarm_check_toggled_cb), priv->keep_alarm_check);
+
 	/* The buttons for actions */
 	priv->button_box = gtk_hbutton_box_new ();
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->button_box), GTK_BUTTONBOX_START);
@@ -2118,7 +2143,7 @@ itip_view_set_show_recur_check (ItipView *view, gboolean show)
 
 	if (show)
 		gtk_widget_show (view->priv->recur_check);
-	else  {
+	else {
 		gtk_widget_hide (view->priv->recur_check);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->recur_check), FALSE);
 	}
@@ -2132,7 +2157,7 @@ itip_view_set_show_free_time_check (ItipView *view, gboolean show)
 	
 	if (show)
 		gtk_widget_show (view->priv->free_time_check);
-	else  {
+	else {
 		gtk_widget_hide (view->priv->free_time_check);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->free_time_check), FALSE);
 	}
@@ -2145,3 +2170,51 @@ itip_view_get_free_time_check_state (ItipView *view)
 
 	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->free_time_check));
 }
+
+void
+itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show)
+{
+	g_return_if_fail (view != NULL);
+	g_return_if_fail (ITIP_IS_VIEW (view));	
+	
+	if (show)
+		gtk_widget_show (view->priv->keep_alarm_check);
+	else
+		gtk_widget_hide (view->priv->keep_alarm_check);
+
+	/* and update state of the second check */
+	alarm_check_toggled_cb (view->priv->keep_alarm_check, view->priv->inherit_alarm_check);
+}
+
+gboolean
+itip_view_get_keep_alarm_check_state (ItipView *view)
+{
+	g_return_val_if_fail (view != NULL, FALSE);
+
+	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->keep_alarm_check));
+}
+
+void
+itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show)
+{
+	g_return_if_fail (view != NULL);
+	g_return_if_fail (ITIP_IS_VIEW (view));	
+	
+	if (show)
+		gtk_widget_show (view->priv->inherit_alarm_check);
+	else {
+		gtk_widget_hide (view->priv->inherit_alarm_check);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->priv->inherit_alarm_check), FALSE);
+	}
+
+	/* and update state of the second check */
+	alarm_check_toggled_cb (view->priv->inherit_alarm_check, view->priv->keep_alarm_check);
+}
+
+gboolean
+itip_view_get_inherit_alarm_check_state (ItipView *view)
+{
+	g_return_val_if_fail (view != NULL, FALSE);
+
+	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->inherit_alarm_check));
+}
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index f810f1f074..736119ae04 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -180,6 +180,12 @@ void itip_view_set_needs_decline (ItipView *view, gboolean needs_decline);
 void itip_view_set_show_free_time_check (ItipView *view, gboolean show);
 gboolean itip_view_get_free_time_check_state (ItipView *view);
 
+void itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show);
+gboolean itip_view_get_keep_alarm_check_state (ItipView *view);
+
+void itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show);
+gboolean itip_view_get_inherit_alarm_check_state (ItipView *view);
+
 G_END_DECLS
 
 #endif
diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog
new file mode 100644
index 0000000000..ca115fa827
--- /dev/null
+++ b/plugins/pst-import/ChangeLog
@@ -0,0 +1,9 @@
+2009-01-15  Bharath Acharya  <abharath@novell.com>
+
+	Basic functionality implemented by 
+	Chris Halls <chris.halls@credativ.co.uk>
+
+	** Added PST-Import plugin
+	* Makefile.am:
+	* org-gnome-pst.eplug.xml:
+	* pst-importer.c: 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
new file mode 100644
index 0000000000..031b1b181e
--- /dev/null
+++ b/plugins/pst-import/Makefile.am
@@ -0,0 +1,24 @@
+INCLUDES =						\
+	-I$(EVOLUTION_SOURCE)				\
+	-I$(top_srcdir)					\
+	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
+	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
+	$(EVOLUTION_CFLAGS)				\
+	$(EVOLUTION_MAIL_CFLAGS)			
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-pst-import.eplug
+plugin_LTLIBRARIES = liborg-gnome-pst-import.la
+
+liborg_gnome_pst_import_la_SOURCES = pst-importer.c
+liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version
+liborg_gnome_pst_import_la_LIBADD = \
+	$(LIBPST_LIBS)
+
+EXTRA_DIST = org-gnome-pst-import.eplug.xml
+
+BUILT_SOURCES = org-gnome-pst-import.eplug
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/plugins/pst-import/org-gnome-pst-import.eplug.xml b/plugins/pst-import/org-gnome-pst-import.eplug.xml
new file mode 100644
index 0000000000..fde4061085
--- /dev/null
+++ b/plugins/pst-import/org-gnome-pst-import.eplug.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<e-plugin-list>
+  <e-plugin
+    id="org.gnome.evolution.plugin.pst.import"
+    type="shlib"
+    location="@PLUGINDIR@/liborg-gnome-pst-import@SOEXT@"
+    _name="Outlook PST import">
+    <_description>Import Outlook messages from PST file</_description>
+    <author name="Bharath Acharya" email="abharath@novell.com"/>
+    <author name="Chris Halls" email="chris.halls@credativ.co.uk"/>
+    <hook class="org.gnome.evolution.import:1.0">
+        <importer
+	 target="uri"
+	 _name = "Outlook personal folders (.pst)"
+	 supported="org_credativ_evolution_readpst_supported"
+	 get-widget="org_credativ_evolution_readpst_getwidget"
+	 import="org_credativ_evolution_readpst_import"
+	 cancel="org_credativ_evolution_readpst_cancel">
+	</importer>
+    </hook>
+  </e-plugin> 
+</e-plugin-list>
+
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
new file mode 100644
index 0000000000..acd84c1a67
--- /dev/null
+++ b/plugins/pst-import/pst-importer.c
@@ -0,0 +1,1765 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* pst-importer.c
+*
+* Author: Chris Halls <chris.halls@credativ.co.uk>
+*	  Bharath Acharya <abharath@novell.com>
+*
+* Copyright (C) 2006  Chris Halls
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) version 3.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with the program; if not, see <http://www.gnu.org/licenses/>
+*
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define G_LOG_DOMAIN "eplugin-readpst"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+#include <glib/gprintf.h>
+
+#include <gtk/gtk.h>
+
+#include <e-util/e-import.h>
+
+#include <libebook/e-contact.h>
+#include <libebook/e-book.h>
+
+#include <libecal/e-cal.h>
+#include <libecal/e-cal-component.h>
+
+#include <libedataserver/e-data-server-util.h>
+#include <libedataserverui/e-source-selector-dialog.h>
+
+#include <camel/camel-folder.h>
+#include <camel/camel-store.h>
+#include <camel/camel-exception.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-multipart.h>
+#include <camel/camel-data-wrapper.h>
+#include <camel/camel-stream-mem.h>
+#include <camel/camel-stream-fs.h>
+#include <camel/camel-file-utils.h>
+
+#include <mail/mail-component.h>
+#include <mail/mail-mt.h>
+#include <mail/mail-tools.h>
+#include <mail/em-utils.h>
+
+#include <libpst/libpst.h>
+#include <libpst/define.h>
+#include <libpst/timeconv.h>
+
+typedef struct _PstImporter PstImporter;
+
+int pst_init (pst_file *pst, char *filename);
+gchar *get_pst_rootname (pst_file *pst, gchar *filename);
+static void pst_error_msg (const char *fmt, ...);
+static void pst_import_folders (PstImporter *m, pst_desc_ll *topitem);
+static void pst_process_item (PstImporter *m, pst_desc_ll *d_ptr);
+static void pst_process_folder (PstImporter *m, pst_item *item);
+static void pst_process_email (PstImporter *m, pst_item *item);
+static void pst_process_contact (PstImporter *m, pst_item *item);
+static void pst_process_appointment (PstImporter *m, pst_item *item);
+static void pst_process_task (PstImporter *m, pst_item *item);
+static void pst_process_journal (PstImporter *m, pst_item *item);
+
+static void pst_import_file (PstImporter *m);
+gchar *foldername_to_utf8 (const gchar *pstname);
+gchar *string_to_utf8(const gchar *string);
+void contact_set_date (EContact *contact, EContactField id, FILETIME *date);
+struct icaltimetype get_ical_date (FILETIME *date, gboolean is_date);
+char *rfc2445_datetime_format (FILETIME *ft);
+
+gboolean org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target);
+GtkWidget *org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im);
+void org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, EImportImporter *im);
+void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im);
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
+
+
+/* em-folder-selection-button.h is private, even though other internal evo plugins use it! 
+   so declare the functions here
+   TODO: sort out whether this should really be private
+*/
+typedef struct _EMFolderSelectionButton        EMFolderSelectionButton;
+GtkWidget *em_folder_selection_button_new (const char *title, const char *caption);
+void        em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const char *uri);
+const char *em_folder_selection_button_get_selection (EMFolderSelectionButton *button);
+
+static unsigned char pst_signature [] = { '!', 'B', 'D', 'N' };
+
+struct _PstImporter {
+	MailMsg base;
+
+	EImport *import;
+	EImportTarget *target;
+
+	GMutex *status_lock;
+	char *status_what;
+	int status_pc;
+	int status_timeout_id;
+	CamelOperation *status;
+	CamelException ex;
+
+	pst_file pst;
+	
+	CamelOperation *cancel;
+	CamelFolder *folder;
+	gchar *parent_uri;
+	gchar *folder_name;
+	gchar *folder_uri;
+	int folder_count;
+	int current_item;
+
+	EBook *addressbook;
+	ECal *calendar;
+	ECal *tasks;
+	ECal *journal;
+};
+
+gboolean
+org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
+{
+	char signature[sizeof (pst_signature)];
+	gboolean ret = FALSE;
+	int fd, n;
+	EImportTargetURI *s;
+	char *filename;
+
+	if (target->type != E_IMPORT_TARGET_URI) {
+		return FALSE;
+	}
+
+	s = (EImportTargetURI *)target;
+	
+	if (s->uri_src == NULL) {
+		return TRUE;
+	}
+
+	if (strncmp (s->uri_src, "file:///", strlen ("file:///")) != 0) {
+		return FALSE;
+	}
+
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
+	fd = g_open (filename, O_RDONLY, 0);
+	g_free (filename);
+
+	if (fd != -1) {
+		n = read (fd, signature, sizeof (pst_signature));
+		ret = n == sizeof (pst_signature) && memcmp (signature, pst_signature, sizeof (pst_signature)) == 0;
+		close (fd);
+	}
+	
+	return ret;
+}
+
+static void
+checkbox_mail_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
+{
+	g_datalist_set_data (&target->data, "pst-do-mail", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
+}
+
+static void
+checkbox_addr_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
+{
+	g_datalist_set_data (&target->data, "pst-do-addr", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
+}
+
+static void
+checkbox_appt_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
+{
+	g_datalist_set_data (&target->data, "pst-do-appt", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
+}
+
+static void
+checkbox_task_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
+{
+	g_datalist_set_data (&target->data, "pst-do-task", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
+}
+
+static void
+checkbox_journal_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
+{
+	g_datalist_set_data (&target->data, "pst-do-journal", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
+}
+
+static void
+folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target)
+{
+	g_free (target->uri_dest);
+	target->uri_dest = g_strdup (em_folder_selection_button_get_selection (button));
+}
+
+
+/**
+ * Suggest a folder to import data into
+ * @param target 
+ * @return 
+ */
+static gchar*
+get_suggested_foldername (EImportTargetURI *target)
+{
+	const gchar *inbox;
+	gchar *delim, *filename;
+	gchar *rootname = NULL;
+	GString *foldername;
+	pst_file pst;
+
+	/* Suggest a folder that is in the same mail storage as the users' inbox,
+	   with a name derived from the .PST file */
+	inbox = mail_component_get_folder_uri (NULL, MAIL_COMPONENT_FOLDER_INBOX);
+
+	delim = g_strrstr (inbox, "#");
+	if (delim != NULL) {
+		foldername = g_string_new_len (inbox, delim-inbox);
+	} else {
+		foldername = g_string_new (inbox);
+	}
+
+	g_string_append_c (foldername, '#');
+
+	filename = g_filename_from_uri (target->uri_src, NULL, NULL);
+
+	if (pst_init (&pst, filename) == 0) {
+		rootname = get_pst_rootname (&pst, filename);
+	}
+	
+	g_free (filename);
+
+	if (rootname != NULL) {
+		gchar *utf8name;
+		utf8name = foldername_to_utf8 (rootname);
+		g_string_append (foldername, utf8name);
+		g_free (utf8name);
+		g_free (rootname);
+	} else {
+		g_string_append (foldername, "outlook_data");
+	}
+
+	if (mail_tool_uri_to_folder (foldername->str, 0, NULL) != NULL) {
+		/* Folder exists - add a number */
+		int i, len;
+		len = foldername->len;
+		CamelFolder *folder;
+
+		for (i=1; i<10000; i++) {
+			g_string_truncate (foldername, len);
+			g_string_append_printf (foldername, "_%d", i);
+			if ((folder=mail_tool_uri_to_folder (foldername->str, 0, NULL)) == NULL) {
+				/* Folder does not exist */
+				break;
+			}
+		}
+		
+		if (folder != NULL) {
+			pst_error_msg ("Error searching for an unused folder name. uri=%s", foldername);
+		}
+	}
+
+	return g_string_free (foldername, FALSE);
+
+}
+
+GtkWidget *
+org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	GtkWidget *hbox, *framebox, *w;
+	gchar *foldername;
+
+	g_datalist_set_data (&target->data, "pst-do-mail", GINT_TO_POINTER (TRUE));
+	g_datalist_set_data (&target->data, "pst-do-addr", GINT_TO_POINTER (TRUE));
+	g_datalist_set_data (&target->data, "pst-do-appt", GINT_TO_POINTER (TRUE));
+	g_datalist_set_data (&target->data, "pst-do-task", GINT_TO_POINTER (TRUE));
+	g_datalist_set_data (&target->data, "pst-do-journal", GINT_TO_POINTER (TRUE));
+
+	framebox = gtk_vbox_new (FALSE, 2);
+
+	/* Mail */
+	hbox = gtk_hbox_new (FALSE, 0);
+	w = gtk_check_button_new_with_mnemonic (_("_Mail"));
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
+	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target);
+	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 0);
+	
+	w = em_folder_selection_button_new (_("Select folder"), _("Select folder to import into"));
+	foldername = get_suggested_foldername ((EImportTargetURI *) target);
+	((EImportTargetURI *) target)->uri_dest = g_strdup (foldername);
+	em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, foldername);
+	g_signal_connect (w, "selected", G_CALLBACK (folder_selected), target);
+	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, FALSE, 0);
+	
+	w = gtk_label_new (_("Destination folder:"));
+	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, TRUE, 6);
+	
+	gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0);
+
+	/* Address book */
+	w = gtk_check_button_new_with_mnemonic (_("_Address Book"));
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
+	/*gtk_widget_set_sensitive ((GtkWidget *)w, FALSE);*/ /* Disable until implemented */
+	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target);
+	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
+	
+	/* Appointments */
+	w = gtk_check_button_new_with_mnemonic (_("A_ppointments"));
+	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
+	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target);
+	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+	
+	/* Tasks */
+	w = gtk_check_button_new_with_mnemonic (_("_Tasks"));
+	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
+	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target);
+	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+	
+	/* Journal */
+	w = gtk_check_button_new_with_mnemonic (_("_Journal entries"));
+	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
+	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_journal_toggle_cb), target);
+	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
+
+	gtk_widget_show_all (framebox);
+
+	g_free (foldername);
+
+	return framebox;
+}
+
+static char *
+pst_import_describe (PstImporter *m, int complete)
+{
+	return g_strdup (_("Importing Outlook data"));
+}
+
+static ECal*
+open_ecal (ECalSourceType type, char *name)
+{
+	/* Hack - grab the first calendar we can find
+		TODO - add a selection mechanism in get_widget */
+	ESource *primary;
+	ESourceList *source_list;
+	ECal *cal;
+	
+	if ((e_cal_get_sources (&source_list, type, NULL)) == 0) {
+		g_warning ("Could not get any sources of type %s.", name);
+		return NULL;
+	}		
+	
+	primary = e_source_list_peek_source_any (source_list);
+	
+	if ((cal = e_cal_new (primary, type)) == NULL) {
+		g_warning ("Could not create %s.", name);
+		g_object_unref (source_list);
+		return NULL;
+	}
+	
+	e_cal_open (cal, TRUE, NULL);
+	g_object_unref (primary);
+	g_object_unref (source_list);
+	
+	return cal;
+}
+
+static void
+pst_import_import (PstImporter *m)
+{
+	CamelOperation *oldcancel = NULL;
+	
+	oldcancel = camel_operation_register (m->status);
+	
+	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) {
+		/* Hack - grab the first address book we can find
+		   TODO - add a selection mechanism in get_widget */
+		ESource *primary;
+		ESourceList *source_list;
+	
+		if (e_book_get_addressbooks (&source_list, NULL)) {
+			primary = e_source_list_peek_source_any (source_list);
+		
+			if ((m->addressbook = e_book_new (primary,NULL))) {
+				e_book_open (m->addressbook, TRUE, NULL);
+				g_object_unref (primary);
+				g_object_unref (source_list);
+			} else {
+				g_warning ("Could not create EBook.");
+			}
+		} else {
+			g_warning ("Could not get address books.");
+		}		
+	}	
+
+	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) {
+		m->calendar = open_ecal (E_CAL_SOURCE_TYPE_EVENT, "calendar");
+	}
+
+	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-task"))) {
+		m->tasks = open_ecal (E_CAL_SOURCE_TYPE_TODO, "task list");
+	}
+
+	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) {
+		m->journal = open_ecal (E_CAL_SOURCE_TYPE_JOURNAL, "journal");
+	}
+	
+	pst_import_file (m);
+
+/* FIXME: Crashes often in here.	
+	if (m->addressbook) {
+		g_object_unref (m->addressbook);
+	}
+
+	if (m->calendar) {
+		g_object_unref (m->calendar);
+	}
+
+	if (m->tasks) {
+		g_object_unref (m->tasks);
+	}
+
+	if (m->journal) {
+		g_object_unref (m->journal);
+	}
+*/
+	camel_operation_register (oldcancel);
+}
+
+static void
+pst_import_file (PstImporter *m)
+{
+	int ret;
+	gchar *filename;
+	pst_item *item = NULL;
+	pst_desc_ll *d_ptr;
+
+	filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL);
+	m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */
+
+	camel_operation_start (NULL, _("Importing `%s'"), filename);
+
+	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-mail"))) {
+		mail_tool_uri_to_folder (m->parent_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
+	}
+
+	ret = pst_init (&m->pst, filename);
+
+	if (ret < 0) {
+		g_free (filename);
+		camel_operation_end (NULL);
+		return;
+	}
+
+	g_free (filename);
+
+	camel_operation_progress_count (NULL, 1);
+
+	if ((item = pst_parse_item (&m->pst, m->pst.d_head)) == NULL) {
+		pst_error_msg ("Could not get root record");
+		return;
+	}
+
+	camel_operation_progress_count (NULL, 2);
+	
+	if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) {
+		pst_error_msg ("Top of folders record not found. Cannot continue");
+		return;
+	}
+
+	camel_operation_progress_count (NULL, 3);
+	pst_import_folders (m, d_ptr);
+
+	camel_operation_progress_count (NULL, 4);
+
+	camel_operation_end (NULL);
+
+	pst_freeItem (item);
+
+}
+
+static void
+pst_import_folders (PstImporter *m, pst_desc_ll *topitem)
+{
+	pst_desc_ll *d_ptr;
+	gchar *seperator;
+
+	d_ptr = topitem->child;
+
+	/* Walk through folder tree */
+	while (d_ptr != NULL && (camel_operation_cancel_check (NULL) == FALSE)) {
+		
+		pst_process_item (m, d_ptr);
+
+		if (d_ptr->child != NULL) {
+			g_free (m->parent_uri);
+			m->parent_uri = g_strdup (m->folder_uri);
+			d_ptr = d_ptr->child;
+		} else if (d_ptr->next != NULL) {
+			d_ptr = d_ptr->next;
+		} else {
+			while (d_ptr != topitem && d_ptr->next == NULL) {
+				if(m->folder_uri) {
+					g_free(m->folder_uri);
+				}
+
+				m->folder_uri = g_strdup (m->parent_uri);
+				seperator = g_strrstr (m->parent_uri, "/");
+
+				if (seperator != NULL) {
+					*seperator = '\0'; /* Truncate uri */
+				}
+
+				d_ptr = d_ptr->parent;
+
+			}
+			if (d_ptr == topitem) {
+				return;
+			}
+
+			d_ptr = d_ptr->next;
+		}
+	}
+}
+
+static void
+pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
+{
+	pst_item *item = NULL;
+
+	if (d_ptr->desc == NULL)
+		return;
+
+	item = pst_parse_item (&m->pst, d_ptr);
+
+	if (item == NULL)
+		return;
+
+	if (item->message_store != NULL) {
+		pst_error_msg ("A second message_store has been found - ignored");
+		pst_freeItem (item);
+		return;		
+	}
+	
+	if (item->folder != NULL) {
+		pst_process_folder (m, item);
+		camel_operation_start (NULL, _("Importing `%s'"), item->file_as);
+	} else {
+		if (m->folder_count && (m->current_item < m->folder_count)) {
+			camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count);
+		} else {
+			camel_operation_progress (NULL, 100);
+		}
+		
+		if (item->email != NULL &&
+			(item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
+
+			if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-mail")))
+				pst_process_email (m, item);
+
+		} else if (item->contact && item->type == PST_TYPE_CONTACT) {
+
+			if (m->addressbook && GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) {
+				pst_process_contact (m, item);
+			}
+
+		} else if (item->type == PST_TYPE_APPOINTMENT) {
+
+			if (m->calendar && GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) {
+				pst_process_appointment (m, item);
+			}
+
+		} else if (item->type == PST_TYPE_TASK) {
+
+			if (m->tasks && GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-task"))) {
+				pst_process_task (m, item);
+			}
+
+		} else if (item->type == PST_TYPE_JOURNAL) {
+
+			if (m->journal && GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) {
+				pst_process_journal (m, item);
+			}
+
+		}
+		
+		m->current_item++;
+	}
+
+	pst_freeItem (item);
+	
+	if (d_ptr->next == NULL) {
+		camel_operation_end (NULL);
+	}
+}
+
+/**
+ * Convert string to utf8. Currently we just use the locale, but maybe there is encoding
+ * information hidden somewhere in the PST file?
+ *
+ * @param string String from PST file
+ * @return utf8 representation (caller should free), or NULL for error.
+ */
+gchar *
+string_to_utf8(const gchar *string)
+{
+	gchar *utf8;
+
+	utf8 = g_locale_to_utf8 (string, -1, NULL, NULL, NULL);
+
+	return utf8;
+}
+
+/**
+ * Convert foldername to utf8 and escape characters if needed
+ * @param foldername from PST file
+ * @return converted folder name, or NULL for error. Caller should free
+ */
+gchar *
+foldername_to_utf8 (const gchar *pstname)
+{
+	gchar *utf8name, *folder_name;
+
+	utf8name = string_to_utf8(pstname);
+
+	if (utf8name == NULL) {
+		folder_name = camel_url_encode (pstname, NULL);
+		g_warning ("foldername_to_utf8: Cannot convert to utf8! foldername=%s", folder_name);
+	} else {
+		/* Encode using the current locale */
+		folder_name = camel_url_encode (utf8name, NULL);
+		g_free (utf8name);
+	}
+
+	g_strdelimit (folder_name, "/", '_');
+	g_strescape (folder_name, NULL);
+
+	return folder_name;
+}
+
+static void
+pst_process_folder (PstImporter *m, pst_item *item)
+{
+	gchar *uri;
+	g_free (m->folder_name);
+	g_free (m->folder_uri);
+	
+	if (item->file_as != NULL) {
+		m->folder_name = foldername_to_utf8 (item->file_as);
+	} else {
+		g_critical ("Folder: No name! item->file_as=%s", item->file_as);
+		m->folder_name = g_strdup ("unknown_name");
+	}
+
+	uri = g_strjoin ("/", m->parent_uri, m->folder_name, NULL);
+	m->folder_uri = uri;
+	
+	if (m->folder) {
+		camel_object_unref (m->folder);
+		m->folder = NULL;
+	}
+
+	m->folder_count = item->folder->email_count;
+	m->current_item = 0;
+}
+
+/**
+ * Create current folder in mail hierarchy. Parent folders will also be created.
+ * @param m PstImporter set to current folder
+ */
+static void
+pst_create_folder (PstImporter *m)
+{
+	const gchar *parent;
+	gchar *dest, *dest_end, *pos;
+	int dest_len;
+
+	parent = ((EImportTargetURI *)m->target)->uri_dest;
+	dest = g_strdup (m->folder_uri);
+
+	g_assert (g_str_has_prefix (dest, parent));
+
+	dest_len = strlen (dest);
+	dest_end = dest + dest_len;
+
+	pos = dest + strlen(parent);
+
+	while (pos != NULL && pos < dest_end) {
+		pos = g_strstr_len (pos+1, dest_end-pos, "/");
+		if (pos != NULL) {
+			CamelFolder *folder;
+
+			*pos = '\0';
+
+			folder = mail_tool_uri_to_folder (dest, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
+			camel_object_unref(folder);
+			*pos = '/';
+		}
+	}
+
+	g_free (dest);
+
+	if (m->folder) {
+		camel_object_unref (m->folder);
+	}
+
+	m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
+	
+}
+
+/**
+ * Create a camel mime part from given PST attachment
+ * @param attach attachment to convert
+ * @return CamelMimePart containing data and mime type
+ */
+static CamelMimePart *
+attachment_to_part (PstImporter *m, pst_item_attach *attach)
+{
+	CamelMimePart *part;
+	char *mimetype;
+
+	part = camel_mime_part_new ();
+
+	if (attach->filename2 || attach->filename1) {
+		camel_mime_part_set_filename (part, (attach->filename2 ? attach->filename2 : attach->filename1));
+		camel_mime_part_set_disposition (part, "attachment");
+		camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64);
+	} else {
+		camel_mime_part_set_disposition (part, "inline");
+	}
+
+	if (attach->mimetype != NULL) {
+		mimetype = attach->mimetype;
+	} else {
+		mimetype = "application/octet-stream";
+	}
+
+	if (attach->data != NULL) {
+		camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype);
+	} else {
+		char *buf = NULL;
+		size_t size;
+		size = pst_attach_to_mem (&m->pst, attach, &buf);
+		
+		camel_mime_part_set_content (part, (char*) buf, size, mimetype);
+		free(buf);
+	}
+
+	return part;
+}
+
+static void
+pst_process_email (PstImporter *m, pst_item *item)
+{
+	CamelMimeMessage *msg;
+	CamelInternetAddress *addr;
+	CamelMultipart *mp;
+	CamelMimePart *part;
+	CamelMessageInfo *info;
+	
+	if (m->folder == NULL) {
+		pst_create_folder (m);
+	}
+
+	camel_folder_freeze (m->folder);
+
+	msg = camel_mime_message_new ();
+
+	if (item->email->subject != NULL) {
+		gchar *subj;
+		
+		subj = string_to_utf8 (item->email->subject->subj);
+		if (subj == NULL) {
+			g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj);
+			camel_mime_message_set_subject (msg, "(lost subject)");
+		} else {
+			camel_mime_message_set_subject (msg, subj);
+			g_free(subj);
+		}
+	}
+
+	addr = camel_internet_address_new ();
+	
+	if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) {
+		camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender);
+	} else if (item->email->outlook_sender_name != NULL) {
+		camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender_name);
+	} else if (item->email->outlook_sender != NULL) {
+		camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender);
+	} else {
+		/* Evo prints a warning if no from is set, so supply an empty address */
+		camel_internet_address_add (addr, "", "");
+	}
+	
+	camel_mime_message_set_from (msg, addr);
+	camel_object_unref (addr);
+
+ 	if (item->email->sent_date != NULL) {
+		camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0);
+	}
+
+ 	if (item->email->messageid != NULL) {
+		camel_mime_message_set_message_id (msg, item->email->messageid);
+	}
+
+	if (item->email->header != NULL) {
+		/* Use mime parser to read headers */
+		CamelStream *stream;
+		/*g_debug ("  Email headers length=%zd", strlen (item->email->header));*/
+		/*g_message ("  Email headers... %s...", item->email->header);*/
+
+		stream = camel_stream_mem_new_with_buffer (item->email->header, strlen (item->email->header));
+		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)msg, stream) == -1)
+			g_warning ("Error reading headers, skipped");
+
+	} else {
+	 
+		if (item->email->sentto_address != NULL) {
+			addr = camel_internet_address_new ();
+
+			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address) > 0);
+				camel_mime_message_set_recipients (msg, "To", addr);
+
+			camel_object_unref (addr);
+		}
+
+		if (item->email->cc_address != NULL) {
+			addr = camel_internet_address_new ();
+
+			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address) > 0);
+				camel_mime_message_set_recipients (msg, "CC", addr);
+
+			camel_object_unref (addr);
+		}
+	}
+	
+	mp = camel_multipart_new ();
+	
+	if (item->attach != NULL) {
+
+		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed");
+
+	} else if (item->email->htmlbody && item->email->body) {
+
+		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternate");
+
+	} else if (item->email->htmlbody) {
+
+		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "text/html");
+
+	}
+
+	camel_multipart_set_boundary (mp, NULL);
+
+	if (item->email->body != NULL) {
+		/* Read internet headers */
+
+		/*g_debug ("  Email body length=%zd", strlen (item->email->body));
+		g_message ("  Email body %100s...", item->email->body);*/
+
+		part = camel_mime_part_new ();
+		camel_mime_part_set_content (part, item->email->body, strlen (item->email->body), "text/plain");
+		camel_multipart_add_part (mp, part);
+		camel_object_unref (part);
+	}
+
+	if (item->email->htmlbody != NULL) {
+		/*g_debug ("  HTML body length=%zd", strlen (item->email->htmlbody));*/
+		part = camel_mime_part_new ();
+		camel_mime_part_set_content (part, item->email->htmlbody, strlen (item->email->htmlbody), "text/html");
+		camel_multipart_add_part (mp, part);
+		camel_object_unref (part);
+	}
+
+	item->current_attach = item->attach;
+
+	while (item->current_attach != NULL) {
+		pst_item_attach *attach;
+
+		attach = item->current_attach;
+		part = attachment_to_part(m, attach);
+
+		camel_multipart_add_part (mp, part);
+		camel_object_unref (part);
+
+		item->current_attach = item->current_attach->next;
+	}
+
+	/*camel_mime_message_dump (msg, TRUE);*/
+
+	if (item->email->htmlbody || item->attach) {
+		camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp));
+	} else if (item->email->body) {
+		camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain");
+	} else {
+		g_warning ("Email without body. Subject:%s", 
+				(item->email->subject->subj ? item->email->subject->subj : "(empty)"));
+		camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain");
+	}
+
+	info = camel_message_info_new (NULL);
+
+	/* Read message flags (see comments in libpst.c */
+	if(item->email->flag && 0x01)
+		camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
+
+	if(item->email->importance == 2)
+		camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0);
+
+	if(item->email->flag && 0x08)
+		camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
+	
+	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
+	camel_message_info_free (info);
+	camel_object_unref (msg);
+
+	camel_folder_sync (m->folder, FALSE, NULL);
+	camel_folder_thaw (m->folder);
+
+	if (camel_exception_is_set (&m->ex)) {
+		g_critical ("Exception!");
+		camel_exception_clear (&m->ex);
+		return;
+	}
+
+}
+
+static void
+contact_set_string (EContact *contact, EContactField id, char *string)
+{
+	if (string != NULL) {
+		e_contact_set (contact, id, string);
+	}
+}
+
+static void
+unknown_field (EContact *contact, GString *notes, char *name, char *string)
+{
+	/* Field could not be mapped directly so add to notes field */
+	if (string != NULL) {
+		g_string_append_printf (notes, "%s: %s\n", name, string);
+	}
+}
+
+static void
+contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street)
+{
+	EContactAddress *eaddress;
+	
+	if (address || city || country || po_box || postal_code || state || street) {
+		eaddress = g_new0 (EContactAddress, 1);
+		if (po_box) {
+			eaddress->po = g_strdup (po_box);
+		}
+		//eaddress->ext = 
+		
+		if (street) {
+			eaddress->street = g_strdup (street);
+		}
+		
+		if (city) {
+			eaddress->locality = g_strdup (city);
+		}
+		
+		if (state) {
+			eaddress->region = g_strdup (state);
+		}
+		
+		if (postal_code) {
+			eaddress->code = g_strdup (postal_code);
+		}
+		
+		if (country) {
+			eaddress->country = g_strdup (country);
+		}
+		
+		e_contact_set (contact, id, eaddress);
+	}
+}
+
+void
+contact_set_date (EContact *contact, EContactField id, FILETIME *date)
+{
+	if (date && (date->dwLowDateTime || date->dwHighDateTime) ) {
+		time_t t1;
+		struct tm tm;
+		EContactDate *bday;
+		bday = e_contact_date_new ();
+		
+		t1 = fileTimeToUnixTime (date, 0);
+		gmtime_r (&t1, &tm);
+		
+		bday->year = tm.tm_year + 1900;
+		bday->month = tm.tm_mon + 1;
+		bday->day = tm.tm_mday;
+		
+		e_contact_set (contact, id, bday);
+	}
+}
+
+static void
+pst_process_contact (PstImporter *m, pst_item *item)
+{
+	pst_item_contact *c;
+	EContact *ec;
+	c = item->contact;
+	GString *notes;
+	
+	notes = g_string_sized_new (2048);
+
+	ec = e_contact_new ();
+	/* pst's fullname field only contains first, middle, surname */
+	if (c->display_name_prefix || c->suffix) {
+		GString *name = g_string_sized_new (128);
+
+		if (c->display_name_prefix) {
+			g_string_assign (name, c->display_name_prefix);
+		}
+
+		if (c->first_name) {
+			g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->first_name);
+		}
+
+		if (c->middle_name) {
+			g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->middle_name);
+		}
+
+		if (c->surname) {
+			g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->surname);
+		}
+
+		if (c->suffix) {
+			g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->suffix);
+		}
+
+		contact_set_string (ec, E_CONTACT_FULL_NAME, name->str);
+		g_string_free (name, TRUE);
+
+	} else {
+		contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname);
+	}
+	
+	/* unknown_field (ec, notes, "initials", c->initials); */
+	
+	contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname);
+	
+	contact_set_string (ec, E_CONTACT_ORG, c->company_name);
+	contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department);
+	contact_set_string (ec, E_CONTACT_TITLE, c->job_title);
+
+	contact_set_address (ec,E_CONTACT_ADDRESS_WORK, 
+			    c->business_address, c->business_city, c->business_country, 
+			    c->business_po_box, c->business_postal_code, c->business_state, c->business_street);
+	
+	contact_set_address (ec,E_CONTACT_ADDRESS_HOME, 
+			    c->home_address, c->home_city, c->home_country, 
+			    c->home_po_box, c->home_postal_code, c->home_state, c->home_street);
+			
+	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, 
+			    c->other_address, c->other_city, c->other_country, 
+			    c->other_po_box, c->other_postal_code, c->other_state, c->other_street);
+	
+	contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax);
+	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_2, c->business_phone2);
+	contact_set_string (ec, E_CONTACT_PHONE_CALLBACK, c->callback_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_CAR, c->car_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_COMPANY, c->company_main_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_HOME_FAX, c->home_fax);
+	contact_set_string (ec, E_CONTACT_PHONE_HOME, c->home_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_HOME_2, c->home_phone2);
+	contact_set_string (ec, E_CONTACT_PHONE_ISDN, c->isdn_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_MOBILE, c->mobile_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_OTHER_FAX, c->primary_fax);  /* ? */
+	contact_set_string (ec, E_CONTACT_PHONE_PAGER, c->pager_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_PRIMARY, c->primary_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_RADIO, c->radio_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_TTYTDD, c->ttytdd_phone);
+	contact_set_string (ec, E_CONTACT_PHONE_TELEX, c->telex);
+	unknown_field (ec, notes, "account_name", c->account_name);
+	contact_set_date (ec, E_CONTACT_ANNIVERSARY, c->wedding_anniversary);
+	contact_set_string (ec, E_CONTACT_ASSISTANT, c->assistant_name);
+	unknown_field (ec, notes, "billing_information", c->billing_information);
+	contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday);
+	/* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */
+	
+	contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1);
+	contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2);
+	contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3);
+	
+	/*unknown_field (ec, notes, "address1_desc" , c->address1_desc);
+	unknown_field (ec, notes, "address1_transport" , c->address1_transport);
+	unknown_field (ec, notes, "address2_desc" , c->address2_desc);
+	unknown_field (ec, notes, "address2_transport" , c->address2_transport);
+	unknown_field (ec, notes, "address3_desc" , c->address3_desc);
+	unknown_field (ec, notes, "address3_transport" , c->address3_transport);*/
+
+	/*unknown_field (ec, notes, "def_postal_address", c->def_postal_address);*/
+
+	/* unknown_field (ec, ??, c->gender); */
+	unknown_field (ec, notes, "access_method", c->access_method);
+	unknown_field (ec, notes, "gov_id", c->gov_id);
+	unknown_field (ec, notes, "customer_id", c->customer_id);
+	unknown_field (ec, notes, "hobbies", c->hobbies);
+	unknown_field (ec, notes, "followup", c->followup);
+		
+	contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address);
+	
+	unknown_field (ec, notes, "keyword", c->keyword);
+	unknown_field (ec, notes, "language", c->language);
+	unknown_field (ec, notes, "location", c->location);
+	contact_set_string (ec, E_CONTACT_OFFICE, c->office_loc);
+	unknown_field (ec, notes, "computer_name", c->computer_name);
+	unknown_field (ec, notes, "ftp_site", c->ftp_site);
+
+	contact_set_string (ec, E_CONTACT_MANAGER , c->manager_name);
+	unknown_field (ec, notes, "mileage", c->mileage);
+	unknown_field (ec, notes, "org_id", c->org_id);
+	contact_set_string (ec, E_CONTACT_ROLE, c->profession);
+	
+	contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name);
+
+	if (c->personal_homepage) {
+		contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->personal_homepage);
+		if (c->business_homepage) {
+			unknown_field (ec, notes, "business_homepage", c->business_homepage);
+		}
+	} else if (c->business_homepage) {
+		contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage);
+	}
+	
+	if (item->comment) {
+		g_string_append_printf (notes, "%s\n", item->comment);
+	}
+
+	if (item->email && item->email->body) {
+		g_string_append_printf (notes, "%s\n", item->email->body);
+	}
+
+	contact_set_string (ec, E_CONTACT_NOTE, notes->str);
+	g_string_free (notes, TRUE);
+	
+	e_book_add_contact (m->addressbook, ec, NULL);
+	g_object_unref (ec);
+
+}
+
+/**
+ * Convert pst time to icaltimetype
+ * @param date time value from libpst
+ * @param is_date treat as date only (all day event)?
+ * @return converted date
+ */
+struct icaltimetype
+get_ical_date (FILETIME *date, gboolean is_date)
+{
+	if (date && (date->dwLowDateTime || date->dwHighDateTime) ) {
+		time_t t;
+
+		t = fileTimeToUnixTime (date, 0);
+		return icaltime_from_timet_with_zone (t, is_date, NULL);
+	} else {
+		return icaltime_null_date ();
+	}
+}
+
+char *rfc2445_datetime_format (FILETIME *ft) {
+	static char* buffer = NULL;
+	struct tm *stm = NULL;
+
+	if (buffer == NULL) {
+		buffer = malloc (30); // should be enough
+	}
+	
+	stm = fileTimeToStructTM (ft);
+	strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm);
+	return buffer;
+}
+
+static void
+set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_attach *attach)
+{
+	GSList *list = NULL;
+	const char *uid;
+	char *store_dir;
+
+	if (attach == NULL) {
+		return;
+	}
+
+	e_cal_component_get_uid (ec, &uid);
+	store_dir = g_filename_from_uri (e_cal_get_local_attachment_store (cal), NULL, NULL);
+
+	while (attach != NULL) {
+		const char* orig_filename;
+		char *filename, *tmp, *path, *dirname, *uri;
+		CamelMimePart *part;
+		CamelDataWrapper *content;
+		CamelStream *stream;
+		struct stat st;
+
+		part = attachment_to_part(m, attach);
+
+		orig_filename = camel_mime_part_get_filename(part);
+		
+		if (orig_filename == NULL) {
+			g_warning("Ignoring unnamed attachment");
+			attach = attach->next;
+			continue;  /* Ignore unnamed attachments */
+		}
+
+		tmp = camel_file_util_safe_filename (orig_filename);
+		filename = g_strdup_printf ("%s-%s", uid, tmp);
+		path = g_build_filename (store_dir, filename, NULL);
+		
+		g_free (tmp);
+		g_free (filename);
+	
+		dirname = g_path_get_dirname(path);
+		if (g_mkdir_with_parents(dirname, 0777) == -1) {
+			g_warning("Could not create directory %s: %s", dirname, g_strerror(errno));
+			g_free(dirname);
+			attach = attach->next;
+			continue;
+		}
+		g_free(dirname);
+	
+		if (g_access(path, F_OK) == 0) {
+			if (g_access(path, W_OK) != 0) {
+				g_warning("Could not write file %s - file exists", path);
+				attach = attach->next;
+				continue;
+			}
+		}
+		
+		if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) {
+			g_warning("Could not write file %s - not a file", path);
+			attach = attach->next;
+			continue;
+		}
+		
+		if (!(stream = camel_stream_fs_new_with_name (path, O_WRONLY | O_CREAT | O_TRUNC, 0666))) {
+			g_warning ("Could not create stream for file %s - %s", path, g_strerror (errno));
+			attach = attach->next;
+			continue;
+		}
+	
+		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	
+		if (camel_data_wrapper_decode_to_stream (content, stream) == -1
+			|| camel_stream_flush (stream) == -1)
+		{
+			g_warning ("Could not write attachment to %s: %s", path, g_strerror (errno));
+			camel_object_unref (stream);
+			attach = attach->next;
+			continue;
+		}
+					
+		camel_object_unref (stream);
+		
+		uri = g_filename_to_uri (path, NULL, NULL);
+		list = g_slist_append (list, g_strdup (uri));
+		g_free (uri);
+		
+		camel_object_unref (part);
+		g_free (path);
+
+		attach = attach->next;
+		
+	}
+
+	g_free (store_dir);
+
+	e_cal_component_set_attachment_list (ec, list);
+}
+
+static void
+fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char *type)
+{
+	pst_item_appointment *a;
+	pst_item_email *e;
+	
+	a = item->appointment;
+	e = item->email;
+	ECalComponentText text;
+	struct icaltimetype tt_start, tt_end;
+	ECalComponentDateTime dt_start, dt_end;
+	
+	if (item->create_date) {
+		struct icaltimetype tt;
+		tt = get_ical_date (item->create_date, FALSE);
+		e_cal_component_set_created (ec, &tt);
+	}
+	if (item->modify_date) {
+		struct icaltimetype tt;
+		tt = get_ical_date (item->modify_date, FALSE);
+		e_cal_component_set_last_modified (ec, &tt);
+	}
+	
+	if (e) {
+		if (e->subject || e->proc_subject) {
+			if (e->subject) {
+				text.value = e->subject->subj;
+			} else if (e->proc_subject) {
+				text.value = e->proc_subject;
+			}
+
+			text.altrep = NULL; /* email->proc_subject? */
+			e_cal_component_set_summary (ec, &text);
+		}
+		if (e->body) {
+			GSList l;
+			text.value = e->body;
+			text.altrep = NULL;
+			l.data = &text;
+			l.next = NULL;
+			e_cal_component_set_description_list (ec, &l);
+		}				
+	} else {
+		g_warning ("%s without subject / body!", type);
+	}
+	
+	if (a->location) {
+		e_cal_component_set_location (ec, a->location);
+	}
+
+	if (a->start) {
+		tt_start = get_ical_date (a->start, a->all_day);
+		dt_start.value = &tt_start;
+		dt_start.tzid = NULL;
+		e_cal_component_set_dtstart (ec, &dt_start);
+	}
+
+	if (a->end) {
+		tt_end = get_ical_date (a->end, a->all_day);
+		dt_end.value = &tt_end;
+		dt_end.tzid = NULL;
+		e_cal_component_set_dtend (ec, &dt_end);
+	}
+
+	switch (a->showas) {
+		case PST_FREEBUSY_TENTATIVE:
+			e_cal_component_set_status (ec, ICAL_STATUS_TENTATIVE);
+			break;
+		case PST_FREEBUSY_FREE:
+			// mark as transparent and as confirmed
+			e_cal_component_set_transparency (ec, E_CAL_COMPONENT_TRANSP_TRANSPARENT);
+		case PST_FREEBUSY_BUSY:
+		case PST_FREEBUSY_OUT_OF_OFFICE:
+			e_cal_component_set_status (ec, ICAL_STATUS_CONFIRMED);
+			break;
+	}
+	switch (a->label) {
+		case PST_APP_LABEL_NONE:
+			break;
+		case PST_APP_LABEL_IMPORTANT:
+			e_cal_component_set_categories (ec, "Important"); break;
+		case PST_APP_LABEL_BUSINESS:
+			e_cal_component_set_categories (ec, "Business"); break;
+		case PST_APP_LABEL_PERSONAL:
+			e_cal_component_set_categories (ec, "Personal"); break;
+		case PST_APP_LABEL_VACATION:
+			e_cal_component_set_categories (ec, "Vacation"); break;
+		case PST_APP_LABEL_MUST_ATTEND:
+			e_cal_component_set_categories (ec, "Must-attend"); break;
+		case PST_APP_LABEL_TRAVEL_REQ:
+			e_cal_component_set_categories (ec, "Travel-required"); break;
+		case PST_APP_LABEL_NEEDS_PREP:
+			e_cal_component_set_categories (ec, "Needs-preparation"); break;
+		case PST_APP_LABEL_BIRTHDAY:
+			e_cal_component_set_categories (ec, "Birthday"); break;
+		case PST_APP_LABEL_ANNIVERSARY:
+			e_cal_component_set_categories (ec, "Anniversary"); break;
+		case PST_APP_LABEL_PHONE_CALL:
+			e_cal_component_set_categories (ec, "Phone-call"); break;
+	}
+	
+	if (a->alarm || a->alarm_minutes) {
+		ECalComponentAlarm *alarm;
+		ECalComponentAlarmTrigger trigger;
+		
+		alarm = e_cal_component_alarm_new ();
+		
+		if (a->alarm_minutes) {
+			trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
+			trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60);
+			e_cal_component_alarm_set_trigger (alarm, trigger);
+		}
+		
+		if (a->alarm) {
+			if (a->alarm_filename) {
+				e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO);
+			} else {
+				e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
+			}
+		}
+
+		e_cal_component_add_alarm (ec, alarm);
+		e_cal_component_alarm_free(alarm);
+	
+	}
+	
+	if (a->recurrence != PST_APP_RECUR_NONE) {
+		struct icalrecurrencetype  r;
+		GSList recur_list;
+		
+		icalrecurrencetype_clear (&r);
+		r.interval = 1; /* Interval not implemented in libpst */
+		if (a->recurrence_end) {
+			r.until = get_ical_date (a->recurrence_end, FALSE);
+		}
+		
+		switch (a->recurrence_type) {
+			case PST_APP_RECUR_DAILY:
+				r.freq = ICAL_DAILY_RECURRENCE; break;
+			case PST_APP_RECUR_WEEKLY:
+				r.freq = ICAL_WEEKLY_RECURRENCE; break;
+			case PST_APP_RECUR_MONTHLY:
+				r.freq = ICAL_MONTHLY_RECURRENCE; break;
+			case PST_APP_RECUR_YEARLY:
+				r.freq = ICAL_YEARLY_RECURRENCE; break;
+			default:
+				r.freq = ICAL_NO_RECURRENCE;
+		}
+
+		recur_list.data = &r;
+		recur_list.next = NULL;
+		e_cal_component_set_rrule_list (ec, &recur_list);
+	}
+	
+}
+
+static void
+pst_process_appointment (PstImporter *m, pst_item *item)
+{
+	ECalComponent *ec;
+
+	ec = e_cal_component_new ();
+	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_EVENT);
+	
+	fill_calcomponent (m, item, ec, "appointment");
+	set_cal_attachments (m->calendar, ec, m, item->attach);
+
+	if (!e_cal_create_object (m->calendar, e_cal_component_get_icalcomponent (ec), NULL, NULL)) {
+		g_warning("Creation of appointment failed");
+		g_free(ec);
+	}
+
+	g_object_unref (ec);
+	
+}
+
+static void
+pst_process_task (PstImporter *m, pst_item *item)
+{
+	ECalComponent *ec;
+
+	ec = e_cal_component_new ();
+	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_TODO);
+	
+	fill_calcomponent (m, item, ec, "task");
+	set_cal_attachments (m->tasks, ec, m, item->attach);
+
+	/* Note - libpst is missing many fields. E.g. task status, start/completion date, % complete */
+	
+	if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) {
+		g_warning("Creation of task failed");
+		g_free(ec);
+	}
+	
+	g_object_unref (ec);
+	
+}
+
+static void
+pst_process_journal (PstImporter *m, pst_item *item)
+{
+	struct pst_item_journal *j;
+	ECalComponent *ec;
+
+	j = item->journal;
+	ec = e_cal_component_new ();
+	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_JOURNAL);
+
+	fill_calcomponent (m, item, ec, "journal");
+	set_cal_attachments (m->journal, ec, m, item->attach);
+
+	/* Note - an Evo memo entry does not have date started/finished or type fields :( */
+	/*if (j) {
+		ECalComponentText text;
+		struct icaltimetype tt_start, tt_end;
+		ECalComponentDateTime dt_start, dt_end;
+	
+		if (j->start) {
+			tt_start = get_ical_date (j->start, FALSE);
+			dt_start.value = &tt_start;
+			dt_start.tzid = NULL;
+			e_cal_component_set_dtstart (ec, &dt_start);
+			g_message ("journal start:%s", rfc2445_datetime_format (j->start));
+		}
+	
+		if (j->end) {
+			tt_end = get_ical_date (j->end, FALSE);
+			dt_end.value = &tt_end;
+			dt_end.tzid = NULL;
+			e_cal_component_set_dtend (ec, &dt_end);
+			g_message ("end:%s", rfc2445_datetime_format (j->end));
+		}
+		g_message ("type: %s", j->type);
+	}*/
+
+	if (!e_cal_create_object (m->journal, e_cal_component_get_icalcomponent (ec), NULL, NULL)) {
+		g_warning("Creation of journal entry failed");
+		g_free(ec);
+	}
+
+	g_object_unref (ec);
+	
+}
+
+/* Print an error message - maybe later bring up an error dialog? */
+static void
+pst_error_msg (const char *fmt, ...)
+{
+	va_list ap;
+	
+	va_start (ap, fmt);
+	g_critical (fmt, ap);
+	va_end (ap);
+}
+
+static void
+pst_import_imported (PstImporter *m)
+{
+	e_import_complete (m->target->import, (EImportTarget *)m->target);
+}
+
+static void
+pst_import_free (PstImporter *m)
+{
+//	pst_close (&m->pst);
+	camel_operation_unref (m->status);
+
+	g_free (m->status_what);
+	g_mutex_free (m->status_lock);
+
+	g_source_remove (m->status_timeout_id);
+	m->status_timeout_id = 0;
+
+	g_free (m->folder_name);
+	g_free (m->folder_uri);
+	g_free (m->parent_uri);
+
+	g_object_unref (m->import);
+}
+
+static MailMsgInfo pst_import_info = {
+	sizeof (PstImporter),
+	(MailMsgDescFunc) pst_import_describe,
+	(MailMsgExecFunc) pst_import_import,
+	(MailMsgDoneFunc) pst_import_imported,
+	(MailMsgFreeFunc) pst_import_free,
+};
+
+static gboolean
+pst_status_timeout (void *data)
+{
+	PstImporter *importer = data;
+	int pc;
+	char *what;
+
+	if (importer->status_what) {
+		g_mutex_lock (importer->status_lock);
+		what = importer->status_what;
+		importer->status_what = NULL;
+		pc = importer->status_pc;
+		g_mutex_unlock (importer->status_lock);
+
+		e_import_status (importer->target->import, (EImportTarget *)importer->target, what, pc);
+	}
+
+	return TRUE;
+}
+
+static void
+pst_status (CamelOperation *op, const char *what, int pc, void *data)
+{
+	PstImporter *importer = data;
+
+	if (pc == CAMEL_OPERATION_START) {
+		pc = 0;
+	} else if (pc == CAMEL_OPERATION_END) {
+		pc = 100;
+	}
+
+	g_mutex_lock (importer->status_lock);
+	g_free (importer->status_what);
+	importer->status_what = g_strdup (what);
+	importer->status_pc = pc;
+	g_mutex_unlock (importer->status_lock);
+}
+
+static int
+pst_import (EImport *ei, EImportTarget *target)
+{
+	PstImporter *m;
+	int id;
+
+	m = mail_msg_new (&pst_import_info);
+	g_datalist_set_data (&target->data, "pst-msg", m);
+	m->import = ei;
+	g_object_ref (m->import);
+	m->target = target;
+	
+	m->parent_uri = NULL;
+	m->folder_name = NULL;
+	m->folder_uri = NULL;
+	
+	m->addressbook = NULL;
+	m->calendar = NULL;
+	m->tasks = NULL;
+	m->journal = NULL;
+
+	m->status_timeout_id = g_timeout_add (100, pst_status_timeout, m);
+	/*m->status_timeout_id = NULL;*/
+	m->status_lock = g_mutex_new ();
+	m->status = camel_operation_new (pst_status, m);
+
+	id = m->base.seq;
+	
+	mail_msg_unordered_push (m);
+
+	return id;
+}
+
+/* Start the main import operation */
+void
+org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	if (GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-mail"))
+	    || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-addr"))
+	    || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-appt"))
+	    || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-task"))
+	    || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-journal"))) {
+				pst_import (ei, target);
+	} else {
+		e_import_complete (target->import, target);
+	}
+}
+
+void
+org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
+{
+	PstImporter *m = g_datalist_get_data (&target->data, "pst-msg");
+
+	if (m) {
+		camel_operation_cancel (m->status);
+	}
+}
+
+int
+e_plugin_lib_enable (EPluginLib *ep, int enable)
+{
+	if (enable) {
+		bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+		g_message ("pst Plugin enabled");
+	} else {
+		g_message ("pst Plugin disabled");
+	}
+
+	return 0;
+}
+
+/**
+ * Open PST file and determine root folder name
+ * @param pst: pst_file structure to be used by libpst
+ * @param filename : path to file
+ * @return 0 for sucess, -1 for failure
+ */
+int
+pst_init (pst_file *pst, gchar *filename)
+{
+
+#if 0
+	char *d_log = "readpst.log";
+	/* initialize log file */
+	DEBUG_INIT (d_log);
+	DEBUG_REGISTER_CLOSE ();
+#endif
+	
+	DEBUG_ENT ("main");
+	if (pst_open (pst, filename) < 0) {
+		pst_error_msg ("Error opening PST file %s", filename);
+		return -1;
+	}
+
+	if (pst_load_index (pst) < 0) {
+		pst_error_msg ("Error loading indexes");
+		return -1;
+	}
+
+	if (pst_load_extended_attributes (pst) < 0) {
+		pst_error_msg ("Error loading file items");
+		return -1;
+	}
+
+	return 0;
+}
+
+/**
+ * Open determine root folder name of PST file
+ * @param pst: pst_file structure to be used by libpst
+ * @param filename : if non NULL, fallback to this name if folder name is not available
+ * @return pointer to name of root folder (should be freed by caller), or NULL if error
+ */
+gchar *
+get_pst_rootname (pst_file *pst, gchar *filename)
+{
+	pst_item *item = NULL;
+	gchar *rootname = NULL;
+
+	if ((item = pst_parse_item (pst, pst->d_head)) == NULL) {
+		pst_error_msg ("Could not get root record");
+		return NULL;
+	}
+
+	if (item->message_store == NULL) {
+		pst_error_msg ("Could not get root message store");
+		pst_freeItem (item);
+		return NULL;
+	}
+
+	/* default the file_as to the same as the main filename if it doesn't exist */
+	if (item->file_as == NULL) {
+		if (filename == NULL) {
+			pst_freeItem (item);
+			return NULL;
+		}
+		rootname = g_path_get_basename (filename);
+	} else {
+		rootname = g_strdup (item->file_as);
+	}
+
+	pst_freeItem (item);
+
+	return rootname;
+}
diff --git a/po/ChangeLog b/po/ChangeLog
index 90319f9cb4..c2838cc0f4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,31 @@
+2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-19  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2009-01-18 Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2009-01-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-16  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation, fix #566570.
+
+2009-01-16  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-01-15  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in: Added plugins/pst-import/org-gnome-pst-import.eplug.xml
+
 2009-01-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b2c719aef3..799209a73c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -397,6 +397,7 @@ plugins/plugin-manager/plugin-manager.c
 plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
 plugins/prefer-plain/prefer-plain.c
 plugins/profiler/org-gnome-evolution-profiler.eplug.xml
+plugins/pst-import/org-gnome-pst-import.eplug.xml
 plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
 plugins/publish-calendar/org-gnome-publish-calendar.xml
 plugins/publish-calendar/publish-calendar.c
diff --git a/po/ca.po b/po/ca.po
index 5134c5fe75..1b0f4aabc9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,13 +11,13 @@
 # Gil Forcada <gilforcada@guifi.net>, 2006
 # David Planella Molas <david.planella@gmail.com>, 2007, 2008
 #
-#: ../shell/main.c:589
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 16:28+0200\n"
-"PO-Revision-Date: 2008-09-11 21:08+0200\n"
+"POT-Creation-Date: 2009-01-16 15:37+0100\n"
+"PO-Revision-Date: 2009-01-11 19:11+0100\n"
 "Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,21 +27,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "llibreta d'adreces de l'Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Llista de contactes nova"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -158,7 +158,7 @@ msgid "calendar view for one or more days"
 msgstr "visualització de calendari per a un o més dies"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %B del %Y"
 
@@ -169,8 +169,8 @@ msgstr "%A, %d de %B del %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1584
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -178,9 +178,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -188,10 +188,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:827
+#: ../calendar/gui/calendar-component.c:834
+#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:842
 msgid "%d %b %Y"
 msgstr "%d de %B del %Y"
 
@@ -201,15 +201,15 @@ msgstr "%d de %B del %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1600
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Calendari del Gnome"
 
@@ -256,11 +256,11 @@ msgstr "emergent"
 msgid "popup a child"
 msgstr "desplega un fill"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "edita"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "comença a editar aquesta cel·la"
 
@@ -273,19 +273,19 @@ msgstr "commuta"
 msgid "toggle the cell"
 msgstr "commuta la cel·la"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "expandeix"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "expandeix la fila en l'ETree que conté la cel·la"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "contreu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contreu la fila de l'ETree que conté aquesta cel·la"
 
@@ -399,7 +399,7 @@ msgid ""
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"Només podeu accedir a llibretes d'adreces del sistema de Groupwise des de "
+"Només podeu accedir a llibretes d'adreces del sistema de GroupWise des de "
 "l'Evolution. Hauríeu d'utilitzar un altre client de correu GroupWise una "
 "vegada per a obtenir els vostres contactes freqüents de GroupWise i les "
 "carpetes de contactes personals de GroupWise."
@@ -422,7 +422,7 @@ msgstr "No es pot autenticar amb el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "No s'ha pogut suprimir el contacte"
 
@@ -435,6 +435,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "El servidor LDAP no ha respost amb informació d'esquema vàlida."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Versió del servidor"
 
@@ -570,7 +571,7 @@ msgstr "_Utilitza tal com és"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -579,21 +580,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Adreça de sincronització predeterminada:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "No s'ha pogut carregar la llibreta d'adreces"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreces del pilot"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "Compleció automàtica"
 
@@ -611,9 +613,9 @@ msgstr "Configureu la compleció automàtica aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Contactes"
@@ -653,15 +655,15 @@ msgstr "Gestioneu els vostres certificats S/MIME aquí"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-component.c:143
 #: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/calendar-component.c:244
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
@@ -670,103 +672,117 @@ msgstr "En aquest ordinador"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-component.c:162
 #: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contacte"
+
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Crea un contacte nou"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Llista de contactes"
+
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Crea una llista de contactes nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Llibreta d'adreces nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Lli_breta d'adreces"
+
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Crea una llibreta d'adreces nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "No s'han pogut actualitzar els paràmetres o el directori de la llibreta "
 "d'adreces."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copia el contingut de la _llibreta localment per a treballar fora de línia"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2466
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Informació del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalls"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Cerca"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Baixada"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
@@ -833,53 +849,60 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les vostres dades del Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta «%s» a:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "El nom de la carpeta no pot contenir el caràcter «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "Llibreta d'adreces _nova"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Desa com a vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "Can_via el nom..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Seleccionador de fonts de contacte"
 
@@ -900,8 +923,8 @@ msgstr "Introduïu la contrasenya per a %s (usuari %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduïu la contrasenya"
@@ -927,10 +950,14 @@ msgstr ""
 "de llista, i la subfinestra de previsualització, en píxels."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostra el nom autocompletat amb una adreça"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Mostra la subfinestra de previsualització"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -938,23 +965,39 @@ msgstr ""
 "El nombre de caràcters que s'han d'haver escrit abans que l'Evolution iniciï "
 "la compleció automàtica."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Posició de la subfinestra vertical"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Si s'ha de forçar la visualització de l'adreça electrònica amb el nom del "
+"contacte autocompletat a l'entrada."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Si s'ha de mostrar la subfinestra de previsualització."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "M_ostra sempre l'adreça del contacte autocompletat"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "Cerca a les llibretes d'adreces"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -996,7 +1039,7 @@ msgid "Add Address Book"
 msgstr "Afegeix una llibreta d'adreces"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Sempre"
 
@@ -1037,14 +1080,14 @@ msgid "Lo_gin:"
 msgstr "_Entra:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Mai"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Sense xifratge"
 
@@ -1057,7 +1100,7 @@ msgstr "One"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "Xifratge SSL"
 
@@ -1125,7 +1168,7 @@ msgstr "Bases de cerca compatibles"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "Xifratge TLS"
 
@@ -1153,7 +1196,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "El nom complet del servidor d'LDAP. Per exemple, «ldap.lamevaempresa.cat»."
@@ -1169,7 +1212,7 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "El mètode que utilitzarà l'Evolution per a autenticar-vos. Recordeu que "
@@ -1224,7 +1267,7 @@ msgstr "Mè_tode d'entrada:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1239,7 +1282,7 @@ msgid "_Search scope:"
 msgstr "Àmbit de la c_erca:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1257,13 +1300,14 @@ msgid "cards"
 msgstr "targetes"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "minuts"
 
@@ -1304,8 +1348,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Feina</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1316,16 +1360,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Contacte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -1334,11 +1378,12 @@ msgid "Full _Name..."
 msgstr "_Nom complet..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Imatge"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "Missatgeria de l'MSN"
 
@@ -1351,1251 +1396,1262 @@ msgid "Nic_kname:"
 msgstr "Sobre_nom:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "Novell GroupWise"
+msgstr "GroupWise de Novell"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
-msgstr "Groupwise de Novell"
+msgstr "GroupWise de Novell"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Informació personal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telèfon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Feina"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adreça:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Commemoració:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "A_niversari:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Calendari:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "Pobla_ció:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Classi_fica sota:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Lliure/ocupat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "Pà_gina personal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "Ad_ministrador:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notes:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "A_partat de correus:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Professió:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Cònjuge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stat/província:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Títol:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "Xat de _vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "Bloc _web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_On:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "Codi posta_l:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Adreça"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algèria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antàrtida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua i Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armènia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Austràlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Àustria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbaitjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahames"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangla Desh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Bielorússia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benín"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bòsnia i Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Territori Britànic de l'Oceà Índic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgària"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Camerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Cap Verd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Illes Caiman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "República Centreafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Txad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Xile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Xina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Illa Christmas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Illes Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colòmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, República Democràtica del"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Illes Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Costa d'Ivori"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Croàcia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Xipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egipte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Guinea Equatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiòpia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Illes Malvines (Falkland)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Illes Fèroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "França"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guaiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinèsia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Territoris Francesos del Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gàmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Geòrgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadaloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Illa Heard i Illes McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Ciutat de Vaticà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Hondures"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Hongria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Índia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonèsia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japó"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea del Nord"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Corea del Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Letònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Líban"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Libèria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Líbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Lituània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Macedònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malàisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldives"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Illes Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Maurici"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Mèxic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Micronèsia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldàvia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Mònaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongòlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marroc"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Moçambic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Països Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Antilles Holandeses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nova Caledònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nova Zelanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Níger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigèria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Illes Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Illes Marianes del Nord"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panamà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filipines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Federació Russa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Christopher i Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent i les Grenadines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Sao Tomé i Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Aràbia Saudita"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Sèrbia i Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Eslovènia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Illes Salomó"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somàlia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Sud-àfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Illes Geòrgia del Sud i Sandwich del Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre i Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illes Svalbard i Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swazilàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Síria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzània"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tailàndia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinitat i Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Illes Turks i Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ucraïna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Unió dels Emirats Àrabs"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Illes Perifèriques menors dels Estats Units"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Veneçuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Illes Verge Britàniques"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Illes Verge Americanes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Illes Wallis i Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Sàhara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zàmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "Missatgeria instantània de l'AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Missatgeria del Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Missatgeria Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Servei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Particular"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2255
 msgid "Other"
 msgstr "Altres"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
-msgstr "Groupwise"
+msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Llibreta d'adreces d'origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Llibreta d'adreces de destinació"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "És un contacte nou"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Camps d'escriptura"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Camps necessaris"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Modificat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "Cap _imatge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2603,47 +2659,47 @@ msgstr ""
 "Les dades del contacte no són vàlides:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» té un format no vàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» és buit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Contacte no vàlid."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Afegeix un contacte ràpidament"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Edita sencer"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "No_m complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "Correu electrò_nic"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Seleccioneu la llibreta d'adreces"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2652,7 +2708,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir la llista de contactes (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2660,7 +2716,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir aquestes llistes de contactes?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2669,7 +2725,7 @@ msgstr ""
 "Segur que voleu\n"
 "suprimir el contacte (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2778,9 +2834,9 @@ msgstr "Serve_i de MI:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Ubicació:"
 
@@ -2794,6 +2850,9 @@ msgid "Contact List Editor"
 msgstr "Editor de la llista de contactes"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Seleccioneu..."
 
@@ -2820,9 +2879,9 @@ msgid "_Members"
 msgstr "_Membres"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2880,23 +2939,23 @@ msgstr "Fusiona el contacte"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Adreça electrònica"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "El correu electrònic comença per"
 
@@ -2904,35 +2963,35 @@ msgstr "El correu electrònic comença per"
 msgid "Name contains"
 msgstr "El nom conté"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Cap contacte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacte"
 msgstr[1] "%d contactes"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Consulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "S'ha produït un error en obtenir la visualització de la llibreta"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
 
@@ -2940,31 +2999,31 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "El nom comença per"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Font"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipus"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Desa com a vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1773 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Obre"
@@ -3018,12 +3077,12 @@ msgid "Cu_t"
 msgstr "Re_talla"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1780 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3034,14 +3093,20 @@ msgid "P_aste"
 msgstr "Engan_xa"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Sense coincidència"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3071,7 +3136,7 @@ msgstr "Telèfon del cotxe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3079,7 +3144,7 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Empresa"
 
@@ -3128,22 +3193,22 @@ msgid "Journal"
 msgstr "Diari"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Director"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Nota"
 
@@ -3172,14 +3237,14 @@ msgid "Radio"
 msgstr "Ràdio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Cònjuge"
 
@@ -3209,55 +3274,55 @@ msgstr "Unitat"
 msgid "Web Site"
 msgstr "Lloc web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Amplada"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Alçada"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Té el focus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Camp"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Nom del camp"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Model del text"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Longitud màxima del nom del camp"
 
@@ -3327,83 +3392,83 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Correu de la feina"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Correu particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Un altre correu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Seleccionada"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Té el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "Envia un mi_ssatge nou a..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Copia l'adr_eça electrònica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Membres de la llista"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Departament"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Professió"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Posició"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Xat de vídeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2496
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3414,208 +3479,198 @@ msgstr "Xat de vídeo"
 msgid "Calendar"
 msgstr "Calendari"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Lliure/ocupat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Telèfon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Pàgina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Bloc web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2534
 msgid "Birthday"
 msgstr "Aniversari"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2535
 msgid "Anniversary"
 msgstr "Commemoració"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Càrrec"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Pàgina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Bloc"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Correcte"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Recurs ocupat"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "El dipòsit està fora de línia"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "No existeix la llibreta d'adreces"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "No s'ha definit cap contacte propi"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "No s'ha trobat el contacte"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "L'ID del contacte ja existeix"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "El protocol no és compatible"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
 msgid "Canceled"
 msgstr "S'ha cancel·lat"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "No s'ha pogut cancel·lar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Ha fallat l'autenticació"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Cal autenticació"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "El TLS no està disponible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "No existeix tal font"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "No està disponible en mode fora de línia"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Un altre error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "La versió del servidor no és vàlida"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "El mètode d'autenticació no està implementat"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces. Això significa que la llibreta no "
 "està marcada per a ser utilitzada fora de línia, o que encara no s'ha "
 "baixat. Carregueu la llibreta d'adreces un cop estigueu en línia per a poder "
 "baixar el seu contingut"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces. Comproveu que existeix el camí %s "
 "i que hi teniu permís d'accés."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"No s'ha pogut obrir la llibreta d'adreces perquè l'URI que heu introduït és "
-"incorrecte o el servidor d'LDAP no està disponible."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "Aquesta versió de l'Evolution no està compilada per a utilitzar LDAP. Si "
-"voleu utilitzar l'Evolution amb l'LDAP heu d'obtenir un paquet de "
+"voleu utilitzar l'Evolution amb l'LDAP haureu d'instal·lar un paquet de "
 "l'Evolution preparat per a treballar amb l'LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces perquè l'URI introduït és "
 "incorrecte o el servidor no està disponible."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
-msgid "Detailed error:"
+msgid "Detailed error message:"
 msgstr "Informació detallada de l'error:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:171
@@ -3635,7 +3690,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
@@ -3760,22 +3815,22 @@ msgstr "Mou els contactes a"
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "vCard múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard per a %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Informació del contacte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informació de contacte per a %s"
@@ -3784,23 +3839,23 @@ msgstr "Informació de contacte per a %s"
 msgid "Querying Address Book..."
 msgstr "S'està consultant la llibreta d'adreces..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hi ha un altre contacte."
 msgstr[1] "Hi ha %d contactes més."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Mostra la vCard completa"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Mostra la vCard compacta"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Desa a la llibreta d'adreces"
 
@@ -3809,10 +3864,10 @@ msgid "Card View"
 msgstr "Visualització de targeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "S'està important..."
 
@@ -3840,19 +3895,19 @@ msgstr "Evolution CSV o Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV i Tab de l'Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format d'intercanvi de dades LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF de l'Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de l'Evolution"
 
@@ -3899,9 +3954,9 @@ msgstr "Format"
 #: ../addressbook/printing/e-contact-print.glade.h:11
 #: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Capçalera"
@@ -4004,9 +4059,9 @@ msgstr "Ombrejat"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Mida:"
 
@@ -4035,30 +4090,8 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Tipus de _lletra..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Prova de l'editor d'estil d'impressió de contactes"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr ""
-"Això hauria de provar el giny d'edició d'estils d'impressió de contactes"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Prova de la impressió de contactes"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Això hauria de provar el codi d'impressió de contactes"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "No es pot obrir el fitxer"
@@ -4071,31 +4104,31 @@ msgstr "No s'ha pogut obtenir la llista de llibretes d'adreces"
 msgid "failed to open book"
 msgstr "no es pot obrir la llibreta"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Especifiqueu el fitxer de sortida, en comptes de la sortida estàndard"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "FITXERDESORTIDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Llista les carpetes de llibretes d'adreces locals"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Mostra les targetes com a fitxers vcard o csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Exporta en mode asíncron"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4104,30 +4137,30 @@ msgstr ""
 "predeterminada és 100."
 
 # FIXME: s'ha de comprovar si això hauria de ser nombre o número (dpm)
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NOMBRE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "S'ha produït un error en els arguments de la línia d'ordres. Feu servir "
 "l'opció --help per a consultar-ne l'ús."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Només són compatibles els formats csv i vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "La sortida en mode asíncron ha de ser un fitxer."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "No cal l'opció de la mida en el mode normal."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Error no gestionat"
 
@@ -4243,19 +4276,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Segur que voleu suprimir aquesta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Segur que voleu suprimir aquesta reunió?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Segur que voleu suprimir aquesta anotació?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Segur que voleu suprimir aquesta tasca?"
@@ -4273,43 +4306,47 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Segur que voleu enviar una tasca sense resum?"
 
 #: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "El dipòsit del calendari està fora de línia"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "No es pot crear un esdeveniment nou"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "No es pot desar l'esdeveniment"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Voleu suprimir el calendari «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Voleu suprimir la llista d'anotacions «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Voleu suprimir la llista de tasques «{0}»?"
 
 # Es refereix a enviar un avís de cancel·lació (dpm)
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "No l'_enviïs"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "S'està baixant. Voleu desar aquesta cita?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "S'està baixant. Voleu desar la tasca al disc?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "No s'ha pogut carregar l'editor."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4317,26 +4354,31 @@ msgstr ""
 "S'enviaran invitacions per correu a tots els participants i se'ls permetrà "
 "acceptar aquesta tasca."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "S'enviaran invitacions per correu a tots els participants i se'ls permetrà "
 "respondre-hi."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "S'ha produït un error en carregar el calendari"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "S'ha produït un error en carregar la llista d'anotacions"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "S'ha produït un error en carregar la llista de tasques"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "S'ha produït un error en {0}"
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4344,7 +4386,7 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha cancel·lat la reunió."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4352,7 +4394,7 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha suprimit l'anotació."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4360,7 +4402,23 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha suprimit la tasca."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "No s'ha rebut cap resposta del servidor."
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "Desa la cita"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "Desa l'anotació"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "Desa la tasca"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4368,7 +4426,7 @@ msgstr ""
 "Enviar informació actualitzada permet als altres participants mantenir "
 "actualitzats els seus calendaris."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4376,98 +4434,106 @@ msgstr ""
 "Enviar informació actualitzada permet als altres participants mantenir "
 "actualitzades les seves llistes de tasques."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "S'estan baixant algunes adjuncions. Es perdran si deseu la cita ara."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "S'estan baixant algunes adjuncions. Es perdran si deseu la tasca ara."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pot ser que algunes característiques no funcionin correctament amb el vostre "
 "servidor actual."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendari de l'Evolution ha sortit inesperadament."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Els calendaris de l'Evolution han sortit inesperadament."
+
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "L'anotació de l'Evolution ha sortit inesperadament."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Les tasques de l'Evolution han sortit inesperadament."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "No s'ha marcat el calendari per a l'ús en mode fora de línia."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "No s'ha marcat la llista d'anotacions per a l'ús en mode fora de línia."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "No s'ha marcat la llista de tasques per a l'ús en mode fora de línia."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "El calendari se suprimirà permanentment."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Aquesta llista d'anotacions se suprimirà permanentment."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Aquesta llista d'anotacions se suprimirà permanentment."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "No s'ha pogut carregar el calendari"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Voleu desar els canvis en aquesta cita?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Voleu desar els canvis en aquesta tasca?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Voleu desar els canvis en aquesta tasca?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Voleu enviar un avís de cancel·lació per a aquesta anotació?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Voleu enviar un avís de cancel·lació a tots els participants?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Voleu enviar invitacions de la reunió als participants?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Voleu enviar aquesta tasca als participants?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Voleu enviar informació actualitzada de la reunió als participants?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Voleu enviar informació actualitzada de la tasca als participants?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4477,110 +4543,110 @@ msgstr ""
 "tingueu problemes en fer servir l'Evolution. Per a obtenir els millors "
 "resultats és recomanable actualitzar el servidor a una versió compatible"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Heu realitzat canvis a aquesta cita, però encara no els heu desat."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr "Heu realitzat canvis a aquesta tasca, però encara no els heu desat."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Heu realitzat canvis a aquesta tasca, però encara no els heu desat."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no reinicieu l'Evolution no estaran disponibles els calendaris."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no reinicieu l'Evolution no estaran disponibles les anotacions."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Fins que no reinicieu l'Evolution no estaran disponibles les tasques."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descarta els canvis"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "De_sa els canvis"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Envia"
 
 # Es refereix a enviar un avís de cancel·lació (dpm)
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "E_nvia l'avís"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Divideix els esdeveniments de múltiples dies:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "No s'ha pogut iniciar l'evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de calendari del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'anotacions del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "No s'ha pogut escriure el bloc d'aplicació d'anotacions del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Prioritat predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de tasques del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de tasques del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "Calendar and Tasks"
 msgstr "Calendari i tasques"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "Calendaris"
 
@@ -4622,22 +4688,22 @@ msgid "Memo_s"
 msgstr "Anotacion_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Anotacions"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4658,26 +4724,27 @@ msgstr "_Tasques"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servei de notificació per alarma del calendari de l'Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Hora d'inici"
 
@@ -4688,64 +4755,68 @@ msgstr "Cites"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ubicació:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
-msgstr "_Temps de migdiada:"
+msgstr "_Temps de repetició:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr "_Descarta"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr "Mi_gdiada"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "ubicació de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "No hi ha cap descripció disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "No hi ha cap informació d'ubicació disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Teniu %d alarmes."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Avís"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4757,7 +4828,7 @@ msgstr ""
 "es va configurar per a enviar un correu. En lloc d'això, \n"
 "l'Evolution mostrarà un quadre de diàleg de recordatori normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4774,7 +4845,7 @@ msgstr ""
 "\n"
 "Segur que voleu executar-lo?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "No em facis més preguntes sobre aquest programa."
 
@@ -4795,7 +4866,7 @@ msgid "invalid time"
 msgstr "l'hora no es vàlida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4804,7 +4875,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4815,7 +4886,7 @@ msgstr[1] "%d minuts"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4828,163 +4899,187 @@ msgid "Alarm programs"
 msgstr "Programes d'alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Temps en segons durant el qual es mostrarà l'error a la barra d'estat."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Sol·licita confirmació en suprimir elements"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Color de fons de les tasques que vencen avui, en format «#rrggbb»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Color de fons de les tasques que han vençut, en format «#rrggbb»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Calendaris pels quals s'han d'executar les alarmes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color amb el qual s'ha de dibuixar la línia de Marcus Bains a la barra de "
 "temps (buit per defecte)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 "Color amb el qual s'ha de dibuixar la línia de Marcus Bains a la "
 "visualització de dies."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana en la visualització mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Demana confirmació en buidar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Dies en els quals s'ha d'indicar l'inici i el final de les hores laborals."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Recordatori de cita predeterminat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Unitats predeterminades pels recordatoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Valor predeterminat pels recordatoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Directory for saving alarm audio files"
 msgstr "Directori per a desar els fitxers de so d'alarmes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Degradat de l'esdeveniment"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Transparència de l'esdeveniment"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL del servidor lliure/ocupat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Plantilla URL de lliure/ocupat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "Degradat dels esdeveniments a la visualització de calendaris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Oculta les tasques completades"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Oculta les unitats de la tasca"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Oculta el valor de la tasca"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Posició de la subfinestra horitzontal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "A quina hora acaba el dia laboral, entre 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "A quina hora comença el dia laboral, entre 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervals mostrats en les visualitzacions de dies i setmanes laborals, en "
 "minuts."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Última hora de l'alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr "Nivell per sobre del qual s'enregistrarà el missatge."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Llista dels URL dels servidors per a la publicació de l'estat lliure/ocupat."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Línia de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la línia de Marcus Bains - Visualització de dies"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la línia de Marcus Bains - Barra de temps"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut de finalització de la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut d'inici de la jornada laboral, de 0 a 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Posició de la subfinestra horitzontal a la visualització mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Posició de la subfinestra vertical a la visualització mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Nombre d'unitats per a determinar un recordatori predeterminat."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nombre d'unitats per a determinar quan s'han d'amagar les tasques."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Color de les tasques vençudes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4993,7 +5088,7 @@ msgstr ""
 "dates i la llista de tasques quan no s'estigui a la visualització mensual, "
 "en píxels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5002,7 +5097,7 @@ msgstr ""
 "de navegació de dates i la llista de tasques en la visualització mensual, en "
 "píxels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5010,7 +5105,7 @@ msgstr ""
 "Posició de la subfinestra vertical, entre les llistes de calendaris i el "
 "calendari de navegació de les dates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5018,7 +5113,7 @@ msgstr ""
 "Posició de la subfinestra vertical, entre la llista de tasques i la "
 "subfinestra de previsualització de tasques, en píxels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5027,7 +5122,7 @@ msgstr ""
 "navegació de dates i la llista de tasques en la visualització mensual, en "
 "píxels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5036,74 +5131,84 @@ msgstr ""
 "i la llista de tasques quan no s'estigui a la visualització mensual, en "
 "píxels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programes que les alarmes poden executar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Directori on desar sons per a les alarmes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostra el camp de RSVP en l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostra el camp de rol en l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostra les hores de finalització de les cites en les visualitzacions "
 "setmanals i mensuals"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Mostra el camp de categories a l'editor d'esdeveniments/tasques/reunions"
 
 # FIXME: [l10n-bug] (dpm)
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Mostra les alarmes per a visualitzar a l'àrea de notificació"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostra el camp d'estat a l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra la subfinestra «Previsualització»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra la subfinestra «Previsualització»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Mostra el camp de fus horari en l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Mostra el camp de tipus en l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Mostra el número de setmana en el navegador de dates"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Color de les tasques que vencen avui"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Posició de la subfinestra vertical de tasques"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5113,7 +5218,7 @@ msgstr ""
 "ocupat, %u es reemplaça amb la part d'usuari de l'adreça de correu i %d es "
 "reemplaça amb el domini."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5122,20 +5227,32 @@ msgstr ""
 "ubicació de base de dades de fus horari no traduït d'Olsen, com en «Europe/"
 "Andorra»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Això pot tenir tres valors possibles: «0» per als errors, «1» per als avisos, "
+"i «2» per als missatges de depuració."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Divisions de temps"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "L'última vegada que es va executar l'alarma, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Fus horari"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5143,44 +5260,44 @@ msgstr ""
 "Transparència dels esdeveniments en les visualitzacions de calendari, un "
 "valor entre 0 (transparent) i 1 (opac)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "Format horari de 24 hores"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Unitats per al recordatori predeterminat, «minuts», «hores» o «dies»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unitats per a determinar quan s'han d'amagar les tasques, «minuts», «hores» o "
 "«dies»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Inici de setmana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dia en què comença la setmana, de diumenge (0) a dissabte (6)."
 
 # FIXME: [l10n-bug] (dpm)
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Si s'ha de fer servir l'àrea de notificació per a visualitzar les alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Si s'ha de sol·licitar confirmació en suprimir una cita o tasca."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Si s'ha de sol·licitar confirmació en buidar les cites i tasques."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5188,161 +5305,156 @@ msgstr ""
 "Si s'han de comprimir els caps de setmana en la visualització mensual, cosa "
 "que posarà els dissabtes i diumenges en un únic espai."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Si s'ha de mostrar l'hora de finalització dels esdeveniments en les "
 "visualitzacions setmanals i mensuals."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Si s'ha de dibuixar la línia de Marcus Bains (línia en el moment actual) al "
 "calendari."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Si s'han d'amagar les tasques completades a la visualització de tasques."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr "Si s'ha d'establir un recordatori predeterminat per a les cites."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp RSVP a l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp de categories a l'editor d'esdeveniments/tasques/"
 "reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp de rol a l'editor d'esdeveniments/tasques/reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp d'estat a l'editor d'esdeveniments/tasques/"
 "reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Si s'ha de mostrar l'hora en el format de 24 hores en comptes d'utilitzar am/"
 "pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp de fus horari en l'editor d'esdeveniments/tasques/"
 "reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Si s'ha de mostrar el camp de tipus a l'editor d'esdeveniments/tasques/"
 "reunions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Si s'ha de mostrar el número de setmana al navegador de dates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Si s'utilitzarà l'horari d'estiu quan es mostrin els esdeveniments."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Dies feiners"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Hora de finalització de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Minut de finalització de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Hora d'inici de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Minut d'inici de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "horari d'estiu"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "El resum conté"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "La descripció conté"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "La categoria és"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "El comentari conté"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "La ubicació conté"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr "Sense coincidència"
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Tasques dels propers 7 dies"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Tasques actives"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Tasques vençudes"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Tasques completades"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Tasques amb fitxers adjunts"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Cites actives"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Cites dels propers 7 dies"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimeix"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5351,16 +5463,17 @@ msgstr ""
 "Aquesta operació suprimirà tots els esdeveniments anteriors a l'interval de "
 "temps seleccionat; si continueu no podreu recuperar-los."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Buida els esdeveniments anteriors a"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dies"
@@ -5369,80 +5482,110 @@ msgstr "dies"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
 #: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "A Internet"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversaris i commemoracions"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Temps"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "Calendari no_u"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+msgid "_Make available for offline use"
+msgstr "_Fes-lo disponible fora de línia"
+
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+msgid "_Do not make available for offline use"
+msgstr "No el facis _disponible fora de línia"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "No s'han pogut actualitzar els calendaris."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "No s'ha pogut obrir el calendari «%s» per a crear-hi esdeveniments i reunions"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hi ha cap calendari disponible per a crear esdeveniment i reunions"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "Selector de la font del calendari"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1522
+msgctxt "New"
+msgid "_Appointment"
+msgstr "Cit_a"
+
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "Crea una cita nova"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "Reunió nova"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1530
+msgctxt "New"
+msgid "M_eeting"
+msgstr "R_eunió"
+
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "Crea una sol·licitud de reunió nova"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "Cita de tot el dia nova"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1538
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Cita de tot el _dia"
+
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita de tot el dia nova"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "Calendari nou"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1546
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndari"
+
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "Crea un calendari nou"
 
@@ -5462,233 +5605,130 @@ msgstr "Visualització setmanal"
 msgid "Month View"
 msgstr "Visualització mensual"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Qualsevol camp"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Fitxers adjunts"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Assistents"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Negocis"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Categoria"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Classificació"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Competició"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Descripció"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "La descripció conté"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "No existeix"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Existeix"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Preferits"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Regals"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Fites/Objectius"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Vacances"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Postals"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Contactes importants"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Idees"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Internacional"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Client important"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Miscel·lània"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Els propers 7 dies"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organitzador"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Trucades"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
 #: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Públic"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Periodicitat"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Estat"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Estratègies"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Resum"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "El resum conté"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Proveïdors"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Temps i despeses"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "Personalitat"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "En espera"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "conté"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "no conté"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "és"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "no és"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "S'ha produït un error en obrir el calendari"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "S'ha trobat un mètode no compatible en obrir el calendari"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "No teniu permís per a obrir el calendari"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -5725,17 +5765,17 @@ msgid "Mes_sage:"
 msgstr "Mi_ssatge:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Mostra una alerta emergent"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executa un programa"
 
@@ -5748,7 +5788,7 @@ msgid "Send To:"
 msgstr "Envia a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Envia un correu electrònic"
 
@@ -5812,25 +5852,53 @@ msgid "A_dd"
 msgstr "A_fegeix"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggereix visualitzar l'adjunció automàticament"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Adjunta fitxers"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Cap"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccioneu els calendaris per a les alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Mostra el _camp en la visualització"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5844,7 +5912,7 @@ msgstr ""
 "10 minuts\n"
 "05 minuts"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
@@ -5852,54 +5920,54 @@ msgstr ""
 "<i>%u i %d es reemplaçaran amb l'usuari i el domini de l'adreça de correu "
 "electrònic.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertes</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Servidor lliure/ocupat predeterminat</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Llista de tasques</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Hores</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Setmana laboral</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Ajusta per a l'_horari d'estiu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "_El dia s'acaba a les:"
 
 # És un nom de pestanya, i per tant ha de ser un substantiu (dpm)
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Visualització"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "divendres"
 
 # Apareix al mig d'una frase, per això ha d'anar en minúscula (dpm)
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5910,14 +5978,14 @@ msgstr ""
 "dies"
 
 # Apareix al mig d'una frase, per això ha d'anar en minúscula (dpm)
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "dilluns"
 
 # Apareix al mig d'una frase, per això ha d'anar en minúscula (dpm)
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5935,250 +6003,255 @@ msgstr ""
 "dissabte\n"
 "diumenge"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Seleccioneu un color"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "d_g"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Envia a:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccioneu els calendaris per a les notificacions d'alarma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "M_ostra un recordatori"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra el _número de setmana en el navegador de dates"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr "T_asques que vencen avui:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "d_j"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Dijous"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Fu_s horari:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Dimecres"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "La s_etmana comença el:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "Dies laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hores (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "_24 hores"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "Sol·licit_a la confirmació en suprimir elements"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr "_Comprimeix els caps de setmana en la visualització mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "El _dia comença a les:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "d_v"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "Amaga les tasqu_es completades després de"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "d_l"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr "Tasq_ues endarrerides:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "d_s"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "Mo_stra les hores de finalització de les cites en visualitzacions setmanals "
 "i mensuals"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "Divisions de _temps:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "d_m"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "d_c"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Copi_a el contingut dels calendaris localment per a treballar fora de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista de tasques per a treballar fora "
 "de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista d'anotacions per a treballar fora "
 "de línia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Propietats del calendari"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Calendari nou"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Propietats de la llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Llista de tasques nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Propietats de la llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Llista d'anotacions nova"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "S'ha suprimit l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "S'ha suprimit la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "S'ha suprimit l'anotació."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "S'ha modificat l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "S'ha modificat la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "S'ha modificat l'anotació."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu actualitzar l'editor?"
@@ -6188,363 +6261,368 @@ msgstr "%s  No heu realitzat cap canvi, voleu actualitzar l'editor?"
 msgid "Validation error: %s"
 msgstr "S'ha produït un error de validació: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
 msgid " (Completed "
 msgstr " (Completada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
 msgid "Completed "
 msgstr "Completada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
 msgid " (Due "
 msgstr " (Venciment "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
 msgid "Due "
 msgstr "Venciment "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Missatge adjunt - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Missatge adjunt"
 msgstr[1] "%d missatges adjunts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Mou"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Cance_l·la l'arrossegament"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "adjunció"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "No s'ha pogut actualitzar l'objecte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:937
 msgid "Edit Appointment"
 msgstr "Edita la cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunió - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasca assignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:954
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Memo - %s"
 msgstr "Anotació - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "No Summary"
 msgstr "Sense resum"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1116
+msgid "Keep original item?"
+msgstr "Voleu mantenir l'element original?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to close the current window"
 msgstr "Feu clic per a tancar la finestra actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el text seleccionat al porta-retalls"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Cut selected text to the clipboard"
 msgstr "Retalla el text seleccionat al porta-retalls"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1332
 msgid "Click here to view help available"
 msgstr "Feu clic per a veure l'ajuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "Paste text from the clipboard"
 msgstr "Enganxa el text del porta-retalls"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "Click here to save the current window"
 msgstr "Feu clic per a desar la finestra actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1367
 msgid "Select all text"
 msgstr "Selecciona tot el text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1374
 msgid "_Classification"
 msgstr "_Classificació"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1388
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Options"
 msgstr "_Opcions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1416 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "Fitxer _adjunt..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "Click here to attach a file"
 msgstr "Feu clic per a adjuntar un fitxer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether to display categories"
 msgstr "Commuta la visualització de categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Time _Zone"
 msgstr "Fus h_orari"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the time zone is displayed"
 msgstr "Commuta la visualització del fus horari"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "Pu_blic"
 msgstr "Pú_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Classify as public"
 msgstr "Classifica com a públic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1462
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1464
 msgid "Classify as private"
 msgstr "Classifica com a privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "Classify as confidential"
 msgstr "Classifica com a confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1479
 msgid "R_ole Field"
 msgstr "Camp del r_ol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1481
 msgid "Toggles whether the Role field is displayed"
 msgstr "Commuta la visualització del camp del rol"
 
 # Prové de «Répondez s'il-vous-plaît» (dpm)
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1487
 msgid "_RSVP"
 msgstr "Esperem la vostra _resposta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1489
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Commuta si s'ha de mostrar el camp RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1495
 msgid "_Status Field"
 msgstr "Camp d'e_stat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1497
 msgid "Toggles whether the Status field is displayed"
 msgstr "Commuta la visualització del camp d'estat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1503
 msgid "_Type Field"
 msgstr "Camp de _tipus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1505
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Commuta la visualització del camp del tipus d'assistent"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Documents _recents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Adjunta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1933
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fitxer adjunt"
 msgstr[1] "<b>%d</b> fitxers adjunts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1965
 msgid "Hide Attachment _Bar"
 msgstr "Amaga la _barra d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1968
+#: ../calendar/gui/dialogs/comp-editor.c:2271
 msgid "Show Attachment _Bar"
 msgstr "Mostra la barra _d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Afegeix una adjunció..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Mostra les adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 msgid "Press space key to toggle attachment bar"
 msgstr "Premeu la barra d'espai per a commutar la barra d'adjuncions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2439
+#: ../calendar/gui/dialogs/comp-editor.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:3333
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Els canvis realitzats en aquest element es descartaran en produir-se una "
 "actualització"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3362
 msgid "Unable to use current version!"
 msgstr "No s'ha pogut utilitzar la versió actual"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "No s'ha pogut obrir la font"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "No s'ha pogut obrir la destinació"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "La destinació és de només lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Voleu suprimir aquest element _de totes les bústies dels altres destinataris?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'anotació perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'element perquè s'ha produït un error del CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir la tasca perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'anotació perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'element perquè no en teniu permís"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'anotació perquè s'ha produït un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'element perquè s'ha produït un error"
 
@@ -6561,69 +6639,70 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Introduïu el delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Feu clic aquí per a seleccionar o desfer la selecció d'alarmes per a "
 "l'esdeveniment"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "_Periodicitat"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Fes-lo un esdeveniment periòdic"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opcions d'enviament"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Insereix opcions avançades d'enviament"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Esdeveniment de tot el _dia"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Commuta per tenir l'esdeveniment tot el dia"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Mostra el temps com a _ocupat"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Commuta la visualització del temps com a ocupat"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "_Lliure/ocupat:"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Sol·licita la informació de lliure/ocupat dels assistents"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Ci_ta"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "Aquest esdeveniment té alarmes"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6631,117 +6710,99 @@ msgid "Or_ganizer:"
 msgstr "Or_ganitzador:"
 
 # FIXME: [l10n-bug] (dpm)
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "De_legats"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "Assist_ents"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "L'esdeveniment no té data d'inici"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "L'esdeveniment no té data de finalització"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "La data d'inici és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "La data de finalització és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "L'hora d'inici és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "L'hora de finalització és errònia"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "L'organitzador seleccionat ja no té cap compte."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Cal un organitzador."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Cal un assistent com a mínim."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Afegeix "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No s'ha pogut obrir el calendari «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Esteu actuant en representació de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia abans de la cita"
 msgstr[1] "%d dies abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora abans de la cita"
 msgstr[1] "%d hores abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut abans de la cita"
 msgstr[1] "%d minuts abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "Personalitza"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Cap"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 dia abans de la cita"
@@ -6817,19 +6878,19 @@ msgstr "Co_ntactes..."
 msgid "Organizer:"
 msgstr "Organitzador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
 msgid "Memo"
 msgstr "Anotació"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No s'han pogut obrir les anotacions a «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Per a"
 
@@ -6843,58 +6904,62 @@ msgid "T_o:"
 msgstr "_A:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Esteu modificant un esdeveniment periòdic. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Esteu delegant un esdeveniment periòdic. Què voleu delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Esteu modificant una tasca periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Esteu modificant una anotació periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Només aquest cas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Aquests casos i els anteriors"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Aquests casos i els futurs"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Tots els casos"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Aquesta cita conté periodicitats que l'Evolution no pot editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "La data de periodicitat no és vàlida"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "el"
 
@@ -6902,7 +6967,7 @@ msgstr "el"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "primer"
 
@@ -6911,7 +6976,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "segon"
 
@@ -6919,7 +6984,7 @@ msgstr "segon"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "tercer"
 
@@ -6927,7 +6992,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "quart"
 
@@ -6935,13 +7000,13 @@ msgstr "quart"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "últim"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Un altra data"
 
@@ -6949,7 +7014,7 @@ msgstr "Un altra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "de l'1 al 10"
 
@@ -6957,7 +7022,7 @@ msgstr "de l'1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "de l'11 al 20"
 
@@ -6965,45 +7030,45 @@ msgstr "de l'11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "dia"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "al"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "aparicions"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Afegeix una excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "No s'ha pogut obtenir una selecció per a modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Modifica l'excepció"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "No s'ha pogut obtenir una selecció per a suprimir."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Data/hora"
 
@@ -7074,55 +7139,55 @@ msgstr "<span weight=\"bold\">Estat</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Completada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
 msgid "In Progress"
 msgstr "En procés"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "No s'ha iniciat"
 
@@ -7135,7 +7200,7 @@ msgid "Stat_us:"
 msgstr "_Estat:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "No s'ha definit"
 
@@ -7162,28 +7227,28 @@ msgstr ""
 "Feu clic per a canviar o visualitzar els detalls de l'estat de la tasca"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "_Opcions d'enviament"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalls de la tasca"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organit_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "La data de venciment és errònia"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No s'han pogut obrir les tasques a «%s»."
@@ -7205,7 +7270,7 @@ msgid "Time zone:"
 msgstr "Fus horari:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7213,123 +7278,123 @@ msgstr[0] "%d dia"
 msgstr[1] "%d dies"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d setmana"
 msgstr[1] "%d setmanes"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Es desconeix l'acció a realitzar"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s abans de començar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s després de començar la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s en començar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s abans de finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s després de la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s en finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s per a un tipus d'activador desconegut"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Feu clic per a obrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Data d'inici:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Pàgina web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Data de venciment:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Prioritat:"
 
@@ -7343,17 +7408,17 @@ msgid "Start Date"
 msgstr "Data d'inici"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Lliure"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7363,32 +7428,32 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2138
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7403,185 +7468,185 @@ msgstr "Periòdic"
 msgid "Assigned"
 msgstr "Assignat"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccioneu la carpeta on desar les adjuncions..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1774 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "De_fineix-la com a fons"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "D_esa els seleccionats"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Sense resum *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2395
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organitzador: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organitzador: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Inici: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Venciment: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New _Task"
 msgstr "_Tasca nova"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1759 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Im_primeix..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1779 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Re_talla"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Engan_xa"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "_Marca com a incomplet"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marca les tasques seleccionades com a incompletes"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix les tasques selecciona_des"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Feu clic per a afegir una tasca"
@@ -7604,8 +7669,8 @@ msgid "Due date"
 msgstr "Data de venciment"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -7613,108 +7678,153 @@ msgstr "Prioritat"
 msgid "Start date"
 msgstr "Data d'inici"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estat"
+
+#: ../calendar/gui/e-calendar-view.c:1442
 msgid "Moving items"
 msgstr "Desplaçament d'elements"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Copying items"
 msgstr "Còpia d'elements"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1753
 msgid "New _Appointment..."
 msgstr "Cit_a nova..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1754
 msgid "New All Day _Event"
 msgstr "_Esdeveniment de tot el dia nou"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Meeting"
 msgstr "Re_unió nova"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1766
 msgid "_Current View"
 msgstr "Visualització a_ctual"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "Select T_oday"
 msgstr "Selecciona av_ui"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1769
 msgid "_Select Date..."
 msgstr "_Seleccioneu una data..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1775
 msgid "Pri_nt..."
 msgstr "Im_primeix..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "_Delegate Meeting..."
 msgstr "_Delega una reunió..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "_Schedule Meeting..."
 msgstr "Planifica una _reunió..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Reply"
 msgstr "_Respon"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1791 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1796
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquesta aparició"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1797 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
+#: ../calendar/gui/e-calendar-view.c:2250
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2126
+msgid "Accepted"
+msgstr "Acceptat"
+
+#: ../calendar/gui/e-calendar-view.c:2251
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2132
+msgid "Declined"
+msgstr "Declinat"
+
+#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "Provisionalment"
+
+#: ../calendar/gui/e-calendar-view.c:2253
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2135
+msgid "Delegated"
+msgstr "Delegat"
+
+#: ../calendar/gui/e-calendar-view.c:2254
+msgid "Needs action"
+msgstr "Precisa una acció"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2415 ../calendar/gui/print.c:2507
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicació: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2449
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7728,53 +7838,58 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Mostra la subfinestra «Previsualització»"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1566
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1567
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (periodicitat complexa)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada dia"
 msgstr[1] "Cada %d dies"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada setmana"
 msgstr[1] "Cada %d setmanes"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7782,72 +7897,72 @@ msgstr[0] "Cada setmana el "
 msgstr[1] "Cada %d setmanes el "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " i "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "El %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d mesos"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada any"
 msgstr[1] "Cada %d anys"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
-msgstr[0] " una vegada"
-msgstr[1] " un total de %d vegades"
+msgid_plural "a total of %d times"
+msgstr[0] "un total d'%d vegada"
+msgstr[1] "un total de %d vegades"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", finalitza el "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Comença"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Acaba"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Venciment"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "Informació de l'iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "Error de l'iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/itip-formatter/itip-view.c:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7858,302 +7973,293 @@ msgid "An unknown person"
 msgstr "Una persona desconeguda"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br>Reviseu la informació següent i seleccioneu una acció del menú de sota."
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "Acceptat"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2129
 msgid "Tentatively Accepted"
 msgstr "Acceptat provisionalment"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "Declinat"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "S'ha cancel·lat la reunió, tot i que no s'ha trobat als vostres calendaris"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "S'ha cancel·lat la tasca, tot i que no s'ha trobat a la vostra llista de "
 "tasques"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Informació de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la presència de %s a la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la vostra presència a una reunió."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Proposició de reunió"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Actualització de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Sol·licitud d'actualització de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud d'una reunió."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Resposta de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "En/na <b>%s</b> ha cancel·lat la reunió."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Cancel·lació de la reunió"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "En/na <b>%s</b> ha enviat un missatge inintel·ligible."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Missatge de reunió erroni"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Informació de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "En/na <b>%s</b> sol·licita que en/na %s realitzi una tasca."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "En/na <b>%s</b> us sol·licita que realitzeu una tasca."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Proposició d'una tasca"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Actualització de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Sol·licitud d'actualització de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "En/na <b>%s</b> ha contestat a l'assignació d'una tasca."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Resposta de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "En/na <b>%s</b> ha cancel·lat la tasca."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Cancel·lació de la tasca"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Missatge de tasca erroni"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "En/na <b>%s</b> ha publicat la informació de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Informació de lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "En/na <b>%s</b> us sol·licita la informació de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Sol·licitud de lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud de lliure/ocupat."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Resposta de lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Missatge de lliure/ocupat erroni"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "El missatge no està ben format"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "El missatge només conté sol·licituds no compatibles."
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "L'adjunció no conté cap missatge de calendari vàlid"
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "El fitxer adjunt no té cap element de calendari visualitzable"
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "S'ha completat l'actualització\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objecte no és vàlid i no es pot actualitzar\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-lo "
 "com a assistent?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "No s'ha pogut actualitzar l'estat de l'assistent perquè l'estat és no vàlid\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "S'ha actualitzat l'estat de l'assistent\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "No es pot actualitzar l'estat de l'assistent perquè l'element ja no existeix"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "S'ha enviat l'element.\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "No s'ha pogut enviar l'element.\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Escolliu una acció:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+# Prové de «Répondez s'il-vous-plaît» (dpm)
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Esperem la vostra resposta"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Accepta"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Accepta provisionalment"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Declina"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Envia la informació lliure/ocupat"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Actualitza l'estat de la resposta"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -8181,113 +8287,93 @@ msgstr "S'està carregant el calendari..."
 msgid "Server Message:"
 msgstr "Missatge del servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Presidents"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Participants obligatoris"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Participants opcionals"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Assistents"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grup"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Recurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Habitació"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "President"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Participant obligatori"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Participant opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "No hi participa"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Precisa una acció"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
-msgid "Tentative"
-msgstr "Provisionalment"
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr "Delegat"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Assistent"
 
-# Prové de «Répondez s'il-vous-plaît» (dpm)
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "Esperem la vostra resposta"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "En progrés"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2120
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -8296,7 +8382,7 @@ msgstr "%A, %d de %B de %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2151
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8306,67 +8392,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Cap informació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "O_pcions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -8394,16 +8480,15 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membre"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "Suprimeix les anotacions selecciona_des"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Feu clic per a afegir una anotació"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8412,16 +8497,16 @@ msgstr ""
 "S'ha produït un error en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "S'estan carregant les anotacions"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "S'estan obrint les anotacions a %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "S'estan suprimint els objectes seleccionats..."
 
@@ -8429,63 +8514,63 @@ msgstr "S'estan suprimint els objectes seleccionats..."
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "S'estan acabant les tasques..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "S'està buidant"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Seleccioneu un fus horari"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2621
 msgid "_Custom View"
 msgstr "_Visualització personalitzada"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2622
 msgid "_Save Custom View"
 msgstr "De_sa la visualització personalitzada"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2627
 msgid "_Define Views..."
 msgstr "_Defineix les visualitzacions..."
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "S'estan carregant les cites a %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2879
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques a %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2888
 #, c-format
 msgid "Loading memos at %s"
 msgstr "S'estan carregant les anotacions a %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3000
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3968
 msgid "Purging"
 msgstr "S'està buidant"
 
@@ -8554,19 +8639,19 @@ msgstr "S'ha d'especificar un organitzador."
 msgid "At least one attendee is necessary"
 msgstr "Cal un assistent com a mínim"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Informació de l'esdeveniment"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "Informació de la tasca"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "Informació de l'anotació"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "Informació lliure/ocupat"
 
@@ -8574,100 +8659,170 @@ msgstr "Informació lliure/ocupat"
 msgid "Calendar information"
 msgstr "Informació del calendari"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Acceptada"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Acceptada provisionalment"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Declinada"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Delegada"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+msgctxt "Meeting"
 msgid "Updated"
-msgstr "Actualitzat"
+msgstr "Actualitzada"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Cancel·lada"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+msgctxt "Meeting"
 msgid "Refresh"
-msgstr "Refresca"
+msgstr "Actualitzada"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informació lliure/ocupat (%s a %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "Informació de l'iCalendar"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "Heu de ser un assistent de l'esdeveniment."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "Llista d'anotacions _nova"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d anotació"
 msgstr[1] "%d anotacions"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d seleccionada"
 msgstr[1] "%d seleccionades"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "No s'han pogut actualitzar les anotacions."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "No es pot obrir la llista d'anotacions «%s» per a crear esdeveniments i "
 "reunions"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "No hi ha cap calendari disponible per a crear anotacions"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "Selector de font d'anotacions"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "Anotació nova"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1176
+msgctxt "New"
+msgid "Mem_o"
+msgstr "An_otació"
+
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "Crea una anotació nova"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "Anotació compartida nova"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1184
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "Anotació _compartida"
+
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "Crea una anotació compartida nova"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "Llista d'anotacions nova"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1192
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "Ll_ista d'anotacions"
+
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "Crea una llista d'anotacions nova"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Imprimeix anotacions"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Els propers 7 dies"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8719,258 +8874,273 @@ msgstr "No s'han pogut actualitzar les tasques «%s»"
 msgid "Notes"
 msgstr "Notes"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "dg"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "dl"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "dm"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "dc"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "dj"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "dv"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "ds"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2471
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2473
 msgid "Task"
 msgstr "Tasca"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2498
 #, c-format
 msgid "Summary: %s"
 msgstr "Resum: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2521
 msgid "Attendees: "
 msgstr "Assistents: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2561
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritat: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2590
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentatge completat: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2602
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2626
 msgid "Contacts: "
 msgstr "Contactes:"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "Llista de tasques _nova"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tasca"
 msgstr[1] "%d tasques"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "No s'han pogut actualitzar les tasques."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "No es pot obrir la llista «%s» per a crear esdeveniments i reunions"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "No hi ha cap calendari disponible per a crear tasques"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "Selector de font de la tasca"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "Tasca nova"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1240
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tasca"
+
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "Crea una tasca nova"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "Tasca assignada nova"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1248
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tasca assigna_da"
+
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "Crea una tasca assignada nova"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "Llista de tasques nova"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1256
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "Llista de tas_ques"
+
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "Crea una llista de tasques nova"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8982,11 +9152,11 @@ msgstr ""
 "\n"
 "Segur que voleu suprimir aquestes tasques?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "No m'ho tornis a demanar."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Imprimeix les tasques"
 
@@ -8995,57 +9165,57 @@ msgstr "Imprimeix les tasques"
 msgid "% Completed"
 msgstr "% acabat"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "En procés"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "és més gran que"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "és més petita que"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Cites i reunions"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 msgid "Opening calendar"
 msgstr "Calendari d'apertura"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "Fitxers de l'iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Importador de l'iCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Recordatori"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "Fitxers del vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Importador del vCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Esdeveniments del calendari"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intel·ligent del calendari de l'Evolution"
 
@@ -10598,213 +10768,217 @@ msgstr "Pacífic/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífic/Yap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "No es pot obrir el fitxer de desament automàtic"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge de l'editor"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Insereix un fitxer adjunt"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "Adjun_ta"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Missatges sense títol"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Tan_ca"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "Im_primeix..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualització d'impressió"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "_Anomena i desa..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Desa el fitxer actual amb un nom diferent"
 
-#: ../composer/e-composer-actions.c:513
-msgid "Save _Draft"
-msgstr "_Desa com a esborrany"
+#: ../composer/e-composer-actions.c:511
+msgid "Save as _Draft"
+msgstr "Desa com a _esborrany"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Desa com a esborrany"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "E_nvia"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Envia aquest missatge"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Insereix opcions d'enviament"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "_Missatge nou"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Obre una finestra de missatge nou"
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "_Codificació dels caràcters"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Seguretat"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "_Xifra amb PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Xifra aquest missatge amb el PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "_Signa amb PGP"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Signa aquest missatge amb la vostra clau PGP"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Prioritza el missatge"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Estableix el missatge a prioritat alta"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "Sol·licita la confirmació de l_ectura"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Obteniu una notificació d'entrega quan es llegeixi el missatge"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "Xi_fra amb S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Xifra aquest missatge amb el vostre certificat de xifratge S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "Si_gna amb S/MIME"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signa aquest missatge amb el vostre certificat de signatures S/MIME"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "Camp _CCO"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualització del camp «CCO»"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "Camp _CC"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualització del camp «CC»"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "Camp _De"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commuta la visualització del camp «De»"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "Cam_p Envia-a"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Commuta la visualització del camp «Envia-a»"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Camp _Respon-a"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Commuta la visualització del camp «Respon-a»"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "Camp de l'_Assumpte"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Commuta la visualització del camp de l'Assumpte"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "Camp _Per a"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Commuta la visualització del camp «Per a»"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Desa com a esborrany"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Introduïu els destinataris del missatge"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduïu les adreces que rebran una còpia del missatge"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10812,35 +10986,35 @@ msgstr ""
 "Introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
 "llista de destinataris del missatge"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "D_e:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Respon a:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Per a:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Envia a:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Si_gnatura:"
 
@@ -10860,18 +11034,18 @@ msgstr "Escolliu a quines carpetes s'enviarà el missatge."
 msgid "Click here to select folders to post to"
 msgstr "Feu clic per a seleccionar les carpetes on enviar"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Mostra la barra _de fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No s'ha pogut signar el missatge de sortida: no s'ha definit cap certificat "
 "de signatura per a aquest compte"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10879,23 +11053,23 @@ msgstr ""
 "No s'ha pogut xifrar el missatge de sortida: no s'ha definit cap certificat "
 "de xifratge per a aquest compte"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Fitxer adjunt"
 msgstr[1] "Fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Amaga la _barra de fitxers adjunts"
 
-#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10987,10 +11161,10 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
-"Les opcions d'enviament només estan disponibles per als comptes de Groupwise "
+"Les opcions d'enviament només estan disponibles per als comptes de GroupWise "
 "de Novell i de l'Exchange de Microsoft."
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -11078,40 +11252,97 @@ msgstr "targeta d'adreça"
 msgid "calendar information"
 msgstr "informació del calendari"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Error de l'Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Avís de l'Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Informació de l'Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Consulta de l'Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error intern, s'ha sol·licitat l'error desconegut «%s»"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Component"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Nom del component que s'està enregistrant"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Registres de depuració"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Mostra els e_rrors a la barra d'estat per a"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "segons."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Missatges de registre:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Nivell de registre"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Hora"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Missatges"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Tanca aquesta finestra"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Error"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Errors"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Avisos i errors"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Depuració"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Errors, avisos i missatges de depuració"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Habilitat"
 
@@ -11161,51 +11392,55 @@ msgstr "Voleu sobreescriure el fitxer?"
 msgid "_Overwrite"
 msgstr "S_obreescriu"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "No s'ha pogut obrir l'enllaç."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "No s'ha pogut mostrar l'ajuda de l'Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "Imp_ortant"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "F_eina"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "P_ersonal"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "P_er fer"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "D_esprés"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_Nom de l'etiqueta:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Edita l'etiqueta"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Afegeix una etiqueta"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "En nom de l'etiqueta no pot ser buit."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11213,128 +11448,128 @@ msgstr ""
 "Ja existeix una etiqueta amb el mateix nom al servidor. Hauríeu de canviar-"
 "li el nom."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "S'ha produït un error del GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "La resta d'errors es mostraran només al terminal."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "fa 1 segon"
 msgstr[1] "fa %d segons"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "d'aquí a 1 segon"
 msgstr[1] "d'aquí a %d segons"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa 1 minut"
 msgstr[1] "fa %d minuts"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "d'aquí a 1 minut"
 msgstr[1] "d'aquí a %d minut"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa 1 hora"
 msgstr[1] "fa %d hores"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "d'aquí a 1 hora"
 msgstr[1] "d'aquí a %d hores"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa 1 dia"
 msgstr[1] "fa %d dies"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "D'aquí a 1 dia"
 msgstr[1] "D'aquí a %d dies"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "fa 1 setmana"
 msgstr[1] "fa %d setmanes"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "D'aquí a 1 setmana"
 msgstr[1] "D'aquí a %d setmanes"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa 1 mes"
 msgstr[1] "fa %d mesos"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "D'aquí a 1 mes"
 msgstr[1] "D'aquí a %d mesos"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fa 1 any"
 msgstr[1] "fa %d anys"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "D'aquí a 1 any"
 msgstr[1] "D'aquí a %d anys"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<feu clic per a seleccionar una data>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "ara"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d/%b/%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compararà"
 
@@ -11347,56 +11582,56 @@ msgstr "Escolliu un fitxer"
 msgid "Test"
 msgstr "Prova"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Nom de la _regla:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
-msgstr "Troba els elements que compleixen els criteris següents"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
+msgstr "Troba els elements que compleixen les condicions següents"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "A_fegeix un criteri de filtre"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "Afegeix una _condició"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
-msgstr "Si es compleixen tots els criteris"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
+msgstr "Si es compleixen totes les condicions"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
-msgstr "Si es compleix qualsevol criteri"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
+msgstr "Si es compleix qualsevol condició"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Cerca elements:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Tots els relacionats"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Respostes"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Respostes i pares"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Sense resposta o pare"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "I_nclou els fils"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Entrada"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Sortida"
 
@@ -11498,7 +11733,7 @@ msgstr "en el futur"
 msgid "months"
 msgstr "mesos"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "segons"
 
@@ -11510,10 +11745,11 @@ msgstr "l'hora actual"
 msgid "the time you specify"
 msgstr "l'hora que indiqueu"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "setmanes"
 
@@ -11521,15 +11757,15 @@ msgstr "setmanes"
 msgid "years"
 msgstr "anys"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Edita la regla"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Nom de la regla"
 
@@ -11586,10 +11822,10 @@ msgstr "Control de preferències de correu de l'Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Control de configuració de la xarxa de l'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:763
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correu"
@@ -11600,7 +11836,7 @@ msgid "Mail Accounts"
 msgstr "Comptes de correu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "Preferències del correu"
 
@@ -11612,12 +11848,12 @@ msgstr "Preferències de la xarxa"
 msgid "_Mail"
 msgstr "_Correu"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acord de llicència de %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11630,64 +11866,64 @@ msgstr ""
 "per a %s que es mostra a sota\n"
 "i marqueu la casella de verificació per a acceptar-lo\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Generat automàticament"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Pregunta per cada missatge"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "Identitat"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "Recepció de correu"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Comprova si hi ha correu _nou cada"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_ts"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "Enviament de correu"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Opcions predeterminades"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Seguretat"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Opcions de recepció"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Comprovació de correu nou"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de comptes"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "Auxiliar per als comptes de l'Evolution"
 
@@ -11705,19 +11941,19 @@ msgid "Protocol"
 msgstr "Protocol"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sense nom"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "Idiomes"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "Afegeix un script de signatura"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "Signatures"
 
@@ -11790,7 +12026,7 @@ msgid "Date sent"
 msgstr "Data d'enviament"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11869,7 +12105,7 @@ msgstr "no està definit"
 msgid "is set"
 msgstr "està definit"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Correu brossa"
@@ -11878,7 +12114,7 @@ msgstr "Correu brossa"
 msgid "Junk Test"
 msgstr "Prova de correu brossa"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11918,48 +12154,51 @@ msgstr "Envia la sortida al programa"
 msgid "Play Sound"
 msgstr "Reprodueix un so"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Llegit"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Expressió regular"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Respost a"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "retorna més gran que"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "retorna més petit que"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Executa el programa"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Puntuació"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remitent"
 
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Remitent o destinataris"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Defineix l'etiqueta"
@@ -11994,9 +12233,9 @@ msgstr "Atura el processament"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Assumpte"
 
@@ -12015,51 +12254,51 @@ msgstr "Llavors"
 msgid "Add Ac_tion"
 msgstr "Afegeix una a_cció"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rea una carpeta de cerca a partir de la cerca..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Tots els missatges"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Missatges sense llegir"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Cap etiqueta"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Missatges llegits"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Missatges recents"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Missatges dels darrers 5 dies"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Missatges amb fitxers adjunts"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Missatges importants"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Missatges que no són brossa"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Cerca al compte"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Cerca a tots els comptes"
 
@@ -12091,15 +12330,15 @@ msgid "Quota usage"
 msgstr "Quota d'utilització d'espai"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:581
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propietats de la carpeta"
@@ -12118,7 +12357,7 @@ msgstr "_Nom de la carpeta:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Carpetes de cerca"
 
@@ -12127,22 +12366,48 @@ msgstr "Carpetes de cerca"
 msgid "UNMATCHED"
 msgstr "Cap concordança"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "Esborranys"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Plantilles"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Enviat"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "S'està carregant..."
 
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:380
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
+
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Arbre de carpetes de correu"
@@ -12157,12 +12422,12 @@ msgstr "S'està movent la carpeta %s"
 msgid "Copying folder %s"
 msgstr "S'està copiant la carpeta %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
@@ -12179,271 +12444,271 @@ msgstr "_Copia a la carpeta"
 msgid "_Move to Folder"
 msgstr "_Mou a la carpeta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan analitzant les carpetes a «%s»"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Obre e_n una finestra nova"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "Carpeta _nova..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "_Mou..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "Can_via el nom..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Re_fresca"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Bui_da la safata de sortida"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Buida la _paperera"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "Marca la carpeta de cerca com a _no llegida"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "S'està copiant «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
 #: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "C_opia"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "S'està creant la carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallat la supressió del correu"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No teniu els permisos suficients per a esborrar aquest correu."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Reenvia"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Marca com a _no llegit"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Marca com a no _important"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Marca per al se_guiment..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Cap"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Sen_yala-ho com a completat"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "N_eteja el senyalador"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla a partir del missatge"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Carpeta de cerca a partir de l'a_ssumpte"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Carpeta de cerca a partir del remite_nt"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Carpeta de cerca a partir dels destinata_ris"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Carpeta de cerca a partir de la _llista de correu"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Filtre a partir de l'a_ssumpte"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Filtre a partir del remi_tent"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Filtre a partir dels _destinataris"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Fil_tre a partir de la llista de correu"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "No s'ha pogut recuperar el missatge"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "S'està recuperant el missatge..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "_Truca..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Crea una carpeta de _cerca"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "D'a_questa adreça"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "Per a aques_ta adreça"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Feu clic per a enviar un correu a en/na %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Feu clic per a trucar en/na %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Feu clic per a mostrar/amagar adreces"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:471
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Concordances: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "Ce_rca:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:639
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Següent"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "Concord_ança de majúscules i minúscules"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12451,11 +12716,11 @@ msgstr ""
 "Aquest missatge no està signat. No hi ha cap garantia que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "La signatura és vàlida"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12463,11 +12728,11 @@ msgstr ""
 "Aquest missatge està signat i és vàlid. És molt probable que el remitent del "
 "missatge sigui l'autèntic."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "La signatura no és vàlida"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12475,11 +12740,11 @@ msgstr ""
 "No es pot verificar la signatura del missatge. Pot ser que s'hagi alterat "
 "durant la transmissió."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12487,11 +12752,11 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no es pot "
 "verificar el remitent del missatge."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La signatura existeix, però es necessita la clau pública"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12499,11 +12764,11 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no se li ha "
 "trobat la clau pública corresponent."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Sense xifrar"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12511,11 +12776,11 @@ msgstr ""
 "Aquest missatge no està xifrat. Es podria visualitzar el seu contingut en el "
 "transport per internet."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Xifrat, feble"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12526,11 +12791,11 @@ msgstr ""
 "visualitzar el contingut d'aquest missatge en una quantitat de temps "
 "raonable."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Xifrat"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12538,11 +12803,11 @@ msgstr ""
 "Aquest missatge està xifrat. Seria molt difícil que una persona desconeguda "
 "visualitzés el contingut d'aquest missatge."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Xifrat, fort"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12552,88 +12817,88 @@ msgstr ""
 "difícil que alguna persona desconeguda pugui visualitzar el contingut "
 "d'aquest missatge en una quantitat de temps raonable."
 
-#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "No es pot visualitzar aquest certificat"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completat el %d de %B del %Y, a les %H:%M"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Vençut:"
 
 # Consulteu man 3 strftime per comprendre aquest format
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pel %d de %B del %Y, a les %H:%M"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Visualitza inserit"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "A_maga"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "A_justa a l'amplada"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Mostra la mida _original"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Anomena i desa el fitxer adjunt"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Seleccioneu la carpeta on desar tots els fitxers adjunts"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Desa els seleccionats..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d fi_txer adjunt"
 msgstr[1] "%d fi_txers adjunts"
 
-#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_Desa"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "De_sa'ls tots"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Cap fitxer adjunt"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Mostra'l sense _format"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Amaga'l _sense format"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "O_bre amb"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12723,14 +12988,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Aquest missatge fou enviat per <b>%s</b> en nom de <b>%s</b>"
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "De"
 
@@ -12740,8 +13005,8 @@ msgid "Reply-To"
 msgstr "Respon"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Data"
 
@@ -12791,11 +13056,11 @@ msgstr "S'ha produït un error en verificar la contrasenya"
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "No s'ha pogut analitzar el missatge PGP"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP: error desconegut"
 
@@ -12920,9 +13185,9 @@ msgstr "No s'han pogut copiar les dades «%s» POP3 keep-on-server: %s"
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "No s'ha pogut crear el magatzem de correu local «%s»: %s"
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
@@ -12932,12 +13197,12 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les vostres carpetes..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "No s'ha pogut crear les carpetes de correu local a «%s»: %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12945,65 +13210,65 @@ msgstr ""
 "No s'ha pogut llegir la configuració de la instal·lació anterior de "
 "l'Evolution. El fitxer «evolution/config.xmldb» no existeix o està malmès."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "_Respon al remitent"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Afegeix a la llibreta d'adreces"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "El magatzem no permet subscripcions, o no estan habilitades."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Subscrit"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Heu de seleccionar un servidor."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "No s'ha seleccionat cap servidor"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "No _tornis a mostrar aquest missatge."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtres de missatge"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "missatge"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Desa el missatge..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Afegeix una adreça"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Missatges de %s"
@@ -13029,17 +13294,13 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Amplada de la finestra «Envia i rep el correu»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Permet que l'Evolution mostri la part de text d'una mida limitada"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Sol·licita sempre una confirmació de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Temps en segons durant el qual es mostrarà l'error a la barra d'estat."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Reconeix automàticament les emoticones"
@@ -13217,10 +13478,10 @@ msgid "Directory for saving mail component files."
 msgstr "Directori on desar fitxers del component de correu."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Habilita o inhabilita l'escurçament amb punts suspensius dels noms de les "
-"carpetes en l'arbre de carpetes"
+"carpetes a la barra lateral"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13294,26 +13555,41 @@ msgstr ""
 msgid "Enable/disable caret mode"
 msgstr "Habilita/inhabilita el mode de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Codifica els noms de fitxer tal com ho fan l'Outlook i el GMail"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+"Codifica els noms de fitxer en les capçaleres de correu de la mateixa manera "
+"que l'Outlook o el GMail, de manera que aquests entenguin els noms de fitxer "
+"localitzats enviats amb l'Evolution. Això cal fer-ho perquè no segueixen "
+"l'RFC 2231, sinó que utilitzen l'estàndard incorrecte RFC 2047."
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "Alçada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "Alçada de la subfinestra de la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la previsualització per a cada carpeta i suprimeix la selecció"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 "Pregunta a l'usuari si de debò vol obrir deu o més missatges a la vegada."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13321,18 +13597,18 @@ msgstr ""
 "Si la subfinestra de «Previsualització» està activada, mostra-la al costat en "
 "comptes de verticalment."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 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 "
-"in GNOME's mime-type database may be used for displaying content."
+"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 "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"Si l'Evolution no té un visualitzador integrat per a un tipus mime en "
-"particular, qualsevol dels tipus mime d'aquesta llista que es corresponguin "
-"amb un visualitzador bonobo-component de la base de dades mime del GNOME "
-"poden ser utilitzats per a visualitzar-ne el contingut."
+"Si l'Evolution no té un visualitzador integrat per a un tipus MIME concret, "
+"qualsevol dels tipus MIME d'aquesta llista que es corresponguin amb un "
+"visualitzador de components Bonobo de la base de dades MIME del GNOME poden "
+"ser utilitzats per a visualitzar-ne el contingut."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13340,7 +13616,7 @@ msgstr ""
 "Alçada inicial de la finestra «Envia i rep el correu». El valor s'actualitza "
 "a mesura que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13354,7 +13630,7 @@ msgstr ""
 "aquesta finestra no es pot maximitzar. Aquesta clau existeix només com a "
 "detall d'implementació."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13362,11 +13638,11 @@ msgstr ""
 "Amplada inicial de la finestra «Envia i rep el correu». El valor s'actualitza "
 "a mesura que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Habilita/inhabilita preguntar en marcar múltiples missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13374,7 +13650,7 @@ msgstr ""
 "Inhabilita la funcionalitat per la qual es demana múltiples vegades a "
 "l'usuari si vol dur a terme la sincronització per a treballar fora de línia."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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 "
@@ -13385,31 +13661,33 @@ msgstr ""
 "permanent, i que no només implica la supressió d'aquests en els resultats de "
 "la cerca."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "La darrera vegada que es va buidar la paperera de correu brossa"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "La darrera vegada que es va buidar la paperera"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Nivell per sobre del qual s'enregistrarà el missatge."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "Llista d'etiquetes i els seus colors associats"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Llista de tipus MIME per als quals es cercaran components de visualització "
+"del Bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "Llista de llicències acceptades"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "Llista de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13418,17 +13696,17 @@ msgstr ""
 "llista conté cadenes referents a subdirectoris relatius a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of custom headers and whether they are enabled."
 msgstr "Llista de capçaleres personalitzades i si estan habilitades."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Llista dels codis de llengua dels diccionaris a utilitzar per a la "
 "verificació ortogràfica."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 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."
@@ -13437,23 +13715,17 @@ msgstr ""
 "llista conté cadenes de tipus nom:color, on color fa servir la codificació "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Llista de tipus MIME per als quals es cercaran components de visualització "
-"del Bonobo"
-
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
 msgstr "Llista de noms de protocol per als quals s'ha acceptat la llicència."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
 msgstr "Carrega les imatges dels missatges HTML a través de l'HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
@@ -13461,110 +13733,110 @@ msgstr ""
 "possibles són: «0» - mai carreguis imatges de la xarxa, «1»- carrega imatges "
 "dels contactes, «2» - carrega sempre les imatges de la xarxa."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Registra les accions del filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Registra les accions al fitxer de registre especificat."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Fitxer on registrar accions de filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Fitxer on enregistrar accions de filtre."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Marca com a vist després del temps d'espera"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Marca com a vist després del temps d'espera."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marca les citacions en la «Previsualització» del missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marca les citacions en la «Previsualització» del missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Alçada predeterminada de la finestra de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Amplada predeterminada de la finestra de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estil de visualització de missatges a normal («normal»), capçaleres senceres "
 "(«full headers»), font («source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Mínim nombre de dies entre buidatges de la paperera de correu brossa en "
 "sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Mínim nombre de dies entre buidatges de la paperera en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Temps mínim entre buidatges de la paperera de correu brossa en sortir, en "
 "dies."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Temps mínim entre buidatges de la paperera en sortir, en dies."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adreces a mostrar a Per a/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Pregunta quan l'assumpte sigui buit"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pregunta l'usuari quan intenti buidar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Pregunta si l'usuari vol treballar fora de línia immediatament"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Pregunta quan se suprimeixin els missatges d'una carpeta de cerca"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Pregunta quan l'usuari buidi"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Pregunta quan l'usuari només entri el camp CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pregunta quan l'usuari intenti obrir deu o més missatges a la vegada"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13572,80 +13844,80 @@ msgstr ""
 "Pregunta quan l'usuari intenti enviar correu HTML a destinataris que no "
 "volen rebre correu HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Pregunta quan l'usuari intenti enviar un missatge sense destinataris a Per a "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pregunta quan l'usuari intenti enviar correu HTML no desitjat"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Pregunta en marcar múltiples missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconeix les emoticones en el text i reemplaça-les per les seves imatges."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Reconeix els enllaços en el text i remplaça'ls."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Executa la prova de brossa per al correu d'entrada."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Directori on desar"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Search for the sender photo in local address books"
 msgstr "Cerca la foto del remitent a les llibretes d'adreces locals"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Envia els missatges en format HTML per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Envia els missatges en format HTML per defecte."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correu del remitent a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Interval de sincronització amb el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Mostra les animacions"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Mostra les imatges animades com a animacions."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
 "sobre)"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra els missatges suprimits a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Mostra la foto del remitent"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13653,63 +13925,63 @@ msgstr ""
 "Mostra el correu del remitent en una columna separada a la llista de "
 "missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostra la foto del remitent a la subfinestra de lectura de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Comprovació ortogràfica mentre s'escriu"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Color de la verificació ortogràfica"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Llengües per a la verificació ortogràfica"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Alçada predeterminada de la finestra de subscripció"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Amplada predeterminada de la finestra de subscripció"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Tipus de lletra de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Límit de la part del missatge de text"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "El connector de correu brossa per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "La darrera vegada que es va buidar la paperera de correu brossa, en dies des "
 "de l'inici de l'època Unix (01.01.1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La darrera vegada que es va buidar la paperera, en dies des de l'inici de "
 "l'època Unix (01.01.1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "El tipus de lletra de terminal per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "El tipus de lletra de mida variable per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13717,15 +13989,15 @@ msgstr ""
 "Això pot tenir tres valors possibles: «0» per als errors, «1» per als avisos, "
 "i «2» per als missatges de depuració."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Això decideix la mida màxima de la part de text que es pot formatar sota "
 "l'Evolution. Per defecte són 4MB (4096 KB), i s'especifica en KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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 "
@@ -13735,7 +14007,7 @@ msgstr ""
 "connectors habilitats. Si s'inhabilita aquest connector per defecte, "
 "l'Evolution tampoc recorrerà als altres connectors disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 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."
@@ -13744,7 +14016,7 @@ msgstr ""
 "com a «falsa». Això provoca que es desfaci la selecció dels correus de la "
 "llista i que se suprimeixi la previsualització de la carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 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 &lt;"
@@ -13756,7 +14028,7 @@ msgstr ""
 "l'estructura XML és &lt;capçalera enabled&gt;. Indiqueu «enabled» si s'ha de "
 "visualitzar la capçalera en la visualització del correu."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 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 "
@@ -13767,11 +14039,11 @@ msgstr ""
 "locals amb la finalitat d'excloure els correus enviats per contactes "
 "coneguts del filtratge de correu brossa."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "Aquesta opció ajudaria a millorar la velocitat de recollida."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13779,7 +14051,7 @@ msgstr ""
 "Això estableix el nombre d'adreces per mostrar a la visualització de la "
 "llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13787,7 +14059,7 @@ msgstr ""
 "Aquest paràmetre especifica si l'estat per defecte dels fils és expandit o "
 "contret. Haureu de reiniciar l'Evolution perquè els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 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 "
@@ -13797,121 +14069,121 @@ msgstr ""
 "missatge de cadascun d'ells, o bé segons la data del missatge. Haureu de "
 "reiniciar l'Evolution perquè els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Crea fils basats en la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Crea fils basats en la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Crea fils basats en l'assumpte en la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Temps d'espera per a marcar un missatge com a llegit"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Temps d'espera per a marcar un missatge com a llegit."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "Cadena d'identificació d'usuari del compte predeterminat."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subratllat per als errors ortogràfics quan s'utilitzi la "
 "verificació ortogràfica."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utilitza el client i el dimoni de l'SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utilitza el client i el dimoni de l'SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Utilitza tipus de lletra personalitzats"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Utilitza tipus de lletra personalitzats per a visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Fes només proves de correu no desitjat locals."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Fes només proves de correu no desitjat locals (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Utilitza una disposició de costat o ampla"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Tipus de lletra de mida variable"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "L'element del menú Visualitza/CCO està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "L'element del menú Visualitza/CCO està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "L'element del menú Visualitza/Cc està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "L'element del menú Visualitza/De està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "L'element del menú Visualitza/De està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "L'element del menú Visualitza/Envia a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'element del menú Visualitza/Respon a està activat."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Si s'afegirà una sol·licitud de confirmació de lectura per a cada missatge "
 "de manera predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Si s'ha d'inhabilitar la funcionalitat d'escurçar els noms de les carpetes "
-"amb punts suspensius en l'arbre de carpetes."
+"amb punts suspensius a la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13919,15 +14191,15 @@ msgstr ""
 "Si s'ha de provar de crear fils per temes quan els missatges no continguin "
 "les capçaleres References o In-Reply-To."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Si s'han d'ordenar els fils basant-se en el seu l'últim missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Amplada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Amplada de la subfinestra de la llista de missatges."
 
@@ -13959,194 +14231,142 @@ msgstr "Bústia de correu de Berkeley (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetes de correu de format Berkeley"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "S'està important una bústia"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "S'està important «%s»"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "S'està examinant %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "S'estan important dades del Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Importador del Pine de l'Evolution"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importa correu del Pine."
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "L'assumpte és %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:519
-#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Plantilles"
-
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionat, "
 msgstr[1] "%d seleccionats, "
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d suprimit"
 msgstr[1] "%d suprimits"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d brossa"
 msgstr[1] "%d brossa"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d esborrany"
 msgstr[1] "%d esborranys"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviat"
 msgstr[1] "%d enviats"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:568
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sense enviar"
 msgstr[1] "%d sense enviar"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:574
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sense llegir,"
 msgstr[1] "%d sense llegir,"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:575
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "Missatge de correu nou"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:928
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Missatge de correu"
+
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge de correu nou"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "Carpeta de correu nova"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:936
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Carpeta de correu"
+
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correu nova"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr "No s'ha pogut actualitzar la configuració o les carpetes."
 
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "Error"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "Errors"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "Avisos i errors"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "Depuració"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "Errors, avisos i missatges de depuració"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "Registres de depuració"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "Mostra els e_rrors a la barra d'estat per a"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
-msgid "second(s)."
-msgstr "segons."
-
-#: ../mail/mail-component.c:1761
-msgid "Log Messages:"
-msgstr "Missatges de registre:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "Nivell de registre"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "Hora"
-
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Missatges"
-
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Tanca aquesta finestra"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Comprova els tipus _permesos "
@@ -14431,105 +14651,105 @@ msgid "Empty trash folders on e_xit"
 msgstr "Buida les papereres en sor_tir"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
-msgstr "Habilita la te_cla d'espai màgica "
+msgid "Enable Magic S_pacebar"
+msgstr "Habilita la te_cla d'espai màgica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "Habilita les _carpetes de cerca"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficats de xifratge:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "Xifra els missat_ges de sortida (per defecte)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "Amplada fi_xa:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "Tipus de lletra d'amplada fi_xa:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "Propietats del tipus de lletra"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr "Missatges en format _HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "Nom compl_et:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "Missatges HTML"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "Servidor intermediari per a l'H_TTP:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "Capçaleres"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "Ressalta el text _citat amb"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "Inserit"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr "Missatge original en línia (a l'estil de l'Outlook)"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "Taula d'idiomes"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr "Taula de capçaleres de correu"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr "Ubicació de la bústia"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "Redactor de missatges"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "No uti_litzis el servidor intermediari per a:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Nota: el caràcter de subratllat al nom de l'etiqueta s'utilitza com a "
 "identificador mnemònic en el menú."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14537,25 +14757,25 @@ msgstr ""
 "Nota: no se us demanarà la contrasenya fins que us connecteu per primera "
 "vegada"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "S'ignorarà aquesta opció si es produeix una concordança amb les capçaleres "
 "de correu brossa personalitzades."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "_Organització:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "Id. de _clau PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "Contrasen_ya:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14563,7 +14783,7 @@ msgstr ""
 "Introduïu un nom descriptiu per a aquest compte aquí sota.\n"
 "Aquest nom només s'utilitzarà per a visualitzar-lo."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14571,7 +14791,7 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre proveïdor d'Internet."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 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 "
@@ -14581,115 +14801,123 @@ msgstr ""
 "«opcionals» no són necessaris, a menys que els vulgueu afegir en els correus "
 "que envieu."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "Seleccioneu alguna de les següents opcions"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pregunta quan s'enviïn missatges amb destinataris n_omés al camp CCO"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr "Citat"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "_Recorda la contrasenya"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "_Respon-A:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "Recorda la contrasen_ya"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "Ordinador S_OCKS:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Ce_rca la foto del remitent només a les llibretes d'adreces locals"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "S_elecciona..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_end message receipts:"
 msgstr "_Envia confirmacions de lectura:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "_Tipus de lletra estàndard:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "Selecciona la carpeta d'esborranys"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa per imprimir"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable per imprimir"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "Selecciona la carpeta d'elements enviats"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Enviament de correu"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _missatges enviats:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requereix autenticació"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Tipus de servidor:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "Ce_rtificat de signatura:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "Signat_ura:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "Taula de signatures"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "Verificació ortogràfica"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr "Inicia la redac_ció al final en respondre"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "T_ipus:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14697,7 +14925,7 @@ msgstr ""
 "Aquesta llista reflecteix només els idiomes per als quals teniu instal·lat "
 "un diccionari."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14707,7 +14935,7 @@ msgstr ""
 "per a la vostra signatura. El nom que especifiqueu\n"
 "només s'utilitzarà per a visualitzar-lo."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14715,26 +14943,26 @@ msgstr ""
 "Escriviu el nom que vulgueu fer servir per referir-vos a aquest compte.\n"
 "Per exemple: «Feina» o «Personal»"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "Nom d'_usuari:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "Utilitza au_tenticació"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Nom d'_usuari:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "_Amplada variable:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14745,126 +14973,126 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per a començar. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "_Afegeix la signatura"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "C_arrega sempre les imatges d'Internet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL de configuració _automàtica del servidor intermediari:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr "Connector de correu brossa per _defecte:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "Connexió _directa a Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "No signis les sol·licituts _de reunió (compatible amb l'Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "Estil de reen_viament:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 "Mantin_gues la signatura a la part superior del missatge original en "
 "respondre"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "_Carrega les imatges dels correus dels contactes"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "_Lookup in local address book only"
 msgstr "_Cerca només a les llibretes d'adreces locals"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "Fes-lo el meu compte per _defecte"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "Configuració _manual del servidor intermediari:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_Marca els missatges com a llegits al cap de"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "_No carreguis mai les imatges d'Internet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_Camí:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Pregunta quan s'enviïn missatges HTML als contactes que no ho vulguin"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Pregunta quan s'enviïn missatges amb l'assumpte buit"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr "Estil de la _resposta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "Servidor intermediari per a l'HTTP _segur:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "S_elecciona..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "M_ostra les animacions"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostra la fotografia del remitent en la previsualització del correu"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Reduei_x les capçaleres Per a/ CC / CCO a "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "E_mpra una connexió segura:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "Utilitza els paràmetres p_redeterminats del sistema"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "adreces"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "descripció"
 
@@ -14912,7 +15140,7 @@ msgstr "Ce_rca:"
 msgid "Find in Message"
 msgstr "Cerca en el missatge"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Senyala per respondre"
 
@@ -14964,26 +15192,26 @@ msgstr "Sen_yalador:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Habili_teu-lo per a acceptar l'acord de llicència"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "S'estan filtrant els missatges seleccionats"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "S'està recollint el correu electrònic"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'han pogut aplicar els filtres de sortida: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14992,125 +15220,125 @@ msgstr ""
 "No s'ha pogut afegir a %s: %s\n"
 "S'afegirà a la carpeta local «Enviat» en lloc d'això."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No s'han pogut afegir a la carpeta local «Enviat»: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "S'està enviant el missatge"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està enviant el missatge %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "No s'han pogut enviar %d de %d missatges"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "S'ha cancel·lat."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Completat."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "S'està desant el missatge a la carpeta"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "S'estan movent els missatges a %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "S'estan copiant els missatges a %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Missatges reenviats"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "S'està obrint la carpeta %s"
 
 # FIXME (dpm)
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr ""
 "S'està recuperant la informació de la quota d'espai per a la carpeta %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "S'està obrint el magatzem %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "S'està suprimint la carpeta %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S'està emmagatzemant la carpeta «%s»"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "S'està buidant i emmagatzemant el compte «%s»"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "S'està emmagatzemant el compte «%s»"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "S'està refrescant la carpeta"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "S'està suprimint la carpeta"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està buidant la paperera a «%s»"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Carpetes locals"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "S'està recuperant el missatge %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "S'està recuperant %d missatge"
 msgstr[1] "S'estan recuperant %d missatges"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "S'està desant %d missatge"
 msgstr[1] "S'estan desant %d missatges"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15119,11 +15347,11 @@ msgstr ""
 "S'ha produït un error en desar els missatges a: %s.\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "S'està desant el fitxer adjunt"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15132,27 +15360,27 @@ msgstr ""
 "No s'ha pogut crear el fitxer de sortida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està desconnectant de %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està tornant a connectar a %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "S'està preparant el compte «%s» per a treballar fora de línia"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Comprovació del servei"
 
@@ -15168,39 +15396,39 @@ msgstr "Envia i rep el correu"
 msgid "Cancel _All"
 msgstr "C_ancel·la-ho tot"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "S'està actualitzant..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "S'està esperant..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprovació de correu nou"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Introduïu la contrasenya"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "L'usuari ha cancel·lat l'operació."
 
@@ -15245,21 +15473,21 @@ msgstr "La carpeta no és vàlida: «%s»"
 msgid "Setting up Search Folder: %s"
 msgstr "S'està configurant la carpeta de cerca: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "S'estan actualitzant les carpetes de cerca per a «%s:%s»"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "S'estan actualitzant les carpetes de cerca per a «%s»"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Edita les carpetes de cerca"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Carpeta de cerca nova"
 
@@ -15883,79 +16111,79 @@ msgstr "Bui_da"
 msgid "_Open Messages"
 msgstr "_Obre els missatges"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "No vist"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Vist"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Respost"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Reenviat"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Missatges múltiples"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "La més baixa"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Més baixa"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Més alta"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "La més alta"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15963,7 +16191,7 @@ msgstr ""
 "No hi ha cap missatge que satisfaci els vostres criteris de cerca. Netegeu "
 "la cerca a través de l'element de menú Cerca -> Neteja, o bé canvieu-la."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "No hi ha cap missatge en aquesta carpeta."
 
@@ -15996,39 +16224,43 @@ msgstr "Missatges enviats"
 msgid "Size"
 msgstr "Mida"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Assumpte - retallat"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Crida"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "No ho reenviïs"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Respondre"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Per a la vostra informació"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenvia"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "No és necessària cap resposta"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Respon"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Ressenya"
 
@@ -16084,8 +16316,8 @@ msgstr ""
 "Llista de pistes que el connector de recordatori d'adjuncions cercarà en el "
 "cos del missatge."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:392
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Paraules clau"
 
@@ -16121,7 +16353,7 @@ msgstr "_Edita el missatge"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Un connector formatador que mostra els fitxers de so adjunts i permet "
 "reproduir-los directament des de l'Evolution."
@@ -16366,38 +16598,38 @@ msgstr "Configuració de la _restauració..."
 msgid "_Backup Settings..."
 msgstr "Configuració de la _còpia de seguretat..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactes automàtics"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Crea _automàticament entrades a la llibreta d'adreces en respondre correus"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccioneu la llibreta d'adreces per als contactes automàtics"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Contactes de la missatgeria instantània"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronitza la informació de contactes i les imatges de la llista d'amics "
 "del Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccioneu la llibreta d'adreces per a la llista d'amics del Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronitza amb la me_va llista d'amics"
 
@@ -16416,30 +16648,30 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "S'ha produït un error en executar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "El procés fill del Bogofilter no respon; se suprimirà..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 "S'ha interromput l'espera per al procés fill del Bogofilter; es terminarà..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 "Ha fallat la creació d'un conducte cap al Bogofilter; el codi d'error fou: %"
 "d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
 msgid "Convert message text to _Unicode"
 msgstr "Converteix el text del missatge a _Unicode"
 
@@ -16467,21 +16699,31 @@ msgstr "Connector de correu brossa del Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra els missatges de correu brossa amb el Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "Utilitza l'_SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "Re_fresca:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "Fonts del calendari CalDAV"
@@ -16498,13 +16740,6 @@ msgstr "Calendaris locals"
 msgid "Provides core functionality for local calendars."
 msgstr "Proporciona funcionalitat central per als calendaris locals."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "Re_fresca:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Utilitza una connexió _segura"
@@ -16521,48 +16756,55 @@ msgstr "Calendaris HTTP"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Proporciona funcionalitat central per a webcal i calendaris HTTP."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Temps: amb núvols"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Temps: boira"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Temps: parcialment ennuvolat"
+msgid "Weather: Cloudy"
+msgstr "Temps: amb núvols"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Temps: pluja"
+msgid "Weather: Cloudy Night"
+msgstr "Temps: nit amb núvols"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Overcast"
+msgstr "Temps: cel cobert"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Showers"
+msgstr "Temps: ruixats"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "Temps: neu"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "Temps: sol"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Temps: nit clara"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "Temps: llamps i trons"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Seleccioneu una ubicació"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Unitats:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Mètriques (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperials (Fahrenheit, polzades, etc)"
 
@@ -16610,7 +16852,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Voleu que l'Evolution sigui el vostre gestor de correu predeterminat?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16651,7 +16893,7 @@ msgid "Key"
 msgstr "Clau"
 
 #: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Valors"
 
@@ -16693,6 +16935,13 @@ msgstr ""
 "valor és: el nom de la capçalera seguit del signe d'igualtat («=») i els "
 "valors separats per punts i comes («;»)."
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Obre la carpeta d'un altre usuari"
@@ -16710,12 +16959,12 @@ msgid "_User:"
 msgstr "_Usuari:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Contrasenya segura"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16723,11 +16972,11 @@ msgstr ""
 "Amb aquesta opció es connectarà al servidor Exchange utilitzant autenticació "
 "basada en contrasenya segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Contrasenya sense xifrar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16735,11 +16984,11 @@ msgstr ""
 "Amb aquesta opció es connectarà al servidor Exchange mitjançant una "
 "contrasenya de text sense xifrar."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Fora de l'oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16748,88 +16997,92 @@ msgstr ""
 "persones\n"
 "que us enviïn un correu quan no sigueu a l'oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "No sóc a l'oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Sóc a l'oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Canvia la contrasenya per al compte de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gestiona la configuració de delegats per al compte de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Assistent de delegació"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Miscel·lània"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Visualitza la mida de totes les carpetes de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Mida de les carpetes"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuració de l'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "A_utenticació"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "Es_pecifiqueu el nom de la bústia de correu"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Bústia de correu:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "Tipus d'_autenticació"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "Comprova els tipus _disponibles"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16874,32 +17127,32 @@ msgstr "La contrasenya actual ha vençut. Hauríeu de canviar-la ara."
 msgid "Your password will expire in the next %d days"
 msgstr "La contrasenya vencerà en els propers %d dies"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (llegir, crear, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (llegir, crear)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (només lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permisos del delegat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16908,7 +17161,7 @@ msgstr "Permisos per a %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16919,25 +17172,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Heu obtingut els permisos següents sobre les meves carpetes:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "També teniu permís per a veure els meus elements privats."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Tot i això, no teniu permís per a veure els meus elements privats."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Heu estat designat delegat per a %s"
@@ -17141,8 +17394,8 @@ msgstr "Afegeix un usuari:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Afegeix un usuari"
 
@@ -17260,11 +17513,11 @@ msgstr "_Sensibilitat: "
 msgid "_User"
 msgstr "_Usuari"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Seleccioneu l'usuari"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Llibreta d'adreces..."
 
@@ -17289,18 +17542,24 @@ msgid "Exchange Operations"
 msgstr "Operacions de l'Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+"No es pot accedir a la pestanya «Paràmetres de l'Exchange» en mode fora de "
+"línia."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "No es pot canviar la contrasenya degut a problemes de configuració."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "No es poden mostrar les carpetes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "No es pot realitzar l'operació."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17308,15 +17567,15 @@ msgstr ""
 "Els canvis a la configuració del compte de l'Exchange «{0}» es produiran "
 "després de reiniciar l'Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
 msgstr "No s'ha pogut autenticar al servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "No s'ha pogut canviar la contrasenya."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17326,62 +17585,62 @@ msgstr ""
 "s'ha produït un error desconegut. Comproveu l'URL,\n"
 "el compte d'usuari i contrasenya, i torneu-ho a provar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "No s'ha pogut connectar al servidor Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "No s'ha pogut connectar al servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr ""
 "No s'han pogut determinar els permisos de les carpetes per als delegats."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "No s'ha trobat el sistema d'emmagatzemament web de l'Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "No s'ha pogut localitzar el servidor {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "No s'ha pogut fer de {0} un delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "No s'han pogut llegir els permisos de la carpeta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "No s'han pogut llegir els permisos de la carpeta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "No s'ha pogut llegir l'estat de fora de l'oficina."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "No s'han pogut actualitzar els permisos de la carpeta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "No s'ha pogut actualitzar l'estat d'absència de l'oficina"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 "Cal reiniciar l'Evolution per a poder carregar la subscripció a la bústia de "
 "correu de l'usuari"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "El compte de l'Exchange està fora de línia."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17408,32 +17667,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "No s'han pogut actualitzar els delegats:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "La carpeta ja existeix"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "La carpeta no existeix"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Carpeta fora de línia"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Error genèric"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "No es pot trobar el servidor del catàleg global"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17441,77 +17700,77 @@ msgstr ""
 "Si l'OWA s'està executant en un camí diferent, heu d'especificar-ho en el "
 "diàleg de configuració del compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "La bústia de correu per a {0} no és en aquest servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Assegureu-vos que l'URL és correcte i torneu-ho a provar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Assegureu-vos que el nom del servidor està escrit correctament i torneu-ho a "
 "provar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Assegureu-vos que el nom d'usuari i la contrasenya són correctes i torneu-ho "
 "a provar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "No s'ha configurat un servidor de catàleg global per a aquest compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "L'usuari {0} no té bústia de correu a {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "No existeix l'usuari {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "S'ha canviat la contrasenya correctament."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Introduïu un identificador de delegat o bé inhabiliteu l'opció d'enviar com "
 "a delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Assegureu-vos que el nom del servidor de catàleg global és correcte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Heu de reiniciar l'Evolution perquè s'apliquin els canvis"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Seleccioneu un usuari."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "El servidor ha rebutjat la contrasenya perquè és massa feble."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "El compte d'Exchange s'inhabilitarà quan sortiu de l'Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "El compte d'Exchange se suprimirà quan sortiu de l'Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "El servidor d'Exchange no és compatible amb l'Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17519,7 +17778,7 @@ msgstr ""
 "El servidor està executant l'Exchange 5.5. L'Exchange Connector\n"
 "només pot treballar amb Microsoft Exchange 2000 i 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17533,61 +17792,61 @@ msgstr ""
 "\n"
 "O potser simplement heu escrit malament la contrasenya."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Proveu-ho de nou amb una contrasenya diferent."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "No s'ha pogut afegir l'usuari a la llista de control d'accés:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "No es poden editar els delegats."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "S'ha produït un error desconegut en cercar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "S'ha produït un error desconegut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Tipus desconegut"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "L'operació no està implementada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Us esteu acostant a la vostra quota disponible per a emmagatzemar correus en "
 "aquest servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Només podeu enviar un missatge en nom d'un sol delegant a la vegada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "No podeu ser el vostre propi delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Heu superat la vostra quota per a emmagatzemar correus en aquest servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Només podeu configurar un únic compte d'Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17595,13 +17854,13 @@ msgstr ""
 "El vostre ús actual és: {0} KB. Intenteu netejar una mica d'espai esborrant "
 "alguns correus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "El vostre ús actual és: {0} KB. No podreu enviar ni rebre correus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17609,19 +17868,19 @@ msgstr ""
 "El vostre ús actual és: {0} KB. No podreu enviar correus fins que netegeu "
 "una mica d'espai esborrant alguns correus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "La contrasenya ha vençut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "No es pot afegir {0} a la llista de control d'accés"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} ja és un delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} ja és a la llista"
 
@@ -17727,10 +17986,10 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "S'ha cancel·lat la subscripció a la carpeta «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr ""
 "Permet cancel·lar la subscripció a carpetes de correu en el menú contextual "
-"de l'arbre de carpetes."
+"de la barra lateral."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17742,24 +18001,20 @@ msgstr "Cancel·la la s_ubscripció"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "Hauríeu d'introduir el nom d'usuari abans de res."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduïu la contrasenya de l'usuari %s per a accedir a la llista de "
 "subscripcions a calendaris."
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:540
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17768,21 +18023,21 @@ msgstr ""
 "No es poden llegir les dades del servidor del Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "_Calendari:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 msgid "Retrieve _list"
 msgstr "Recupera la _llista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Un connector per a configurar el calendari i els contactes del Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17794,15 +18049,15 @@ msgid "Checklist"
 msgstr "Llista de comprovació"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr ""
-"Un connector per a configurar fonts de calendari i contactes de groupwise."
+"Un connector per a configurar fonts de calendari i contactes del GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "Configuració del compte GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17826,11 +18081,11 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per a instal·lar la carpeta compartida\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Instal·la la carpeta compartida"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Instal·lació de la carpeta compartida"
 
@@ -17856,7 +18111,7 @@ msgid "Email:"
 msgstr "Adreça electrònica:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Inhabilita"
 
@@ -17889,15 +18144,15 @@ msgid "Retract Mail"
 msgstr "Retira el correu"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Afegeix opcions d'enviament als missatges de Groupwise"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Afegeix opcions d'enviament als missatges del GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Un connector per a les característiques dels comptes GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Característiques GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17914,21 +18169,24 @@ msgstr "El servidor no ha permès retirar el missatge seleccionat."
 msgid "Invalid user"
 msgstr "L'usuari no és vàlid"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "No es pot atorgar accés al servidor intermediari a l'usuari «{0}»."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Seleccioneu l'usuari"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr ""
 "Ja heu atorgat permisos d'accés al servidor intermediari a aquest usuari."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "Heu d'especificar un nom d'usuari vàlid per a atorgar-li permisos de "
@@ -17956,20 +18214,23 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Aquesta és una reunió periòdica"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Ho voleu acceptar?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Ho voleu cancel·lar?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "No podeu compartir la carpeta amb l'usuari que heu especificat («{0}»)."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr ""
+"No podeu compartir aquesta carpeta amb l'usuari que heu especificat («{0}»)"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 "Heu d'especificar el nom de l'usuari al qual vulgueu afegir a la llista"
 
@@ -18059,7 +18320,8 @@ msgstr "_Escriptura"
 msgid "permission to read|_Read"
 msgstr "_Lectura"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
@@ -18068,12 +18330,13 @@ msgid "<b>Account Name</b>"
 msgstr "<b>Nom del compte</b>"
 
 # Vegeu el comentari de sota referent a aquesta mateixa cadena (dpm)
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Entrada com a delegat"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -18083,24 +18346,30 @@ msgstr "%sIntroduïu la contrasenya per a %s (usuari %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "Entrada com a _delegat..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "La pestanya del delegat només estarà disponible quan el compte estigui en "
 "línia."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La pestanya del delegat només estarà disponible quan el compte estigui "
 "habilitat."
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "Opcions avançades d'enviament"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Usuaris"
 
@@ -18116,68 +18385,68 @@ msgstr "_Carpeta compartida nova..."
 msgid "Sharing"
 msgstr "Compartició"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Notificació personalitzada"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Afegeix   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Estat del missatge"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Data de creació:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Destinatari: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Entregat: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Obert: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Acceptat: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Suprimit: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Declinat: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Completat: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "No entregat: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Segueix l'estat del missatge..."
 
@@ -18281,11 +18550,11 @@ msgstr "Importa al calendari"
 msgid "Imports ICS attachments to calendar."
 msgstr "Importa fitxers adjunts ICS al calendari."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "No s'ha carregat la capa d'abstracció del maquinari (HAL)"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18293,11 +18562,11 @@ msgstr ""
 "Es requereix el servei «hald», però no s'està executant. Hauríeu d'habilitar-"
 "lo i reiniciar aquest programa, o bé contactar l'administrador del sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Ha fallat la cerca d'un iPod"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -18305,8 +18574,8 @@ msgstr ""
 "L'Evolution no ha trobat cap iPod amb el qual poder-se sincronitzar. Pot ser "
 "que aquest no estigui connectat al sistema o bé que estigui apagat."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Format de l'iCalendar (.ics)"
 
@@ -18325,131 +18594,131 @@ msgstr "Sincronitza l'iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronització de l'iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No s'ha pogut carregar el calendari «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Un esdeveniment del calendari «%s» coincideix amb aquesta reunió"
 
 # c-format
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "S'ha trobat l'esdeveniment al calendari «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:741
 msgid "Unable to find any calendars"
 msgstr "No s'ha pogut trobat cap calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:748
 msgid "Unable to find this meeting in any calendar"
 msgstr "No s'ha pogut trobar aquesta reunió en cap calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find this task in any task list"
 msgstr "No s'ha pogut trobar la tasca a la llista de tasques"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:756
 msgid "Unable to find this memo in any memo list"
 msgstr "No s'ha pogut trobar aquesta anotació a la llista d'anotacions"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:827
 msgid "Searching for an existing version of this appointment"
 msgstr "S'està buscant una versió existent d'aquesta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:996
 msgid "Unable to parse item"
 msgstr "No s'ha pogut analitzar l'element"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1054
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No s'ha pogut enviar l'element al calendari «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1066
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "S'ha enviat al calendari «%s» com a acceptat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "S'ha enviat al calendari «%s» com a provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1075
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "S'ha enviat al calendari «%s» com a rebutjat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "S'ha enviat al calendari «%s» com a cancel·lat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1174
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organitzador ha suprimit el delegat %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1181
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envia un avís de cancel·lació al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1183
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No s'ha pogut enviar un avís de cancel·lació al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'estat de l'assistent no s'ha pogut actualitzar perquè l'estat no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1318
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No s'ha pogut actualitzar l'assistent. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1322
 msgid "Attendee status updated"
 msgstr "S'ha actualitzat l'estat de l'assistent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Meeting information sent"
 msgstr "S'ha enviat la informació de la reunió"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 msgid "Task information sent"
 msgstr "S'ha enviat la informació de la tasca"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1354
 msgid "Memo information sent"
 msgstr "S'ha enviat la informació de l'anotació"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No s'ha pogut enviar la informació de la reunió; la reunió no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "Unable to send task information, the task does not exist"
 msgstr "No s'ha pogut enviar la informació de la tasca; la tasca no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1369
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "No s'ha pogut enviar la informació de l'anotació; l'anotació no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "The calendar attached is not valid"
 msgstr "El calendari adjunt no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18457,15 +18726,15 @@ msgstr ""
 "El missatge no conté un calendari iCalendar vàlid, tot i que diu contenir-ne "
 "un."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1490
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The item in the calendar is not valid"
 msgstr "L'element en el calendari no és vàlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1601
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18473,11 +18742,11 @@ msgstr ""
 "El missatge conté un calendari, però el calendari no conté esdeveniments, "
 "tasques o informació de lliure/ocupat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1530
 msgid "The calendar attached contains multiple items"
 msgstr "El calendari adjunt conté múltiples elements"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18485,37 +18754,37 @@ msgstr ""
 "Per processar tots els elements, s'hauria de desar el fitxer i importar el "
 "calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2240
 msgid "This meeting recurs"
 msgstr "Aquesta _reunió és periòdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2243
 msgid "This task recurs"
 msgstr "Aquesta tas_ca és periòdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2246
 msgid "This memo recurs"
 msgstr "Aquesta a_notació és periòdica"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "_Delete message after acting"
 msgstr "Suprimeix el missatge _després d'actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2492
+#: ../plugins/itip-formatter/itip-formatter.c:2524
 msgid "Conflict Search"
 msgstr "Cerca de conflictes"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2507
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccioneu els calendaris on cercar conflictes entre reunions"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Avui"
 
@@ -18993,11 +19262,11 @@ msgstr "A_plica a totes les instàncies"
 msgid "Show time as _free"
 msgstr "Mostra el temps com a _lliure"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Tasques :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Anotacions :"
 
@@ -19028,7 +19297,7 @@ msgstr ""
 "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-lo "
 "com a assistent?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Sortida de_l servidor intermediari"
 
@@ -19113,20 +19382,20 @@ msgstr "Si la icona ha de parpellejar o no."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Si s'ha de notificar només per al correu nou a la safata d'entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Genera un missatge del _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Notificació de correu de l'Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Propietats de la notificació de correu"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19137,55 +19406,55 @@ msgid_plural ""
 msgstr[0] "Heu rebut %d missatge nou a %s."
 msgstr[1] "Heu rebut %d missatges nous a %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Heu rebut %d missatge nou."
 msgstr[1] "Heu rebut %d missatges nous."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Correu nou"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Mostra una icona a l'àrea de _notificació"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "Parpe_lleja la icona a l'àrea de notificació"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Mostra un _missatge emergent juntament amb la icona"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "Re_produeix un de so quan arribi correu nou"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_Emet un to"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "_Reprodueix un fitxer de so"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Especifiqueu un nom de _fitxer:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Seleccioneu un fitxer de so"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Reproduei_x"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifica només per als missatges a la safata _d'entrada"
 
@@ -19336,8 +19605,8 @@ msgstr "Voleu enviar un correu electrònic a la llista?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19457,22 +19726,6 @@ msgstr "Marca els mi_ssatges com a llegits"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "S'utilitza per a marcar tots els missatges d'una carpeta com a llegits"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Marca el calendari com a desconnectat"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Marca el calendari seleccionat per a veure'l fora de línia."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "No el facis _disponible fora de línia"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Fes-lo disponible fora de línia"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Un connector que implementa connectors del Mono."
@@ -19543,19 +19796,19 @@ msgstr "Mode de text sense format"
 msgid "Prefer plain-text"
 msgstr "Prefereixo text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Mostra HTML si n'hi ha"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Prefereixo text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Mostra només text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19567,6 +19820,20 @@ msgstr "Perfilador de l'Evolution"
 msgid "Writes a log of profiling data events."
 msgstr "Escriu un registre de dades d'esdeveniments de dades perfilació."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Importa correu del Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Importador de l'Outlook CSV i Tab"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Permet publicar els calendaris a la web"
@@ -19583,9 +19850,9 @@ msgstr "Ubicacions"
 msgid "_Publish Calendar Information"
 msgstr "_Publica informació del calendari"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "Segur que voleu suprimir aquest URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "Segur que voleu suprimir aquesta ubicació?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19624,7 +19891,7 @@ msgstr "_Freqüència de publicació:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19632,7 +19899,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"FTP segur (SSH)\n"
 "FTP públic\n"
 "FTP (amb entrada)\n"
 "Recurs compartit del Windows\n"
@@ -19672,6 +19939,14 @@ msgstr ""
 "iCal\n"
 "Lliure/ocupat"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "Ubicació nova"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Edita la ubicació"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hola Python"
@@ -19689,62 +19964,62 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Carregador de l'EPlugin del connector de prova del Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Un connector que carrega altres connectors escrits en Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Carregador del Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrat)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No s'ha trobat l'SpamAssassin, codi retornat: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "No s'ha pogut crear el conducte («pipe»): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "S'ha produït un error després de la crida «fork»: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El procés fill de l'SpamAssassin no respon; se suprimirà..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
-"S'ha interromput l'espera per al procés fill del Spamassassin; es "
+"S'ha interromput l'espera per al procés fill del SpamAssassin; es "
 "terminarà..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 "Ha fallat la creació d'un conducte cap al SpamAssassin; el codi d'error fou: "
 "%d."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "L'SpamAssassin no està disponible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Això farà que l'SpamAssassin sigui més fiable, però més lent"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "I_nclou proves remotes"
 
@@ -19757,12 +20032,12 @@ msgstr ""
 "instal·lat perquè aquest connector funcioni."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Connector de correu brossa de l'SpamAssassin"
+msgid "SpamAssassin Options"
+msgstr "Opcions de l'SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opcions de l'SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Connector de correu brossa de l'SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19772,7 +20047,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Desa els fitxers adjunts"
 
@@ -19784,15 +20059,15 @@ msgstr "Desa els fitxers adjunts..."
 msgid "Save all attachments"
 msgstr "Desa tots els fitxers adjunts"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Selecciona el nom base per a desar"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "Tipus MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Desa"
 
@@ -19800,79 +20075,79 @@ msgstr "Desa"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Llista de descripció"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Llista de categories"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Llista de comentaris"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Creat"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Comença"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Acaba"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "percentatge fet"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Llista d'assistents"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Modificat"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Opcions avançades del format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Afegeix una capçalera al començament"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Separador de valors:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Separador de registres:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Encapsula els valors amb:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Format de valors separats per comes (.csv)"
 
@@ -19893,11 +20168,11 @@ msgstr "_Desa a disc"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
@@ -19933,15 +20208,15 @@ msgstr "Us guiarà a través de la configuració del vostre compte inicial."
 msgid "Setup Assistant"
 msgstr "Auxiliar de configuració"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Auxiliar de la configuració de l'Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Us donem la benvinguda"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19954,28 +20229,28 @@ msgstr ""
 "\n"
 "Feu clic a «Endavant» per a continuar."
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Importació de fitxers"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccioneu la informació que voleu importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importació de dades."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Espereu"
@@ -20007,15 +20282,15 @@ msgstr ""
 "Llista de parells de clau/valor que el connector de plantilles substituirà "
 "en el cos d'un missatge."
 
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Sense títol"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Desa com a _plantilla"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Desa com a plantilla"
 
@@ -20025,9 +20300,9 @@ msgid "Drafts based template plugin"
 msgstr "Connector de plantilla basat en esborranys"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr ""
-"Un connector senzill que utilitza l'ytnef per a decodificar fitxers adjunts "
+"Un connector senzill que utilitza l'yTNEF per a decodificar fitxers adjunts "
 "TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -20053,7 +20328,7 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evita l'IfMatch (requerit per a l'Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20203,7 +20478,7 @@ msgstr "La barra lateral és visible"
 msgid "Skip development warning dialog"
 msgstr "Omet el diàleg d'avís de versió de desenvolupament"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Inicia en mode fora de línia"
 
@@ -20429,7 +20704,7 @@ msgstr "Preferències de l'Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20471,23 +20746,19 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Lloc web de l'Evolution"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "S'ha produït un error en obrir la pàgina web de les PMF."
-
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Treballa en línia"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Treballa fora de línia"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Treballa fora de línia"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20495,11 +20766,11 @@ msgstr ""
 "L'Evolution està en línia.\n"
 "Feu clic en aquest botó per a treballar fora de línia."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "L'Evolution està procedint a treballar fora de línia."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20507,33 +20778,33 @@ msgstr ""
 "L'Evolution està fora de línia.\n"
 "Feu clic en aquest botó per a treballar en línia."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Commuta a %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "S'ha produït un error desconegut del sistema."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "D'acord"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Els arguments no són vàlids"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "No s'ha pogut registrar a l'OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "No s'ha pogut trobar la base de dades de configuració."
 
@@ -20547,6 +20818,11 @@ msgstr "Nou"
 msgid "New Test"
 msgstr "Prova nova"
 
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
+msgid "_Test"
+msgstr "P_rova"
+
 #: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Crea un element de prova nou"
@@ -20573,8 +20849,8 @@ msgid "Importer Type"
 msgstr "Tipus d'importador"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Seleccioneu els importadors"
+msgid "Select Information to Import"
+msgstr "Seleccioneu la informació a importar"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20591,7 +20867,7 @@ msgstr ""
 "per a importar fitxers externs a l'Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20627,7 +20903,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feina, i esperem\n"
 "ansiosament les vostres contribucions.\n"
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20635,45 +20911,45 @@ msgstr ""
 "Gràcies\n"
 "L'equip de l'Evolution\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Inicia en mode en línia"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de depuració de tots els components a un fitxer."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la càrrega de connectors."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 "Inhabilita la subfinestra de previsualització per al Correu, Contactes i "
 "Tasques."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "EL gestor d'informació personal i client de correu de l'Evolution"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20687,18 +20963,22 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Segur que voleu oblidar totes les contrasenyes recordades?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "No es pot iniciar l'Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continua"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Voleu suprimir les dades de la versió {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "No es pot iniciar l'Evolution."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20706,15 +20986,15 @@ msgstr ""
 "Si oblideu les contrasenyes es netejaran totes les contrasenyes recordades. "
 "Se us tornarà a preguntar la propera vegada que calgui."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Espai insuficient de disc per a l'actualització."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Realment voleu suprimir les dades antigues?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20737,9 +21017,9 @@ msgstr ""
 "Una vegada que s'hagin suprimit, haureu d'efectuar modificacions manualment "
 "si és que voleu tornar a instal·lar una versió antiga.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20753,11 +21033,11 @@ msgstr ""
 "evolution&quot; se suprimiran permanentment. Si voleu conservar aquestes "
 "dades, podeu suprimir el contingut de la carpeta «evolution» quan vulgueu.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Ha fallat l'actualització des de la versió anterior: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20770,7 +21050,7 @@ msgstr ""
 "\n"
 "Necessitareu més espai lliure en la carpeta d'inici abans de poder continuar."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20780,7 +21060,7 @@ msgstr ""
 "\n"
 "Feu clic a l'ajuda per a obtenir més detalls."
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20794,19 +21074,19 @@ msgstr ""
 "\n"
 "Feu clic a l'ajuda per a obtenir més detalls."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Oblida"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Conserva les dades"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Recorda-m'ho després"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20877,7 +21157,7 @@ msgid "Purposes"
 msgstr "Finalitats"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Número de sèrie"
 
@@ -20996,7 +21276,7 @@ msgstr ""
 "propòsit, n'hauríeu d'examinar el certificat i la seva política i "
 "procediments (si estan disponibles)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -21073,11 +21353,11 @@ msgstr "Unitat organitzacional (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Empremta electrònica SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certificat SSL del client"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certificat SSL del servidor"
 
@@ -21129,185 +21409,185 @@ msgid "_Edit CA Trust"
 msgstr "_Edita la confiança en l'entitat certificadora"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "El certificat ja existeix"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Signa"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Xifra"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Versió"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Versió 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Versió 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Versió 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "Xifratge PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Ús de la clau de certificat"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Tipus de certificat del Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de clau de l'entitat certificadora"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de l'objecte (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identificador de l'algorisme"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Paràmetres de l'algorisme"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Informació de clau pública de l'assumpte"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algorisme de clau pública de l'assumpte"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Clau pública de l'assumpte"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "S'ha produït un error: no es pot processar l'extensió"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Signador de l'objecte"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Entitat certificadora de l'SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Entitat certificadora del correu electrònic"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Signatura"
 
 # FIXME: si algú vol canviar-ho, aquí hi ha un bon article
 # sobre el tema: http://www.firstmonday.org/issues/issue5_8/mccullagh/
 # (dpm)
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Propietat de no refús"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Xifrat de clau"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Xifrat de dades"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Acord sobre la clau"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Signador del certificat"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "Signador CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "És crític"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "No és crític"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Algorisme de la signatura del certificat"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Identificador únic de l'emissor"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Identificador únic de l'assumpte"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Valor de la signatura de certificat"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Fitxer de contrasenya PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduïu la contrasenya per al fitxer PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Certificat importat"
 
@@ -21346,8 +21626,8 @@ msgid "Copy"
 msgstr "Copia"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copia els contactes seleccionats a una altra carpeta..."
+msgid "Copy selected contacts to another folder"
+msgstr "Copia els contactes seleccionats a una altra carpeta"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
@@ -21395,8 +21675,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Mo_u tots els contactes a..."
 
 #: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "Mou els contactes a una altra carpeta..."
+msgid "Move selected contacts to another folder"
+msgstr "Mou els contactes a una altra carpeta"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
@@ -21436,14 +21716,14 @@ msgid "Save as VCard..."
 msgstr "Desa com a VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "Desa els contactes seleccionats com a VCard."
+msgid "Save selected contacts as a VCard"
+msgstr "Desa els contactes seleccionats com a VCard"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Desa els contactes de la carpeta seleccionada com a VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
@@ -21456,16 +21736,16 @@ msgid "Select all contacts"
 msgstr "Selecciona tots els contactes"
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "Envia un missatge als contactes seleccionats."
+msgid "Send a message to the selected contacts"
+msgstr "Envia un missatge als contactes seleccionats"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Envia un missatge al contacte"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "Envia els contactes seleccionats a altres persones."
+msgid "Send selected contacts to another person"
+msgstr "Envia els contactes seleccionats a una altra persona"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -21487,7 +21767,7 @@ msgstr "Atura la càrrega"
 msgid "View the current contact"
 msgstr "Visualitza el contacte actual"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Accions"
@@ -21577,7 +21857,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Següent"
 
@@ -21586,7 +21866,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el calendari que s'ha d'imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Anterior"
 
@@ -21642,15 +21922,23 @@ msgstr "Mostra la setmana actual"
 msgid "View the current appointment"
 msgstr "Visualitza la cita"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Mostra la consola de depuració per als missatges de registre"
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Setmana"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Setmana laborable"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "Registres de _depuració"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_Obre una cita:"
 
@@ -21723,10 +22011,6 @@ msgstr "Mostra la finestra de previsualització de missatges"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscriu o cancel·la la subscripció a una carpeta en servidors remots"
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Mostra la consola de depuració per als missatges de registre"
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "Visualització _clàssica"
@@ -21735,10 +22019,6 @@ msgstr "Visualització _clàssica"
 msgid "_Copy Folder To..."
 msgstr "_Copia la carpeta a..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Registres de _depuració"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_Baixa els missatges per a treballar fora de línia"
@@ -21763,8 +22043,8 @@ msgstr "_Previsualització"
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "_Subscripcions"
+msgid "_Subscriptions..."
+msgstr "_Subscripcions..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
@@ -21846,10 +22126,6 @@ msgstr "Suprimeix permanentment tots els missatges esborrats d'aquesta carpeta"
 msgid "Permanently remove this folder"
 msgstr "Suprimeix permanentment la carpeta"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "Re_fresca..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Refresca la carpeta"
@@ -22777,7 +23053,7 @@ msgstr "Defineix les visualitzacions per a «%s»"
 
 # gal/menus/gal-view-factory-etable.c:38
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
@@ -22800,42 +23076,42 @@ msgid "_Replace existing view"
 msgstr "_Reemplaça la visualització actual"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Visualització personalitzada"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Desa la visualització personalitzada"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Defineix les visualitzacions..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Vis_ualització actual"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleccioneu la visualització: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "La visualització actual ha estat personalitzada"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Desa la visualització personalitzada..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Desa la visualització personalitzada actual"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Crea o edita visualitzacions"
 
@@ -22861,17 +23137,17 @@ msgstr "Tipus de visualització"
 msgid "Type of view:"
 msgstr "Tipus de visualització:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Barra de fitxers adjunts"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No s'ha pogut adjuntar el fitxer %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No s'ha pogut adjuntar el fitxer %s: no és un fitxer normal"
@@ -22897,82 +23173,82 @@ msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Calendari mensual"
 
 # gal/e-table/e-table-field-chooser.glade.h:1
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Color per emplenar"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "Color GDK per emplenar"
 
 # gal/widgets/color-palette.c:595
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Omple puntejant"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Amplada mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Amplada mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Espaiat"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Ara"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "L'hora ha d'estar en el format: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdós inclosos"
 
@@ -23071,55 +23347,55 @@ msgstr "Altres..."
 msgid "Ch_aracter Encoding"
 msgstr "Codificació dels c_aràcters"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Data i hora"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Entrada de text per a la data"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Feu clic a aquest botó per a mostrar un calendari"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Quadre combinat per a seleccionar l'hora"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "A_ra"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "A_vui"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "El valor de la data no és vàlid"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "El valor de l'hora no és vàlid"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expandit"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Si l'expansor està expandit"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Text de l'etiqueta de l'expansor"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Utilitza el caràcter de subratllat"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -23127,33 +23403,33 @@ msgstr ""
 "Si està habilitat, caràcter de subratllat en el text indicarà que el "
 "caràcter següent s'ha d'utilitzar com a tecla acceleradora"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Espai que es posarà entre l'etiqueta i el fill"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Element d'interfície gràfica d'etiqueta"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un element d'interfície gràfica a mostrar en comptes de l'etiqueta "
 "d'expansió habitual"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Mida de l'expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Mida de la fletxa de l'expansor"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Espaiat de l'indicador"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Espaiat al voltant de la fletxa de l'expansor"
 
@@ -23240,74 +23516,74 @@ msgstr "Sincronitza els registres privats:"
 msgid "Sync Categories:"
 msgstr "Categories de sincronització:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Missatge buit"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Model de reflux"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Amplada de la columna"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Cerca"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Feu clic aquí per a canviar el tipus de cerca"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Cerca ara"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Neteja"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ID de l'element"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Mos_tra: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "Cer_ca: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " _a "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Fila del cursor"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Columna del cursor"
 
@@ -23453,19 +23729,19 @@ msgid "_When opened:"
 msgstr "En _obrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completat)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Feu clic per a anar a l'URL"
 
@@ -23506,25 +23782,25 @@ msgstr "Columna amb el focus"
 msgid "Unselected Column"
 msgstr "Columna no seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Columna ratllada"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Columna subratllada"
 
 # gal/e-table/e-table-header-item.c:1473
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Columna en negreta"
 
 # gal/e-table/e-table-header-item.c:1477
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Color de la columna"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Color de fons de la columna"
 
@@ -23569,7 +23845,7 @@ msgstr "Camps disponi_bles:"
 # gal/e-table/e-table-config.glade.h:3
 # gal/e-table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Ascendent"
 
@@ -23584,7 +23860,7 @@ msgstr "Neteja-ho _tot"
 # gal/e-table/e-table-config.glade.h:5
 # gal/e-table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Descendent"
 
@@ -23653,16 +23929,16 @@ msgid "_Sort..."
 msgstr "_Ordena..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Codi DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Capçalera completa"
 
@@ -23701,7 +23977,7 @@ msgstr[1] "%s (%d elements)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Alterna els colors de fila"
 
@@ -23709,7 +23985,7 @@ msgstr "Alterna els colors de fila"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Graella de dibuix horitzontal"
@@ -23718,7 +23994,7 @@ msgstr "Graella de dibuix horitzontal"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Graella de dibuix vertical"
@@ -23727,7 +24003,7 @@ msgstr "Graella de dibuix vertical"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Dibuixa el focus"
@@ -23736,7 +24012,7 @@ msgstr "Dibuixa el focus"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Mode del cursor"
 
@@ -23744,7 +24020,7 @@ msgstr "Mode del cursor"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Model de selecció"
 
@@ -23752,8 +24028,8 @@ msgstr "Model de selecció"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Llindar de la longitud"
@@ -23762,8 +24038,8 @@ msgstr "Llindar de la longitud"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Alçada de fila uniforme"
@@ -23776,107 +24052,107 @@ msgid "Frozen"
 msgstr "Aturat"
 
 # gal/e-table/e-table-header-item.c:1444
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Personalitza la visualització actual"
 
 # gal/e-table/e-table-header-item.c:1465
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Ordena en sentit _ascendent"
 
 # gal/e-table/e-table-header-item.c:1466
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Ordena en sentit _descendent"
 
 # gal/e-table/e-table-header-item.c:1467
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "De_sordena"
 
 # gal/e-table/e-table-header-item.c:1469
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Agrupa per aquest _camp"
 
 # gal/e-table/e-table-header-item.c:1470
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Agrupa per _quadre"
 
 # gal/e-table/e-table-header-item.c:1472
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Suprimeix aquesta co_lumna"
 
 # gal/e-table/e-table-header-item.c:1473
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Afegeix una c_olumna..."
 
 # gal/e-table/e-table-header-item.c:1475
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "Ali_neació"
 
 # gal/e-table/e-table-header-item.c:1476
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Aj_ust automàtic"
 
 # gal/e-table/e-table-header-item.c:1477
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Formata les columne_s..."
 
 # gal/e-table/e-table-header-item.c:1479
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Personalit_za la visualització actual..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Ordena per"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Personalitzat"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Descripció del tipus de lletra"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Ordena informació"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Arbre"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Capçalera de la taula"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Model de la taula"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Cerca sempre"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Afegeix amb un clic"
 
@@ -23892,178 +24168,218 @@ msgstr "Aparença retro"
 msgid "Draw lines and +/- expanders."
 msgstr "Dibuixa línies i expansors +/-."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Mètodes d'entrada"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Processador d'esdeveniments"
 
 # gal/widgets/color-palette.c:591
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Negreta"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Ratllat"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Àncora"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Justificació"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Amplada del tall"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Alçada del tall"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Talla"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Emplena el rectangle de tall"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "Desplaçament en X"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Desplaçament en Y"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Amplada de text"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Alçada del text"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Utilitza els punts suspensius"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Punts suspensius"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Ajustament de línia"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Caràcters de trencament"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Màxim de línies"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Dibuixa les cantonades"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Permet les línies noves"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Dibuixa el fons"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Dibuixa el botó"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Posició del cursor"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr "Context de MI"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr "Menú emergent de l'ansa"
 
-#~ msgctxt "New"
-#~ msgid "_Contact"
-#~ msgstr "_Contacte"
+#~ msgid ""
+#~ "We were unable to open this address book.  This either means you have "
+#~ "entered an incorrect URI, or the LDAP server is unreachable."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la llibreta d'adreces perquè l'URI que heu introduït "
+#~ "és incorrecte o el servidor d'LDAP no està disponible."
 
-#~ msgctxt "New"
-#~ msgid "Contact _List"
-#~ msgstr "_Llista de contactes"
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Prova de l'editor d'estil d'impressió de contactes"
 
-#~ msgctxt "New"
-#~ msgid "Address _Book"
-#~ msgstr "Lli_breta d'adreces"
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#~ msgctxt "New"
-#~ msgid "_Appointment"
-#~ msgstr "Cit_a"
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr ""
+#~ "Això hauria de provar el giny d'edició d'estils d'impressió de contactes"
 
-#~ msgctxt "New"
-#~ msgid "M_eeting"
-#~ msgstr "R_eunió"
+#~ msgid "Contact Print Test"
+#~ msgstr "Prova de la impressió de contactes"
 
-#~ msgctxt "New"
-#~ msgid "All Day A_ppointment"
-#~ msgstr "Cita de tot el _dia"
+#~ msgid "This should test the contact print code"
+#~ msgstr "Això hauria de provar el codi d'impressió de contactes"
 
-#~ msgctxt "New"
-#~ msgid "Cale_ndar"
-#~ msgstr "Cale_ndari"
+#~ msgid "Business"
+#~ msgstr "Negocis"
 
-#~ msgctxt "New"
-#~ msgid "Mem_o"
-#~ msgstr "An_otació"
+#~ msgid "Competition"
+#~ msgstr "Competició"
 
-#~ msgctxt "New"
-#~ msgid "_Shared memo"
-#~ msgstr "Anotació _compartida"
+#~ msgid "Favourites"
+#~ msgstr "Preferits"
 
-#~ msgctxt "New"
-#~ msgid "Memo li_st"
-#~ msgstr "Ll_ista d'anotacions"
+#~ msgid "Gifts"
+#~ msgstr "Regals"
 
-#~ msgctxt "New"
-#~ msgid "_Task"
-#~ msgstr "_Tasca"
+#~ msgid "Goals/Objectives"
+#~ msgstr "Fites/Objectius"
 
-#~ msgctxt "New"
-#~ msgid "Assigne_d Task"
-#~ msgstr "Tasca assigna_da"
+#~ msgid "Holiday"
+#~ msgstr "Vacances"
 
-#~ msgctxt "New"
-#~ msgid "Tas_k list"
-#~ msgstr "Llista de tas_ques"
+#~ msgid "Holiday Cards"
+#~ msgstr "Postals"
 
-#~ msgctxt "folder-display"
-#~ msgid "%s (%u)"
-#~ msgstr "%s (%u)"
+#~ msgid "Hot Contacts"
+#~ msgstr "Contactes importants"
+
+#~ msgid "Ideas"
+#~ msgstr "Idees"
+
+#~ msgid "International"
+#~ msgstr "Internacional"
 
-#~ msgctxt "New"
-#~ msgid "_Mail Message"
-#~ msgstr "_Missatge de correu"
+#~ msgid "Key Customer"
+#~ msgstr "Client important"
 
-#~ msgctxt "New"
-#~ msgid "Mail _Folder"
-#~ msgstr "_Carpeta de correu"
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscel·lània"
 
-#~ msgctxt "New"
-#~ msgid "_Test"
-#~ msgstr "P_rova"
+#~ msgid "Next 7 days"
+#~ msgstr "Els propers 7 dies"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Trucades"
+
+#~ msgid "Strategies"
+#~ msgstr "Estratègies"
+
+#~ msgid "Suppliers"
+#~ msgstr "Proveïdors"
+
+#~ msgid "Time &amp; Expenses"
+#~ msgstr "Temps i despeses"
+
+#~ msgid "VIP"
+#~ msgstr "Personalitat"
+
+#~ msgid "Waiting"
+#~ msgstr "En espera"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "Els propers 7 dies"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "A_fegeix un criteri de filtre"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "Temps: parcialment ennuvolat"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "Hauríeu d'introduir el nom d'usuari abans de res."
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Marca el calendari com a desconnectat"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Marca el calendari seleccionat per a veure'l fora de línia."
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "S'ha produït un error en obrir la pàgina web de les PMF."
+
+#~ msgid "Select Importers"
+#~ msgstr "Seleccioneu els importadors"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "Re_fresca..."
 
 #~ msgid "Recent Docu_ments"
 #~ msgstr "Do_cuments recents"
@@ -24336,9 +24652,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "S/MIME Sign"
 #~ msgstr "Signa amb S/MIME"
 
-#~ msgid "Save As"
-#~ msgstr "Anomena i desa"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Desa a la carpeta..."
 
@@ -24420,12 +24733,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Se_lect..."
 #~ msgstr "Se_lecciona..."
 
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Selecciona la carpeta d'esborranys"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Selecciona la carpeta d'elements enviats"
-
 #~ msgid "_Beep when new messages arrive"
 #~ msgstr "Avisa amb un so quan arri_bi correu nou"
 
@@ -25471,9 +25778,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "description of appointment"
 #~ msgstr "ubicació de la cita"
 
-#~ msgid "Dismiss"
-#~ msgstr "Descarta"
-
 #~ msgid "Dismiss All"
 #~ msgstr "Descarta-ho tot"
 
diff --git a/po/de.po b/po/de.po
index bf005fd8fd..87e2605626 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,14 +16,14 @@
 # bcc = Blindkopie
 # send options = Versandoptionen
 #
-#: ../shell/main.c:596
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:48+0100\n"
-"PO-Revision-Date: 2009-01-12 00:38+0100\n"
-"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
+"POT-Creation-Date: 2009-01-16 20:14+0100\n"
+"PO-Revision-Date: 2009-01-16 20:15+0100\n"
+"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -175,7 +175,7 @@ msgstr "%A, %d. %B %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1579
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1584
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -207,7 +207,7 @@ msgstr "%d. %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1595
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1600
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d. %b"
@@ -620,7 +620,7 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1214
+#: ../addressbook/gui/component/addressbook-view.c:1213
 #: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
@@ -681,7 +681,7 @@ msgstr "Auf diesem Computer"
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 #: ../calendar/gui/calendar-component.c:255
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
 #: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
@@ -746,7 +746,7 @@ msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
@@ -757,7 +757,7 @@ msgid "General"
 msgstr "Allgemein"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressbuch"
@@ -852,60 +852,60 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
 
-#: ../addressbook/gui/component/addressbook-view.c:423
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: ../addressbook/gui/component/addressbook-view.c:426
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: ../addressbook/gui/component/addressbook-view.c:431
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/component/addressbook-view.c:952
+#: ../addressbook/gui/component/addressbook-view.c:951
 #: ../calendar/gui/calendar-component.c:660
 #: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
 #: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-calendar-table.c:1609
-#: ../calendar/gui/e-calendar-view.c:1768 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:940
 #: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1340
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/component/addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
-#: ../composer/e-msg-composer.c:1042 ../mail/em-folder-tree.c:2138
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../addressbook/gui/component/addressbook-view.c:1224
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
@@ -977,7 +977,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI des zuletzt im Namenswähler verwendeten Ordners."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste"
 
@@ -1350,7 +1350,7 @@ msgstr "<b>Geschäftlich</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1379,12 +1379,12 @@ msgid "Full _Name..."
 msgstr "_Voller Name …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2475
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Grafik"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
@@ -1397,7 +1397,7 @@ msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
@@ -1415,10 +1415,10 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Geschäftlich"
@@ -1531,15 +1531,15 @@ msgstr "_In:"
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
@@ -1554,976 +1554,976 @@ msgstr "Adresse"
 msgid "Editable"
 msgstr "Editierbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algerien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Österreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien und Herzegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Britisches Territorium im Indischen Ozean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Kapverdische Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Cayman-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tschad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Weihnachtsinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos-(Keeling-)Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komoren"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Demokratische Republik Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinküste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falkland-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Frankreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Französisch-Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Französisch-Polynesian"
 
 # CHECK - Source: Database of program "Ding"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Französische Südpolar-Territorien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard- und McDonald-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Heiliger Stuhl"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Demokratische Volksrepublik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Republik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libyen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Malediven"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldawien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Nördliche Marianen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palästinensisches Autonomiegebiet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Russische Föderation"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "St. Licia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbien und Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Solomon-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre und Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard- und Jan-Mayen-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swasiland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Vereinigte Republik Tansania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad und Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Türkei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks und Caicos-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Britische Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "US-Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis und Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
@@ -2535,41 +2535,41 @@ msgstr "Simbabwe"
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL-Instant-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "_Gadu-Gadu-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:61
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Dienst"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
@@ -2577,41 +2577,41 @@ msgstr "Dienst"
 msgid "Location"
 msgstr "Ort"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:529
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2255
 msgid "Other"
 msgstr "Weitere"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2681,23 +2681,23 @@ msgstr "%s»%s« ist leer"
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
@@ -2850,6 +2850,9 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Auswählen …"
 
@@ -2879,7 +2882,7 @@ msgstr "_Mitglieder"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2937,23 +2940,23 @@ msgstr "Kontakte zusammenführen"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
-#: ../addressbook/gui/widgets/eab-contact-display.c:601
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
 #: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 #: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
@@ -2974,7 +2977,7 @@ msgstr[1] "%d Kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2997,17 +3000,17 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Quelle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:525
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -3019,9 +3022,9 @@ msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-calendar-view.c:1746 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1773 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
@@ -3076,10 +3079,10 @@ msgstr "_Ausschneiden"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1753 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2053 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2104
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1780 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
@@ -3104,7 +3107,7 @@ msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3134,7 +3137,7 @@ msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3142,7 +3145,7 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Firma"
 
@@ -3191,22 +3194,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Vorgesetzter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Spitzname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Notiz"
 
@@ -3235,14 +3238,14 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Position"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Ehepartner"
 
@@ -3412,61 +3415,61 @@ msgstr "Gewählt"
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../mail/em-folder-view.c:2792
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:371
-#: ../addressbook/gui/widgets/eab-contact-display.c:373
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(Karte)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:307
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
-#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "Karte"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:488
-#: ../addressbook/gui/widgets/eab-contact-display.c:848
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../calendar/gui/calendar-commands.c:93
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2497
+#: ../calendar/gui/gnome-cal.c:2496
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3478,48 +3481,48 @@ msgstr "Video-Chat"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Weblog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
-#: ../calendar/gui/e-calendar-view.c:2507
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2534
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
-#: ../calendar/gui/e-calendar-view.c:2508
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2535
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:902
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:910
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Blog"
 
@@ -3575,11 +3578,11 @@ msgstr "Protokoll nicht unterstützt"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2556
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -3590,12 +3593,13 @@ msgstr "Abbrechen gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Legitimation gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
@@ -4094,27 +4098,6 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift …"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Kontakt-Druckstileditortest"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:44
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr "Dies sollte das Kontakt-Druckstileditor-Widget testen"
-
-#: ../addressbook/printing/test-print.c:43
-msgid "Contact Print Test"
-msgstr "Kontaktdrucktest"
-
-#: ../addressbook/printing/test-print.c:46
-msgid "This should test the contact print code"
-msgstr "Dies sollte die Kontaktdruck-Anwendungsroutinen testen"
-
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
@@ -4740,19 +4723,19 @@ msgid "Memo_s"
 msgstr "_Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1808 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:352
-#: ../calendar/gui/memos-control.c:368
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1676 ../calendar/gui/print.c:1983
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
 #: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:484
-#: ../calendar/gui/tasks-control.c:500
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
@@ -4807,9 +4790,9 @@ msgstr "Termine"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
-#: ../calendar/gui/e-itip-control.c:1170
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ort:"
@@ -4843,32 +4826,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4881,7 +4864,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4898,7 +4881,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -5075,53 +5058,67 @@ msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste der Server-URLs für die Veröffentlichung von "
 "Verfügbarkeitsinformationen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farbe der Marcus-Bains-Linie - Tagesansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag endet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Monatsansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Anzahl der Einheiten zur Festlegung einer Vorgabeerinnerung."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 "Anzahl der Einheiten zur Festlegung, wann Aufgaben verborgen werden sollen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Farbe überfälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5130,7 +5127,7 @@ msgstr ""
 "Kalender und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
 "eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5139,7 +5136,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5147,7 +5144,7 @@ msgstr ""
 "Die Position der vertikalen Leiste zwischen der Kalenderliste und dem "
 "Datumsauswahl-Kalender."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5155,7 +5152,7 @@ msgstr ""
 "Die Position der vertikalen Schiebeleiste zwischen der Aufgabenliste und dem "
 "Aufgabenvorschaufeld in Pixel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5164,7 +5161,7 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn die "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5173,69 +5170,79 @@ msgstr ""
 "Datumsnavigator-Kalender und der Aufgabenliste in Pixel, wenn keine "
 "Monatsansicht eingestellt ist."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programme, die als Teil von Alarmen ausgeführt werden können."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Speichern des Ordners für die Alarm-Audiodateien"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
 msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategoriefeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Alarmausgaben im Benachrichtigungsfeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Zeitzonenfeld im Ereignis-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Farbe heute fälliger Aufgaben"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Position der vertikalen Schiebeleiste in der Aufgabenansicht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5245,7 +5252,7 @@ msgstr ""
 "wird durch den Benutzerteil der E-Mail-Adresse und »%d« durch die Domain "
 "ersetzt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5253,7 +5260,11 @@ msgstr ""
 "Die Vorgabezeitzone zur Verwendung für Datum und Zeit im Kalender als "
 "unübersetzer Ort der Olsen-Zeitzonendatenbank, z.B. »Europe/Berlin«."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, fuzzy
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
@@ -5262,20 +5273,20 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "Zeit der letzten Alarmauslösung im »time_t«-Format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5283,43 +5294,43 @@ msgstr ""
 "Transparenz der Ereignisse in der Kalenderansicht; ein Wert zwischen 0 "
 "(transparent) und 1 (deckend)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einheit für eine Vorgabeerinnerung (»minutes«, »hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einheit zur Festlegung, wann Aufgaben verborgen werden sollen (»minutes«, "
 "»hours« oder »days«)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Wochenanfang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "Wochentag von Sonntag (»0«) bis Sonnabend (»6«), mit dem die Woche beginnt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Soll das Benachrichtigungsfeld für Alarmausgaben verwendet werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Soll beim Löschen von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Soll beim Säubern von Terminen oder Aufgaben rückgefragt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5327,97 +5338,97 @@ msgstr ""
 "Sollen Wochenenden in der Monatsansicht komprimiert werden, wobei die Tage "
 "Sonnabend und Sonntag im Raum eines einzelnen Wochentages enthalten sind?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Sollen die Endzeiten von Ereignissen in den Wochen- und Monatsansichten "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender "
 "angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr "Soll eine Vorgabeerinnerung für Termine festgelegt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Soll das Kategoriefeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Soll das Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Soll das Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Sollen Zeiten im 24-Stunden- und nicht im »AM/PM«-Format angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Soll das Zeitzonenfeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
 "werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Sollen die Wochennummern im Datumsnavigator angezeigt werden?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Legt fest, ob die Sommerzeit beim Anzeigen von Terminen beachtet wird."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Arbeitstage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Stunde, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Minute, zu der der Arbeitstag endet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Stunde, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Minute, zu der der Arbeitstag beginnt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "Sommerzeit"
 
@@ -5469,13 +5480,13 @@ msgstr "Aktuelle Termine"
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../calendar/gui/calendar-commands.c:93 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
 
-#: ../calendar/gui/calendar-commands.c:318
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5485,11 +5496,11 @@ msgstr ""
 "sind. Falls Sie fortfahren, können Sie diese Ereignisse nicht "
 "wiederherstellen."
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: ../calendar/gui/calendar-commands.c:329
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
@@ -5655,7 +5666,7 @@ msgstr "Kategorie"
 msgid "Classification"
 msgstr "Einstufung"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
 #: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
@@ -5689,13 +5700,13 @@ msgstr "Existieren"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
 #: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
 #: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
 #: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
@@ -5752,7 +5763,7 @@ msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -5876,25 +5887,53 @@ msgid "A_dd"
 msgstr "_Hinzufügen"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Keine"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Alarme"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "_Feld in Ansicht anzeigen"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5908,7 +5947,7 @@ msgstr ""
 "10 Minuten\n"
 "5 Minuten"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
@@ -5916,52 +5955,52 @@ msgstr ""
 "<i>%u und %d werden durch Benutzername und Domain der E-Mail-Adresse ersetzt."
 "</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<b>Alarme</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<b>Vorgabe-Verfügbarkeits-Server</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<b>Allgemein</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<b>Aufgabenliste</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<b>Zeit</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<b>Arbeitswoche</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "An die Sommer_zeit anpassen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Tag _endet:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5971,13 +6010,13 @@ msgstr ""
 "Stunden\n"
 "Tage"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5995,151 +6034,156 @@ msgstr ""
 "Samstag\n"
 "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_So"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Schicken an:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Kalender für Alarmbenachrichtigung auswählen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "D_o"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "W_oche beginnt am:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten rückfragen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "_Fr"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "_Mo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "S_a"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "Zeit_unterteilungen:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "_Di"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "M_i"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
@@ -6192,50 +6236,50 @@ msgstr "Notizlisteneigenschaften"
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Diese Notiz wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Diese Notiz wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
@@ -6245,23 +6289,23 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2357
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2363
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2370
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
 msgid "Due "
 msgstr "Fällig am "
 
@@ -6272,27 +6316,27 @@ msgstr "Beigelegte Nachricht - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1767
-#: ../composer/e-msg-composer.c:1986
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2105
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3305 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
@@ -6480,7 +6524,7 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1819
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "_Zuletzt geöffnet"
 
@@ -6501,44 +6545,44 @@ msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1968
-#: ../calendar/gui/dialogs/comp-editor.c:2276
+#: ../calendar/gui/dialogs/comp-editor.c:2271
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2082
 #: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1041
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../composer/e-msg-composer.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2298
+#: ../calendar/gui/dialogs/comp-editor.c:2293
 #: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2299
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Durch Drücken der Leertaste wird die Anlagenleiste ein bzw. ausgeblendet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2444
-#: ../calendar/gui/dialogs/comp-editor.c:2492
-#: ../calendar/gui/dialogs/comp-editor.c:3338
+#: ../calendar/gui/dialogs/comp-editor.c:2439
+#: ../calendar/gui/dialogs/comp-editor.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:3333
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3367
+#: ../calendar/gui/dialogs/comp-editor.c:3362
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -6560,56 +6604,56 @@ msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
@@ -6787,25 +6831,6 @@ msgstr[1] "%d Minuten vor dem Termin"
 msgid "Customize"
 msgstr "Anpassen"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2954
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1156 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:370
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:74
-msgid "None"
-msgstr "Keine"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 Tag vor dem Termin"
@@ -6881,7 +6906,7 @@ msgstr "Ko_ntakte …"
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2477
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
 msgid "Memo"
 msgstr "Notiz"
 
@@ -6912,46 +6937,46 @@ msgstr "A_n:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Ereignis vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Sie delegieren ein wiederkehrendes Ereignis. Was möchten Sie delegieren?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
@@ -6964,9 +6989,13 @@ msgstr ""
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "am"
 
@@ -6974,7 +7003,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "erster"
 
@@ -6983,7 +7012,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "zweiter"
 
@@ -6991,7 +7020,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "dritter"
 
@@ -6999,7 +7028,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1010
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "vierter"
 
@@ -7007,13 +7036,13 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -7021,7 +7050,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -7029,7 +7058,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -7037,45 +7066,45 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1061
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "Tag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr "am"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "Treffer"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -7146,54 +7175,54 @@ msgstr "<b>Status</b>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:247
 #: ../calendar/gui/e-cal-model-tasks.c:362
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:944
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2553 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:266
 #: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Hoch"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:244
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2550
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:270
 #: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-component-preview.c:268
 #: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2547
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
@@ -7352,56 +7381,56 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3308
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1216
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Website:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1160
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Fällig am:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1184
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Priorität:"
 
@@ -7421,7 +7450,7 @@ msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -7436,16 +7465,16 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
@@ -7453,12 +7482,12 @@ msgstr "Nein"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1201 ../calendar/gui/e-itip-control.c:1341
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:986
-#: ../calendar/gui/print.c:1003 ../mail/em-utils.c:1341
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
 #: ../plugins/itip-formatter/itip-formatter.c:447
 #: ../plugins/itip-formatter/itip-formatter.c:2138
 #: ../plugins/plugin-manager/plugin-manager.c:89
@@ -7475,7 +7504,7 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Speichern unter …"
 
@@ -7483,19 +7512,19 @@ msgstr "Speichern unter …"
 msgid "Select folder to save selected attachments..."
 msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
 
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1774 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
@@ -7503,7 +7532,7 @@ msgstr "Zum _Hintergrund machen"
 msgid "_Save Selected"
 msgstr "Auswahl _speichern"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen …"
@@ -7514,7 +7543,7 @@ msgstr "* Keine Zusammenfassung *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2368
+#: ../calendar/gui/e-calendar-view.c:2395
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -7522,7 +7551,7 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2372
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
@@ -7580,80 +7609,80 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
 #: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
 #: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:820
+#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1732 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1759 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1752 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1779 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1735
-#: ../calendar/gui/e-calendar-view.c:1754 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: ../calendar/gui/e-calendar-table.c:1847
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -7688,150 +7717,150 @@ msgstr "Anfangsdatum"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2276
-#: ../calendar/gui/e-meeting-list-view.c:562
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1442
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1726
+#: ../calendar/gui/e-calendar-view.c:1753
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-calendar-view.c:1754
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1739
+#: ../calendar/gui/e-calendar-view.c:1766
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1741
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1742
+#: ../calendar/gui/e-calendar-view.c:1769
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-calendar-view.c:1775
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1760
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1763
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1764 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1791 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1796
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1770 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1797 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
-#: ../calendar/gui/e-calendar-view.c:2223
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-calendar-view.c:2250
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
 #: ../plugins/itip-formatter/itip-formatter.c:2126
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-calendar-view.c:2224
-#: ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-calendar-view.c:2251
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
 #: ../plugins/itip-formatter/itip-formatter.c:2132
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-calendar-view.c:2225
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
+#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-calendar-view.c:2226
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/e-calendar-view.c:2253
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
 #: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-calendar-view.c:2227
+#: ../calendar/gui/e-calendar-view.c:2254
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2388 ../calendar/gui/print.c:2509
+#: ../calendar/gui/e-calendar-view.c:2415 ../calendar/gui/print.c:2507
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2422
+#: ../calendar/gui/e-calendar-view.c:2449
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7844,53 +7873,58 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Das Vorschaufeld anzeigen"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1562
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1673
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1567
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:832
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "PM"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: ../calendar/gui/e-itip-control.c:780
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Täglich"
 msgstr[1] "Alle %d Tage"
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Wöchentlich"
 msgstr[1] "Alle %d Wochen"
 
-#: ../calendar/gui/e-itip-control.c:800
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7898,36 +7932,36 @@ msgstr[0] "Wöchentlich am "
 msgstr[1] "Alle %d Wochen am "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:811
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: ../calendar/gui/e-itip-control.c:836
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: ../calendar/gui/e-itip-control.c:847
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "monatlich"
 msgstr[1] "alle %d Monate"
 
-#: ../calendar/gui/e-itip-control.c:859
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Jährlich"
 msgstr[1] "Alle %d Jahre"
 
-#: ../calendar/gui/e-itip-control.c:872
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7936,36 +7970,36 @@ msgstr[1] "insgesamt %d Mal"
 
 # CHECK
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:883
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", endet am "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:905
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Anfang"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:919
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Ende"
 
-#: ../calendar/gui/e-itip-control.c:959
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Fällig"
 
-#: ../calendar/gui/e-itip-control.c:1001 ../calendar/gui/e-itip-control.c:1058
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1018
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: ../calendar/gui/e-itip-control.c:1090 ../calendar/gui/e-itip-control.c:1106
-#: ../calendar/gui/e-itip-control.c:1117 ../calendar/gui/e-itip-control.c:1134
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/itip-formatter/itip-view.c:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7976,7 +8010,7 @@ msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1141
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7984,12 +8018,12 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
-#: ../calendar/gui/e-itip-control.c:1193
+#: ../calendar/gui/e-itip-control.c:1190
 #: ../plugins/itip-formatter/itip-formatter.c:2129
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1281
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7997,276 +8031,276 @@ msgstr ""
 "Die Besprechung wurde abgesagt, konnte jedoch nicht in Ihren Kalendern "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Die Aufgabe wurde abgesagt, konnte jedoch nicht in Ihren Aufgabenlisten "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Teilnahme von %s an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1371
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr ""
 "<b>%s</b> wünscht zu einer existierenden Besprechung hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Besprechungsabsage"
 
-#: ../calendar/gui/e-itip-control.c:1409 ../calendar/gui/e-itip-control.c:1486
-#: ../calendar/gui/e-itip-control.c:1526
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> wünscht, dass %s eine Aufgabe auszuführt."
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe ausführen."
 
-#: ../calendar/gui/e-itip-control.c:1448
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> hat eine Aufgabe abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Aufgabenabsage"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1527
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1603
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: ../calendar/gui/e-itip-control.c:1662
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: ../calendar/gui/e-itip-control.c:1695
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: ../calendar/gui/e-itip-control.c:1733
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: ../calendar/gui/e-itip-control.c:2029
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
 "Teilnehmer hinzufügen?"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2075
 #: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: ../calendar/gui/e-itip-control.c:2109 ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2174
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2254
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2283
-#: ../calendar/gui/e-meeting-list-view.c:550
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-itip-control.c:2325
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../calendar/gui/e-itip-control.c:2384
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2412
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2440
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2468 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -8294,93 +8328,93 @@ msgstr "Kalender wird geladen …"
 msgid "Server Message:"
 msgstr "Server-Nachricht:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:983 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Raum"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1002
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:506
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "In Bearbeitung"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2121
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -8389,7 +8423,7 @@ msgstr "%a, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2152
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -8399,67 +8433,67 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "_Teilnehmer …"
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "_Endzeit:"
 
@@ -8504,16 +8538,16 @@ msgstr ""
 "Fehler bei »%s«:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geöffnet"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht …"
 
@@ -8521,63 +8555,63 @@ msgstr "Gewählte Objekte werden gelöscht …"
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen …"
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1654
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2622
+#: ../calendar/gui/gnome-cal.c:2621
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2623
+#: ../calendar/gui/gnome-cal.c:2622
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2627
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2870
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2885
+#: ../calendar/gui/gnome-cal.c:2879
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2894
+#: ../calendar/gui/gnome-cal.c:2888
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2999
+#: ../calendar/gui/gnome-cal.c:3000
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3967
+#: ../calendar/gui/gnome-cal.c:3968
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8828,7 +8862,7 @@ msgstr "Noti_zliste"
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../calendar/gui/memos-control.c:352 ../calendar/gui/memos-control.c:368
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
@@ -8882,202 +8916,202 @@ msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2473
+#: ../calendar/gui/print.c:2471
 msgid "Appointment"
 msgstr "Termin"
 
-#: ../calendar/gui/print.c:2475
+#: ../calendar/gui/print.c:2473
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/gui/print.c:2500
+#: ../calendar/gui/print.c:2498
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2521
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:2563
+#: ../calendar/gui/print.c:2561
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2580
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:2592
+#: ../calendar/gui/print.c:2590
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:2604
+#: ../calendar/gui/print.c:2602
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:2617
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:2628
+#: ../calendar/gui/print.c:2626
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -9150,7 +9184,7 @@ msgstr "Au_fgabenliste"
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../calendar/gui/tasks-control.c:444
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9163,11 +9197,11 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../calendar/gui/tasks-control.c:447 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
-#: ../calendar/gui/tasks-control.c:484 ../calendar/gui/tasks-control.c:500
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -10812,7 +10846,7 @@ msgstr "S_chließen"
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -11048,18 +11082,18 @@ msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1554
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../composer/e-msg-composer.c:868
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:875
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11067,7 +11101,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1496 ../mail/em-format-html-display.c:1949
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
 #: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -11075,15 +11109,15 @@ msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../composer/e-msg-composer.c:1552
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:2801
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4102
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11291,7 +11325,7 @@ msgid "Evolution Query"
 msgstr "Evolution-Abfrage"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:450
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
@@ -11415,7 +11449,12 @@ msgstr "Datei überschreiben?"
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../e-util/e-util.c:119
+#: ../e-util/e-util.c:127
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Autospeichern-Datei konnte nicht geöffnet werden"
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
@@ -11842,7 +11881,7 @@ msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 msgid "Evolution Network configuration control"
 msgstr "Verwaltung der Netzwerkeinstellungen"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
 #: ../mail/mail-component.c:597 ../mail/mail-component.c:598
 #: ../mail/mail-component.c:767
@@ -12503,13 +12542,13 @@ msgstr "_Suchordner anlegen"
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
 #: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "K_opieren"
 
@@ -12531,173 +12570,173 @@ msgstr "Ordner anlegen"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "Löschen rü_ckgängig"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "Bes_chriftung"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Keine"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht anlegen"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Suchordner über _Betreff"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Suchordner über Abse_nder"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Suchordner über _Empfänger"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Suchordner über Mailing_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Filter über Be_treff"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Filter über Ab_sender"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Filter über Em_pfänger"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
 #: ../plugins/google-account-setup/google-source.c:529
 #: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Nachricht wird abgerufen …"
 
-#: ../mail/em-folder-view.c:2791
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "_Anrufen …"
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2796
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:3289
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:3301
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../mail/em-folder-view.c:3306
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
@@ -13234,17 +13273,17 @@ msgstr ""
 "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "Zum Adressbuch _hinzufügen"
 
@@ -14293,27 +14332,27 @@ msgstr "Evolution-Pine-Importeur"
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
-#: ../mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: ../mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: ../mail/mail-autofilter.c:367
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
@@ -15231,7 +15270,7 @@ msgstr "_Markierung:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -16907,7 +16946,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:592
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -17743,7 +17782,7 @@ msgid "Folder offline"
 msgstr "Ordner offline"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -18300,7 +18339,8 @@ msgstr "Wollen Sie dies ablehnen?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Sie können diesen Ordner nicht mit dem angegebenen Benutzer »{0}« teilen"
+msgstr ""
+"Sie können diesen Ordner nicht mit dem angegebenen Benutzer »{0}« teilen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
 msgid "You have to specify a user name which you want to add to the list"
@@ -18394,7 +18434,8 @@ msgstr "S_chreiben"
 msgid "permission to read|_Read"
 msgstr "_Lesen"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Vertretung"
 
@@ -18402,7 +18443,8 @@ msgstr "Vertretung"
 msgid "<b>Account Name</b>"
 msgstr "<b>Kontoname</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Vertretungsanmeldung"
 
@@ -18856,7 +18898,7 @@ msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Heute"
 
@@ -19859,19 +19901,19 @@ msgstr "Einfacher Textmodus"
 msgid "Prefer plain-text"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
@@ -19883,6 +19925,20 @@ msgstr "Evolution-Profiler"
 msgid "Writes a log of profiling data events."
 msgstr "Schreibt ein Protokoll über Datenereignisse."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "E-Mail von Pine importieren."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Outlook CSV- und Tab-Importeur"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Erlaubt die Veröffentlichung von Kalendern im Internet"
@@ -20516,7 +20572,7 @@ msgstr "Seitenleiste anzeigen"
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -20777,19 +20833,15 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Fehler beim Öffnen der FAQ-Webseite."
-
-#: ../shell/e-shell-window-commands.c:1174
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-commands.c:1200
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -20818,28 +20870,28 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Unbekannter Systemfehler."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
@@ -20903,7 +20955,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20942,7 +20994,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20950,43 +21002,43 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:490
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:492
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:607
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -23109,16 +23161,16 @@ msgid "_Replace existing view"
 msgstr "Vorhandene Ansicht erset_zen"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 #: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Benutzerdefinierte Ansicht speichern"
 
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:586
 #: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Ansichten definieren …"
@@ -23168,7 +23220,7 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Anlagenleiste"
 
@@ -23268,16 +23320,16 @@ msgstr "Mindestbreite"
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Jetzt"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
-#: ../widgets/misc/e-cell-percent.c:78
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
@@ -23737,7 +23789,7 @@ msgstr "_Alle Informationen"
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
-msgstr "Ver_zögerungsnachricht zustellen"
+msgstr "Nachrichtenzustellung ver_zögern"
 
 #: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
@@ -24273,6 +24325,24 @@ msgstr "EM-Kontext"
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "Kontakt-Druckstileditortest"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "Dies sollte das Kontakt-Druckstileditor-Widget testen"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "Kontaktdrucktest"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "Dies sollte die Kontaktdruck-Anwendungsroutinen testen"
+
+#~ msgid "Error opening the FAQ webpage."
+#~ msgstr "Fehler beim Öffnen der FAQ-Webseite."
+
 #~ msgid ""
 #~ "We were unable to open this address book.  This either means you have "
 #~ "entered an incorrect URI, or the LDAP server is unreachable."
diff --git a/po/es.po b/po/es.po
index e1dd515d08..9438188105 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2009-01-13 12:25+0000\n"
-"PO-Revision-Date: 2009-01-14 20:10+0100\n"
+"POT-Creation-Date: 2009-01-19 17:15+0000\n"
+"PO-Revision-Date: 2009-01-19 19:20+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -171,7 +171,7 @@ msgstr "%A, %e de %b de %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1578
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
@@ -203,7 +203,7 @@ msgstr "%e de %B de %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1594
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%e de %b"
@@ -745,7 +745,7 @@ msgstr "Copiar la li_breta localmente para trabajar desconectado"
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2466
+#: ../plugins/itip-formatter/itip-formatter.c:2532
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
@@ -881,7 +881,7 @@ msgstr "_Renombrar…"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/calendar-component.c:663
 #: ../calendar/gui/e-calendar-table.c:1610
-#: ../calendar/gui/e-calendar-view.c:1768 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
 #: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
 #: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
@@ -892,7 +892,7 @@ msgstr "_Borrar"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/comp-editor.c:2084
 #: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
 #: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
@@ -975,7 +975,7 @@ msgstr ""
 "nombres."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Vertical pane position"
 msgstr "Posición del panel vertical"
 
@@ -1442,7 +1442,7 @@ msgstr "_Cumpleaños:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1868
+#: ../plugins/itip-formatter/itip-view.c:1893
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -2589,7 +2589,7 @@ msgstr "Domicilio"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2259
 msgid "Other"
 msgstr "Otro"
 
@@ -2848,7 +2848,7 @@ msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
 #: ../calendar/gui/e-day-view-time-item.c:815
 #: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
@@ -3019,9 +3019,9 @@ msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/dialogs/comp-editor.c:2082
 #: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1746 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -3077,7 +3077,7 @@ msgstr "Cor_tar"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:487
 #: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1753 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
 #: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
 #: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
@@ -3465,7 +3465,7 @@ msgstr "Charla por vídeo"
 #: ../addressbook/gui/widgets/eab-contact-display.c:628
 #: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2496
+#: ../calendar/gui/gnome-cal.c:2512
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3501,12 +3501,12 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2507
+#: ../calendar/gui/e-calendar-view.c:2538
 msgid "Birthday"
 msgstr "Cumpleaños"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2508
+#: ../calendar/gui/e-calendar-view.c:2539
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -3578,7 +3578,7 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3589,12 +3589,13 @@ msgstr "No es posible cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Autenticación requerida"
 
@@ -4630,7 +4631,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2523
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -4677,16 +4678,16 @@ msgid "Memo_s"
 msgstr "_Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
 #: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
 #: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
 #: ../calendar/gui/tasks-component.c:577
 #: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
 #: ../calendar/gui/tasks-control.c:498
@@ -4747,7 +4748,7 @@ msgstr "Citas"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1614
 #: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -4760,7 +4761,7 @@ msgid "_Dismiss"
 msgstr "_Descartar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -5186,10 +5187,17 @@ msgstr ""
 "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#| msgid "Show week numbers in date navigator"
+msgid "Show week number in Day and Work Week View"
+msgstr ""
+"Mostrar los números de las semanas en las Vistas diaria y Vista de la semana "
+"laboral"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5197,15 +5205,15 @@ msgstr ""
 "Muestra la segunda zona horaria en la Vista diaria, si está establecido. El "
 "valor es similar al usado en la clave «timezone»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Tasks vertical pane position"
 msgstr "Posición del panel vertical de tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5215,7 +5223,7 @@ msgstr ""
 "reemplaza por la parte del usuario de la dirección de correo y %d se "
 "reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5224,11 +5232,11 @@ msgstr ""
 "calendario, como una localización sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"América/Nueva York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "The second timezone for a Day View"
 msgstr "La segunda zona horaria para una Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5236,20 +5244,20 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
 "para mensajes de depuración."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alerta sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Zona horaria "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5257,46 +5265,46 @@ msgstr ""
 "Transparencia de los acontecimientos en las vistas del calendario, un valor "
 "entre 0 (transparente) y 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5304,102 +5312,109 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
 "al domingo en el mismo espacio que un día laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Zona horaria» en el editor de "
 "acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr ""
+"Indica si debe mostrar los números de la semana en la Vista diaria y en la "
+"Vista de la semana laboral."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indica si debe mostrar los números de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to use daylight savings time while displaying events."
 msgstr ""
 "Indica si se deben usar la hora del horario de verano al mostrar eventos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "daylight savings time"
 msgstr "Hora de verano"
 
@@ -5636,7 +5651,7 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
 #: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Confidencial"
@@ -5670,13 +5685,13 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
 #: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
@@ -5732,7 +5747,7 @@ msgstr "Método no soportado al abrir el calendario"
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir el calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -5871,8 +5886,8 @@ msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/event-page.c:2954
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
@@ -5886,19 +5901,18 @@ msgstr "Adjuntar archivo(s)"
 #: ../plugins/email-custom-header/email-custom-header.c:370
 #: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../plugins/itip-formatter/itip-formatter.c:2179
 #: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
 #: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Ninguno"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#| msgid "Show _field in View"
 msgid "(Shown in a Day View)"
 msgstr "(Mostrado en la Vista diaria)"
 
@@ -6020,7 +6034,6 @@ msgid "Saturday"
 msgstr "sábado"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#| msgid "Send To:"
 msgid "Se_cond zone:"
 msgstr "Zona se_cundaria:"
 
@@ -6033,127 +6046,143 @@ msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#| msgid "Sh_ow a reminder"
+msgid "Show a _reminder"
+msgstr "Mostrar un _recordatorio"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#| msgid "Show week numbers in date navigator"
+msgid "Show week n_umber in Day and Work Week View"
+msgstr ""
+"Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la "
+"semana laboral"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "T_hu"
 msgstr "_Jue"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "miércoles"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Wee_k starts on:"
 msgstr "La _semana empieza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Fri"
 msgstr "_Vie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Wed"
 msgstr "M_ié"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr "antes de cada aniversario/cumpleaños"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -6261,23 +6290,23 @@ msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
 msgid " (Completed "
 msgstr "(Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
 msgid "Due "
 msgstr "Vence "
 
@@ -6308,7 +6337,7 @@ msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
 #: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
@@ -6318,210 +6347,210 @@ msgstr "adjunto"
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:953
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:955
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:960
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Keep original item?"
 msgstr "¿Mantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1326
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1340
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1374
+#: ../calendar/gui/dialogs/comp-editor.c:1375
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1416 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Click here to attach a file"
 msgstr "Pulse aquí para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la «Zona horaria»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1457
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1462
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1464
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
+#: ../calendar/gui/dialogs/comp-editor.c:1470
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1471
+#: ../calendar/gui/dialogs/comp-editor.c:1472
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1479
+#: ../calendar/gui/dialogs/comp-editor.c:1480
 msgid "R_ole Field"
 msgstr "Campo «_Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1482
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1487
+#: ../calendar/gui/dialogs/comp-editor.c:1488
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
+#: ../calendar/gui/dialogs/comp-editor.c:1490
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Confirmar»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1495
+#: ../calendar/gui/dialogs/comp-editor.c:1496
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1497
+#: ../calendar/gui/dialogs/comp-editor.c:1498
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Estado»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1503
+#: ../calendar/gui/dialogs/comp-editor.c:1504
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1505
+#: ../calendar/gui/dialogs/comp-editor.c:1506
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../calendar/gui/dialogs/comp-editor.c:1820
 #: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../calendar/gui/dialogs/comp-editor.c:1839
 #: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1933
+#: ../calendar/gui/dialogs/comp-editor.c:1934
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> adjunto"
 msgstr[1] "<b>%d</b> adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1965
+#: ../calendar/gui/dialogs/comp-editor.c:1966
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1968
-#: ../calendar/gui/dialogs/comp-editor.c:2271
+#: ../calendar/gui/dialogs/comp-editor.c:1969
+#: ../calendar/gui/dialogs/comp-editor.c:2272
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #: ../calendar/gui/dialogs/event-page.c:1876
 #: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -6530,30 +6559,30 @@ msgstr "Mostrar _barra de adjuntos"
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../calendar/gui/dialogs/comp-editor.c:2086
 #: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 #: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../calendar/gui/dialogs/comp-editor.c:2295
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2439
-#: ../calendar/gui/dialogs/comp-editor.c:2487
-#: ../calendar/gui/dialogs/comp-editor.c:3333
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2488
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3362
+#: ../calendar/gui/dialogs/comp-editor.c:3363
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6870,7 +6899,7 @@ msgstr "_Contactos…"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
 msgid "Memo"
 msgstr "Nota"
 
@@ -7114,6 +7143,10 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr "Enviar mis alarmas con este evento"
+
 #: ../calendar/gui/dialogs/task-details-page.c:377
 #: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
@@ -7140,7 +7173,7 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-calendar-table.c:237
 #: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Terminado"
@@ -7158,7 +7191,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
 msgid "In Progress"
 msgstr "En proceso"
 
@@ -7171,7 +7204,7 @@ msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
@@ -7181,7 +7214,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
@@ -7384,7 +7417,7 @@ msgstr "Fecha de vencimiento:"
 #: ../calendar/gui/e-cal-component-preview.c:240
 #: ../calendar/gui/e-itip-control.c:1181
 #: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Status:"
 msgstr "Estado:"
 
@@ -7422,7 +7455,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:745
@@ -7430,7 +7463,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7438,7 +7471,7 @@ msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
 #: ../calendar/gui/e-meeting-list-view.c:166
@@ -7447,18 +7480,18 @@ msgstr "No"
 #: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
 #: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
 #: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2204
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:987
+#: ../calendar/gui/e-cal-model.c:1008
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:989
+#: ../calendar/gui/e-cal-model.c:1010
 msgid "Assigned"
 msgstr "Asignado"
 
@@ -7476,7 +7509,7 @@ msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Guardar _como…"
@@ -7501,7 +7534,7 @@ msgstr "* Sin resumen *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2368
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -7509,7 +7542,7 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2372
+#: ../calendar/gui/e-calendar-view.c:2403
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
@@ -7567,23 +7600,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
 #: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Guardar como…"
 
 #: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
@@ -7592,20 +7625,20 @@ msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1732 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
 #: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1752 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
 #: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1735
-#: ../calendar/gui/e-calendar-view.c:1754 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
@@ -7675,7 +7708,7 @@ msgstr "Fecha de inicio"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2307
 #: ../calendar/gui/e-meeting-list-view.c:561
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
@@ -7683,127 +7716,127 @@ msgstr "Fecha de inicio"
 msgid "Status"
 msgstr "Estado"
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1446
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1726
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-view.c:1757
 msgid "New _Meeting"
 msgstr "_Reunión nueva"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1739
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "_Current View"
 msgstr "Vista _actual"
 
-#: ../calendar/gui/e-calendar-view.c:1741
+#: ../calendar/gui/e-calendar-view.c:1770
 msgid "Select T_oday"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1742
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha…"
 
-#: ../calendar/gui/e-calendar-view.c:1748
+#: ../calendar/gui/e-calendar-view.c:1777
 msgid "Pri_nt..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1759
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1760
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1761
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1791
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1763
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1764 ../mail/em-folder-view.c:1327
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
 #: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1769
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1770 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: ../calendar/gui/e-calendar-view.c:2223
+#: ../calendar/gui/e-calendar-view.c:2254
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:2192
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-view.c:2255
 #: ../calendar/gui/e-itip-control.c:1194
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2132
+#: ../plugins/itip-formatter/itip-formatter.c:2198
 msgid "Declined"
 msgstr "Rehusado"
 
-#: ../calendar/gui/e-calendar-view.c:2225
+#: ../calendar/gui/e-calendar-view.c:2256
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2257
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../plugins/itip-formatter/itip-formatter.c:2201
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:2227
+#: ../calendar/gui/e-calendar-view.c:2258
 msgid "Needs action"
 msgstr "Necesita una acción"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2388 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2422
+#: ../calendar/gui/e-calendar-view.c:2453
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7837,7 +7870,6 @@ msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
 
 #: ../calendar/gui/e-day-view-time-item.c:771
-#| msgid "Show the \"Preview\" pane"
 msgid "Show the second time zone"
 msgstr "Muestra la segunda zona horaria"
 
@@ -7847,23 +7879,30 @@ msgstr "Muestra la segunda zona horaria"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:801 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
 #: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
 #: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+#| msgid "Week"
+msgid "Week %d"
+msgstr "Semana %d"
+
 #: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
@@ -7956,12 +7995,12 @@ msgstr "Error de iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
@@ -7975,7 +8014,7 @@ msgstr ""
 "abajo."
 
 #: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2195
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -8198,7 +8237,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
@@ -8491,16 +8530,16 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abriendo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados…"
 
@@ -8508,16 +8547,16 @@ msgstr "Borrando los objetos seleccionados…"
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Terminando tareas…"
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Compactando"
 
@@ -8528,43 +8567,43 @@ msgstr "Seleccione la zona horaria"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
 msgid "%d %B"
 msgstr "%e de %B"
 
-#: ../calendar/gui/gnome-cal.c:2621
+#: ../calendar/gui/gnome-cal.c:2637
 msgid "_Custom View"
 msgstr "Vista _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2622
+#: ../calendar/gui/gnome-cal.c:2638
 msgid "_Save Custom View"
 msgstr "_Guardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2627
+#: ../calendar/gui/gnome-cal.c:2643
 msgid "_Define Views..."
 msgstr "_Definir vistas…"
 
-#: ../calendar/gui/gnome-cal.c:2869
+#: ../calendar/gui/gnome-cal.c:2880
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2884
+#: ../calendar/gui/gnome-cal.c:2895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2893
+#: ../calendar/gui/gnome-cal.c:2904
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2998
+#: ../calendar/gui/gnome-cal.c:3016
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3966
+#: ../calendar/gui/gnome-cal.c:3984
 msgid "Purging"
 msgstr "Compactando"
 
@@ -9020,49 +9059,49 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2471
+#: ../calendar/gui/print.c:2478
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2473
+#: ../calendar/gui/print.c:2480
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2498
+#: ../calendar/gui/print.c:2505
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2521
+#: ../calendar/gui/print.c:2528
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2561
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2578
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2590
+#: ../calendar/gui/print.c:2597
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/print.c:2609
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2622
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2626
+#: ../calendar/gui/print.c:2633
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -9182,7 +9221,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1723
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -11954,14 +11993,26 @@ msgstr "Firma(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
+"mensaje."
+
+#: ../mail/em-composer-utils.c:1608
+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/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11969,7 +12020,7 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
@@ -15368,26 +15419,26 @@ msgstr "Esperando…"
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:258
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
@@ -16114,7 +16165,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
@@ -18259,7 +18310,8 @@ msgstr "_Escribir"
 msgid "permission to read|_Read"
 msgstr "_Lectura"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -18267,7 +18319,8 @@ msgstr "Proxy"
 msgid "<b>Account Name</b>"
 msgstr "<b>Nombre de la cuenta</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Sesión proxy"
 
@@ -18539,119 +18592,119 @@ msgstr "No es posible cargar el calendario «%s»"
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:662
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:748
+#: ../plugins/itip-formatter/itip-formatter.c:759
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:763
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:767
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:827
+#: ../plugins/itip-formatter/itip-formatter.c:838
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1054
+#: ../plugins/itip-formatter/itip-formatter.c:1107
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1066
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1075
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1080
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1174
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1181
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1236
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1289
+#: ../plugins/itip-formatter/itip-formatter.c:1342
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1318
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1322
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1354
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18659,15 +18712,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1490
-#: ../plugins/itip-formatter/itip-formatter.c:1518
-#: ../plugins/itip-formatter/itip-formatter.c:1600
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1519
-#: ../plugins/itip-formatter/itip-formatter.c:1601
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18675,11 +18728,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1530
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1531
+#: ../plugins/itip-formatter/itip-formatter.c:1584
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18687,228 +18740,228 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2240
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2243
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2246
+#: ../plugins/itip-formatter/itip-formatter.c:2312
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:2548
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2492
-#: ../plugins/itip-formatter/itip-formatter.c:2524
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2507
+#: ../plugins/itip-formatter/itip-formatter.c:2573
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Mañana"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A, %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Responda en nombre de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recibido en nombre de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita su presencia en la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18917,91 +18970,91 @@ msgstr ""
 "<b>%s</b> desea recibir la última información de la siguiente reunión a "
 "través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 "<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> ha cancelado la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ha cancelado la reunión siguiente."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> ha propuesto los cambios siguientes para la reunión a través de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ha rehusado los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ha publicado la tarea siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado una tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -19010,7 +19063,7 @@ msgstr ""
 "<b>%s</b> desea recibir la última información para la siguiente tarea "
 "asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -19019,7 +19072,7 @@ msgstr ""
 "<b>%s</b> quiere recibir la última información para la siguiente tarea "
 "asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -19027,23 +19080,23 @@ msgstr ""
 "<b>%s</b> ha devuelto la siguiente respuesta a la tarea asignada a través de "
 "%s:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -19051,143 +19104,152 @@ msgstr ""
 "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas a "
 "través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ha publicado la siguiente nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ha publicado la nota siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> desea añadir algo a una nota existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:543
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> desea añadir algo a una nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ha cancelado la siguiente nota compartida a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ha cancelado la siguiente nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:820
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-msgid "_Decline"
-msgstr "_Rehusar"
-
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:826
 #: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
 #: ../plugins/itip-formatter/itip-view.c:853
 #: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "_Rehusar"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Decline all"
 msgstr "_Rehusar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1870
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "Conser_var mi recordatorio"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "_Heredar recordatorio"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
 msgid "_Tasks :"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1872
+#: ../plugins/itip-formatter/itip-view.c:1897
 msgid "Memos :"
 msgstr "Notas:"
 
@@ -19720,19 +19782,19 @@ msgstr "Modo de texto sin formato"
 msgid "Prefer plain-text"
 msgstr "Preferir texto sin formato"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Mostrar HTML si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Preferir sin formato"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Sólo mostrar sin formato"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19744,6 +19806,18 @@ msgstr "Perfilador de Evolution"
 msgid "Writes a log of profiling data events."
 msgstr "Escribe un registro perfilando los datos de los eventos."
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importar mensajes de Outlook desde un archivo PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Importador PST de Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Carpetas personales de Outlook (.pst)"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Permite publicar calendarios en la web"
diff --git a/po/he.po b/po/he.po
index c15cc3f3c4..57eb0c409b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4,12 +4,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Gil Osher <dolfin@rpg.org.il>, 2004.
 #
-#: ../shell/main.c:589
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-30 11:43+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2009-01-15 14:48+0000\n"
 "PO-Revision-Date: 2008-08-28 15:33+0200\n"
 "Last-Translator: Mark Krapivner <mark125@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -21,22 +22,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "ספר הכתובות של Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "איש קשר חדש"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, fuzzy, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -59,64 +59,64 @@ msgstr "איש קשר:"
 msgid "evolution minicard"
 msgstr "כרטיסים קטנים של Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 #, fuzzy
 msgid "It has recurrences."
 msgstr "מופע חוזר"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "אירוע יומן: הסיכום הוא %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "אירוע יומן: אין סיכום."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "תפוס פוקוס"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "פגישה חדשה"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "אירוע חדש לכל היום"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "ישיבה חדשה"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "לך אל היום"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "לך אל תאריך"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -125,14 +125,14 @@ msgstr[1] ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr ""
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "תצוגת שבוע עבודה: %s. %s"
@@ -140,21 +140,21 @@ msgstr "תצוגת שבוע עבודה: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "תצוגת יום: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr ""
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -165,18 +165,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -184,10 +184,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:827
+#: ../calendar/gui/calendar-component.c:834
+#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:842
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -197,15 +197,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1600
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "יומן Gnome"
 
@@ -226,79 +226,79 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr "לחץ כאן, אפשר למצוא אירועים נוספים."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "תצוגת חודש: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "תצוגת שבוע: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr ""
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr ""
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 #, fuzzy
 msgid "edit"
 msgstr "_עריכה"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 #, fuzzy
 msgid "toggle"
 msgstr "תפקיד"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "הרחב"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "תא בטבלה"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "לחץ כאן כדי להוסיף"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "לחץ"
 
@@ -307,17 +307,17 @@ msgstr "לחץ"
 msgid "sort"
 msgstr "מבנה"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "יומן: מ-%s ועד %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 #, fuzzy
 msgid "evolution calendar item"
 msgstr "פריט יומן evolution"
@@ -381,12 +381,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
-msgstr ""
+msgstr "לא ניתן לקבל מידע סכימה עבור שרת LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
 msgid "Could not remove address book."
-msgstr "לא ניתן להסיר ספר כתובות."
+msgstr "לא ניתן להסיר את ספר הכתובות."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
@@ -400,9 +399,8 @@ msgid "Delete address book '{0}'?"
 msgstr "למחוק את ספר הכתובות '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#, fuzzy
 msgid "Error loading address book."
-msgstr "שגיאה בזמן טעינת ספר הכתובות."
+msgstr "שגיאה בטעינת ספר הכתובות."
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
@@ -414,7 +412,7 @@ msgstr ""
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "נכשל במחיקת איש קשר"
 
@@ -427,6 +425,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "גירסת שרת"
 
@@ -452,9 +451,8 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:24
-#, fuzzy
 msgid "This address book could not be opened."
-msgstr "ספר הכתובות לא יכל להיפתח."
+msgstr "ספר כתובות זה לא יכל להיפתח."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book server does not have any suggested search bases."
@@ -475,7 +473,6 @@ msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:29
-#, fuzzy
 msgid "Unable to open address book"
 msgstr "לא ניתן לפתוח את ספר הכתובות"
 
@@ -520,7 +517,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -545,7 +542,7 @@ msgstr ""
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -554,22 +551,22 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
-msgstr ""
+msgstr "כתובת סנכרון ברירת מחדל:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
-#, fuzzy
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
-msgstr "לא ניתן לטעון ספר כתובות"
+msgstr "לא ניתן לטעון את ספר הכתובות"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
 msgid "Autocompletion"
 msgstr "השלמה אוטומטית"
 
@@ -587,10 +584,10 @@ msgstr "הגדר את ההשלמה האוטומטית כאן"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "אנשי קשר"
 
@@ -615,9 +612,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution Address Book component"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
 msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/MIME Certificate Management Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -629,15 +625,15 @@ msgstr "Manage your S/MIME certificates here"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:244
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "במחשב זה"
 
@@ -646,139 +642,138 @@ msgstr "במחשב זה"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "אישי"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "על שרתי LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "איש _קשר"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "צור איש קשר חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_רשימת אנשי קשר"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "צור רשימת תפוצה חדשה"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ספר _כתובות"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "צור ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "בסיס"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_סוג:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2466
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "כללי"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "ספר כתובות"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "מידע על השרת"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "הזדהות"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "פרטים"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "מחפש"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "מוריד"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "מאפייני ספר הכתובות"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
-#, fuzzy, c-format
+#, c-format
 msgid "Migrating '%s':"
-msgstr "מייבא `%s'"
+msgstr "ממיר את '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "שרתי LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "הגדרות השלמה אוטומטית"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -786,75 +781,82 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:502
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "החלף את שם התיקייה \"%s\" ל:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "החלף את שם התיקייה"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:510
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "שם התיקייה לא יכול להכיל את התו '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
 #, fuzzy
 msgid "Save As vCard..."
 msgstr "שמור בשם..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_שנה שם..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1768 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_מחק"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_מאפיינים"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr ""
 
@@ -863,21 +865,21 @@ msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "הכנס סיסמה ל-%s (משתמש %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "הכנס סיסמה"
 
@@ -902,10 +904,14 @@ msgstr ""
 "preview pane, in pixels."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Show preview pane"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -913,23 +919,38 @@ msgstr ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialog"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for the folder last used in the select names dialog."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Vertical pane position"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Whether to show the preview pane."
 
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+#, fuzzy
+msgid "Look up in address books"
+msgstr "ספר הכתובות של אבולוציה"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -971,7 +992,7 @@ msgid "Add Address Book"
 msgstr "ספר כתובות חדש"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "תמיד"
 
@@ -1010,14 +1031,14 @@ msgid "Lo_gin:"
 msgstr "ה_תחבר:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "אף פעם"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "ללא הצפנה"
 
@@ -1029,7 +1050,7 @@ msgstr "אחד"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "הצפנת SSL"
 
@@ -1088,7 +1109,7 @@ msgstr ""
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "הצפנת TLS"
 
@@ -1108,8 +1129,12 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
+#| msgid ""
+#| "This is the full name of your ldap server. For example, \"ldap.mycompany."
+#| "com\"."
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "זהו השם המלא של שרת ה-ldap שלך. לדוגמא: \"ldap.mycompany.com\"."
 
@@ -1122,7 +1147,7 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 
@@ -1168,8 +1193,8 @@ msgid "_Login method:"
 msgstr "שיטת ה_תחברות:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:178
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1184,7 +1209,7 @@ msgid "_Search scope:"
 msgstr "_טווח חיפוש:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_שרת:"
@@ -1202,13 +1227,14 @@ msgid "cards"
 msgstr "כרטיסים"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
 msgstr "דקות"
 
@@ -1249,8 +1275,8 @@ msgid "<b>Work</b>"
 msgstr "<b>עבודה</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1261,16 +1287,16 @@ msgid "Ca_tegories..."
 msgstr "_קטגוריות..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "איש קשר"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "עורך אנשי הקשר"
 
@@ -1279,6 +1305,7 @@ msgid "Full _Name..."
 msgstr "_שם מלא..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "תמונה"
 
@@ -1297,155 +1324,160 @@ msgstr "_כינוי:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#| msgid "Novell Groupwise"
+msgid "Novell GroupWise"
+msgstr "Novell Groupwise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "מידע אישי"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "טלפון"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "עבודה"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_כתובת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "יום _שנה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "עו_זר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "יום _הולדת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "לוח _שנה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "עי_ר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "חברה_:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "אר_ץ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "מחל_קה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_תייק תחת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "פנוי/ע_סוק:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "דף ה_בית:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "מ_נהל:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "הע_רות:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "משר_ד:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_תא דואר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "מ_קצוע:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "ב_ן זוג:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_מדינה/אזור:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "כ_ותרת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "שיחת ויד_או:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "רוצה לקבל דואר H_TML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_איפה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "מי_קוד:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "כתובת"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "ניתן לעריכה"
 
@@ -2418,13 +2450,13 @@ msgid "Zimbabwe"
 msgstr "זימבבווה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "שם"
@@ -2434,8 +2466,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2448,145 +2480,153 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#| msgid "Type"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "שרות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "מיקום"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "בית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2228
 msgid "Other"
 msgstr "אחר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "ספר מקור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "ספר מטרה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "האם איש קשר חדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "שדות ניתנים לכתיבה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "שדות דרושים"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "שונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "עורך אנשי הקשר - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "אנא בחר תמונה בעבור איש קשר זה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "ללא _תמונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "איש קשר שגוי."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_שם מלא"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "דוא\"ל"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_בחר ספר כתובות"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2595,7 +2635,7 @@ msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2603,7 +2643,7 @@ msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק רשימות אנשי קשר אלה?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2612,7 +2652,7 @@ msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק את איש הקשר (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2719,9 +2759,9 @@ msgstr "שירות מ_סרים מידיים:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_מיקום:"
 
@@ -2730,11 +2770,14 @@ msgid "<b>Members</b>"
 msgstr "<b>חברים</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "עורף אנשי קשר"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "בחר..."
 
@@ -2750,25 +2793,25 @@ msgstr "שם _רשימה:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "חברי רשימת קשר"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "חברים_"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "ספר"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr ""
 
@@ -2806,33 +2849,33 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_מזג"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "מזג איש קשר"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "דוא\"ל"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "כל שדה מכיל"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "דוא\"ל מתחיל ב"
 
@@ -2840,68 +2883,68 @@ msgstr "דוא\"ל מתחיל ב"
 msgid "Name contains"
 msgstr "השם מכיל"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "אין אנשי קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "איש קשר אחד"
 msgstr[1] "%d אנשי קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "שאילתה"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "שגיאה בקבלת תצוגת ספר"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "מודל"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "שגיאה בשינוי כרטיס"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "השם מתחיל ב"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "מקור"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "סוג"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 #, fuzzy
 msgid "Save as vCard..."
 msgstr "שמור בשם..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1746 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_פתח"
@@ -2956,12 +2999,12 @@ msgid "Cu_t"
 msgstr "ג_זור"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1753 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -2972,20 +3015,20 @@ msgid "P_aste"
 msgstr "ה_דבק"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "כל קטגוריה"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "תקלה אחרת"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "עוזר"
 
@@ -3015,7 +3058,7 @@ msgstr "טלפון ברכב"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3023,7 +3066,7 @@ msgid "Categories"
 msgstr "קטגוריות"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "חברה"
 
@@ -3072,22 +3115,22 @@ msgid "Journal"
 msgstr "יומן"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "מנהל"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "טלפון סלולרי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "כינוי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "הערה"
 
@@ -3116,14 +3159,14 @@ msgid "Radio"
 msgstr "רדיו"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "בן זוג"
 
@@ -3153,63 +3196,63 @@ msgstr "יחידה"
 msgid "Web Site"
 msgstr "אתר ברשת"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "רוחב"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "גובה"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "יש פוקוס"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "שדה"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "שם שדה"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "מודל טקסט"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "רוחב עמודה"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3219,7 +3262,7 @@ msgstr ""
 "\n"
 "מחפש את אנשי הקשר..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3233,7 +3276,7 @@ msgstr ""
 "\n"
 "או לחץ לחיצה כפולה כאן כדי ליצור איש קשר חדש."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3242,7 +3285,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3252,7 +3295,7 @@ msgstr ""
 "\n"
 "חפש את איש הקשר."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3262,284 +3305,281 @@ msgstr ""
 "\n"
 "אין פריטים להראות בתצוגה זאת."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "מתאם"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "דוא\"ל עבודה"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "דוא\"ל בית"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "דוא\"ל אחר"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "נבחר"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "יש סמן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_פתח את הקישור בדפדפן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_העתק את מיקום הקישור"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "ש_לח הודעה ל..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "העתק _כתובת דוא\"ל"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(מפה)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "מפה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "רשימת חברים"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "מחלקה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "מקצוע"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "עמדה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "שיחת וידאו"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2496
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "יומן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:113
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "פנוי/עסוק"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "טלפון"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "פקס"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "דף הבית"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "יומן רשת"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2507
 msgid "Birthday"
 msgstr "יום הולדת"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2508
 msgid "Anniversary"
 msgstr "יום שנה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "כותרת תפקיד"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "דף הבית"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "ב-לוג"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "הצלחה"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "מנוע עסוק"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "המאגר לא מקוון"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "ספר הכתובות לא קיים"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "לא הוגדר איש קשר עצמי"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "אין הרשאות"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "איש הקשר לא נמצא"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "פרוטוקול לא נתמך"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
 msgid "Canceled"
 msgstr "בוטל"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "לא ניתן לבטל"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "ההזדהות נכשלה"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "הזדהות נדרשת"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS לא זמין"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "אין מקור כזה"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "לא זמין במצב לא מקוון"
 
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "תקלה אחרת"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "גירסץ שרת לא תקינה"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "שיטת הזדהות לא נתמכת"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
-msgstr ""
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:132
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:138
-msgid "Detailed error:"
-msgstr "פרטי שגיאה:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#| msgid "Detailed error:"
+msgid "Detailed error message:"
+msgstr "הודעת שגיאה מפורטת:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3547,55 +3587,55 @@ msgid ""
 "the directory server preferences for this address book."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 #, fuzzy
 msgid "The backend for this address book was unable to parse this query."
 msgstr "המנוע של ספר כתובות זה סרב לבצע את שאילתה זאת."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:176
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 #, fuzzy
 msgid "The backend for this address book refused to perform this query."
 msgstr "המנוע של ספר כתובות זה סרב לבצע את שאילתה זאת."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "השאילתה לא הסתיימה בהצלחה."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "שגיאה בהוספת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
-#: ../addressbook/gui/widgets/eab-gui-util.c:677
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "שגיאה בהוספת איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "שגיאה בשינוי רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "שגיאה בשינוי איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "שגיאה בהסרת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#: ../addressbook/gui/widgets/eab-gui-util.c:627
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "שגיאה בהסרת איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3610,16 +3650,16 @@ msgstr[1] ""
 "פתיחת %d אנשי קשר תפתח גם %d חלונות חדשים.\n"
 "להציג את אנשי הקשר?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:314
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_אל תציג"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "הצג את _כל אנשי הקשר"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3628,145 +3668,144 @@ msgstr ""
 "‏%s כבר קיים\n"
 "האם להחליפו?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:345
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "החלף"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:386
-#: ../addressbook/gui/widgets/eab-gui-util.c:389
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "איש קשר"
 msgstr[1] "אנשי קשר"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:472
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "בחר ספר כתובות"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "הזז איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:740
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "העתק איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "הזז אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "העתק אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:897
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, fuzzy, c-format
 msgid "vCard for %s"
 msgstr "תיקייה לא תקינה: `%s'"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
-#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "מידע איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "מידע איש קשר עבור %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "יש איש קשר נוסף."
 msgstr[1] "יש %d אנשי קשר נוספים."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 #, fuzzy
 msgid "Show Full vCard"
 msgstr "שדה"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "שמור בספר הכתובות"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "מייבא..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "‏CSV או Tab של Outlook ‏(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "‏CSV או Tab של Mozilla ‏(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "‏CSV או Tab של Evolution ‏(‎.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 #, fuzzy
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution לא יכולה להתחיל."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 #, fuzzy
 msgid "Evolution vCard Importer"
 msgstr "Evolution לא יכולה להתחיל."
@@ -3812,12 +3851,12 @@ msgid "Format"
 msgstr "מבנה"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "כותרת"
 
@@ -3919,9 +3958,9 @@ msgstr ""
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "גודל:"
 
@@ -3938,7 +3977,7 @@ msgid "Top:"
 msgstr "מעלה:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "סוג:"
 
@@ -3950,29 +3989,8 @@ msgstr "רוחב:"
 msgid "_Font..."
 msgstr "_גופן..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr ""
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr ""
-
-#: ../addressbook/printing/test-print.c:43
-msgid "Contact Print Test"
-msgstr ""
-
-#: ../addressbook/printing/test-print.c:46
-msgid "This should test the contact print code"
-msgstr ""
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "לא ניתן לפתוח קובץ"
@@ -3986,60 +4004,60 @@ msgstr "לא ניתן לקבל את רשימת ספרי הכתובות"
 msgid "failed to open book"
 msgstr "נכשל בפתיחת ספר"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 #, fuzzy
 msgid "List local address book folders"
 msgstr "רשימת תיקיות ספרי כתובות מקומיים"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "מספר"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "שגיאה שלא טופלה"
 
@@ -4135,19 +4153,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "למחוק את פגישה זאת?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "למחוק את ישיבה זאת?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "למחוק את תזכורת זאת?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "למחוק את משימה זאת?"
@@ -4168,299 +4186,337 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+#| msgid "Repository offline"
+msgid "Calendar repository is offline."
+msgstr "המאגר לא מקוון"
+
+#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
 msgstr "לא ניתן ליצור אירוע חדש"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "לא ניתן לשמור אירוע"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "למחוק את היומן '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "למחוק את רשימת התזכורות '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "למחוק את רשימת המשימות '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "אל _תשלח"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "לא ניתן לפתוח את העורך."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "שגיאה בטעינת היומן"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "שגיאה בטעינת רשימת התיזכורות"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "שגיאה בטעינת רשימת המשימות"
 
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+#| msgid "New Appointment"
+msgid "Save Appointment"
+msgstr "שמור פגישה"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "שמור תזכורת"
+
+#: ../calendar/calendar.error.xml.h:51
+#| msgid "Save As"
+msgid "Save Task"
+msgstr "שמור משימה"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
+
+#: ../calendar/calendar.error.xml.h:60
 #, fuzzy
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 #, fuzzy
 msgid "The memo list is not marked for offline usage."
 msgstr "התחל במצב לא מקוון"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 #, fuzzy
 msgid "This memo list will be removed permanently."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "נכשל בטעינת יומן"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
 #, fuzzy
 msgid "Would you like to save your changes to this memo?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:72
 #, fuzzy
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
 #, fuzzy
 msgid "You have changed this task, but not yet saved it."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:81
 #, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ה_תעלם משינויים"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_שמור"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "שמור _שינויים"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_שלח"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_שלח התרעה"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "לא ניתן להתחיל את evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "עדיפות ברירת מחדל:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "Calendar and Tasks"
 msgstr "יומן ומשימות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "יומנים"
 
@@ -4501,25 +4557,25 @@ msgid "Memo_s"
 msgstr "_תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "משימות"
@@ -4537,26 +4593,27 @@ msgstr "_משימות"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "דקה"
 msgstr[1] "דקות"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "שעה"
 msgstr[1] "שעות"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "שעת התחלה"
 
@@ -4567,9 +4624,9 @@ msgstr "פגישות"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "מיקום:"
@@ -4579,52 +4636,57 @@ msgid "Snooze _time:"
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#| msgid "Dismiss"
+msgid "_Dismiss"
+msgstr "_שחרר"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "_Snooze"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "location of appointment"
 msgstr "מיקום הפגישה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "אין סיכום זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No description available."
 msgstr "אין תיאור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "אין מידע מיקום זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "יש לך %d התרעות"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4632,7 +4694,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4643,27 +4705,27 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "אל תשאל אותי על תוכנה זאת שוב."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "לא ניתן לאתחל את Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr ""
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4671,8 +4733,8 @@ msgstr[0] "שעה אחת"
 msgstr[1] "%d שעות"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4682,8 +4744,8 @@ msgstr[1] "%d דקות"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4695,156 +4757,180 @@ msgid "Alarm programs"
 msgstr "Alarm programs"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Amount of time in seconds the error should be shown on the status bar."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
 msgstr "Ask for confirmation when deleting items"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Background color of tasks that are due today, in \"#rrggbb\" format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Background color of tasks that are overdue, in \"#rrggbb\" format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
 msgstr "Calendars to run alarms for"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Color to draw the Marcus Bains line in the Day View."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Compress weekends in month view"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirm expunge"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Days on which the start and end of work hours should be indicated."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder units"
 msgstr "Default reminder units"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder value"
 msgstr "Default reminder value"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Directory for saving alarm audio files"
 msgstr "Directory for saving alarm audio files"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Gradient"
 msgstr "Event Gradient"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Transparency"
 msgstr "Event Transparency"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Free/busy server URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Free/busy template URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient of the events in calendar views."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide completed tasks"
 msgstr "Hide completed tasks"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task units"
 msgstr "Hide task units"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task value"
 msgstr "Hide task value"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Horizontal pane position"
 msgstr "Horizontal pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervals shown in Day and Work Week views, in minutes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Last alarm time"
 msgstr "Last alarm time"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr "Level beyond which the message should be logged."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "List of server URLs for free/busy publishing."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains Line Color - Day View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains Line Color - Time bar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute the workday ends on, 0 to 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute the workday starts on, 0 to 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Month view horizontal pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Month view vertical pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Number of units for determining a default reminder."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr "Number of units for determining when to hide tasks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Overdue tasks color"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4852,7 +4938,7 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4860,7 +4946,7 @@ msgstr ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -4868,7 +4954,7 @@ msgstr ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4876,7 +4962,7 @@ msgstr ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4884,7 +4970,7 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4892,69 +4978,79 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programs that are allowed to be run by alarms."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Save directory for alarm audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Show RSVP field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Show Role field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
 msgstr "Show appointment end times in week and month views"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Show categories field in the event/meeting/task editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Show display alarms in notification tray"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Show timezone field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Show type field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Show week numbers in date navigator"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Tasks due today color"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Tasks vertical pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4963,7 +5059,7 @@ msgstr ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4971,20 +5067,36 @@ msgstr ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#, fuzzy
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Time divisions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "Time the last alarm ran, in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -4992,41 +5104,41 @@ msgstr ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "Twenty four hour time format"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Week start"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Whether or not to use the notification tray for display alarms."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Whether to ask for confirmation when deleting an appointment or task."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Whether to ask for confirmation when expunging appointments and tasks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5034,164 +5146,160 @@ msgstr ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Whether to display the end time of events in the week and month views."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Whether to hide completed tasks in the tasks view."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr "Whether to set a default reminder for appointments."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Whether to show RSVP field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Whether to show categories field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Whether to show role field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Whether to show status field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Whether to show timezone field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Whether to show type field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Whether to show week numbers in the date navigator."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Whether to use daylight savings time while displaying events."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Work days"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Workday end hour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Workday end minute"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Workday start hour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Workday start minute"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "הסיכום מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "התיאור מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "הקטגוריה היא"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "ההערה מכילה"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "המיקום מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
-msgid "Unmatched"
-msgstr ""
-
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "משימות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 #, fuzzy
 msgid "Overdue Tasks"
 msgstr "Overdue tasks color"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "משימות שהסתיימו "
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "משימות עם תצריפים"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "פגישות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 #, fuzzy
 msgid "Next 7 Days' Appointments"
 msgstr "פגישה לכל ה_יום"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "הדפס"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ימים"
@@ -5200,358 +5308,255 @@ msgstr "ימים"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
 #: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "באינטרנט"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "ימי הולדת ו-\tימי שנה"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "מזג אויר"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "יומן _חדש"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "ה_עתק..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+#, fuzzy
+msgid "_Make available for offline use"
+msgstr "התחל במצב לא מקוון"
+
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+#, fuzzy
+msgid "_Do not make available for offline use"
+msgstr "התחל במצב לא מקוון"
+
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "נכשל בשדרוג יומנים."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "לא ניתן לפתוח את היומן '%s' ליצירת אירועים ופגישות"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "אין יומן זמין ליצירת אירועים וישיבות"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1597
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1522
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "צור פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "ישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1605
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1530
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_ישיבה"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "צור בקשה לישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1613
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1538
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "פגישה לכל ה_יום"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "צור פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/calendar-component.c:1621
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1546
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_יומן"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "צור יומן חדש"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "תצוגת יום"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "תצוגת שבוע עבודה"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "תצוגת שבוע"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "תצוגת חודש"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "כל שדה"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "תצריפים"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-#, fuzzy
-msgid "Business"
-msgstr "פקס עסקי"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "סיווג"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
-msgid "Competition"
-msgstr "תאריך סיום"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "חסוי"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "תיאור"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "התיאור מכיל"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "לא קיים"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "קיים"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "מועדפים"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "מתנות"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "מטרות/יעדים"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "חג"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "כרטיסי ברכה"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-#, fuzzy
-msgid "Hot Contacts"
-msgstr "אנשי קשר"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "רעיונות"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-#, fuzzy
-msgid "International"
-msgstr "מסורתי"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-#, fuzzy
-msgid "Key Customer"
-msgstr "התאם"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-#, fuzzy
-msgid "Miscellaneous"
-msgstr "כללי"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr ""
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 #, fuzzy
 msgid "Organizer"
 msgstr "_ארגון:"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "שיחות טלפון"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "פרטי"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:322 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ציבורי"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "מופע חוזר"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "מצב"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-#, fuzzy
-msgid "Strategies"
-msgstr "קטגוריות"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "סיכום"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "הסיכום מכיל"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-#, fuzzy
-msgid "Suppliers"
-msgstr "ה_חל מסננים"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr ""
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr ""
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "ממתין"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "מכיל"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "לא מכיל"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "שגיאה בפתיחת היומן"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "שגיאה לא ידועה"
 
@@ -5588,17 +5593,17 @@ msgid "Mes_sage:"
 msgstr "הו_דעה:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "נגן צליל"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "הקפץ התרעה"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "הפעל תוכנית"
 
@@ -5611,7 +5616,7 @@ msgid "Send To:"
 msgstr "שלח אל:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "שלח דוא\"ל"
 
@@ -5666,7 +5671,7 @@ msgstr "דקה (דקות)"
 msgid "start of appointment"
 msgstr "תחילת הפגישה"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr ""
 
@@ -5675,25 +5680,53 @@ msgid "A_dd"
 msgstr "הו_סף"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "התרעות"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "צרף קבצים"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "ללא"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "הגודל המקורי"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5707,59 +5740,59 @@ msgstr ""
 "10 דקות\n"
 "05 דקות"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">התרעות</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">הגדרות</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">כללי</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">רשימת משימות</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">שעה</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">שבוע עבודה</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "היום _מסתיים:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "תצוגה"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "יום שישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5769,13 +5802,13 @@ msgstr ""
 "שעות\n"
 "ימים"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "יום שני"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5793,242 +5826,248 @@ msgstr ""
 "שבת\n"
 "ראשון"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "בחר צבע"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "_א"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "יום שבת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
+#| msgid "Send To:"
+msgid "Se_cond zone:"
+msgstr "שלח אל:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "ה_צג תזכורת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "הצג _מספרי שבועות בנווט התאריכים"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr ""
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "_ה"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "תבנית:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "אזור _זמן:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "מבנה זמן:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "יום רביעי"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "ה_שבוע מתחיל ביום:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "ימי עבודה:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "_12 שעות (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "_24 שעות"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "בקש _אישור עבור מחיקת פריטים"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "_היום מתחיל:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "_ו"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "_הסתר משימות שהושלמו לאחר"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "_ב"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr ""
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "_ש"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr "הצג _שעת סיום פגישות בתצוכת חודשים"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "חלוקות _זמן:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "_ג"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "_ד"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "לפני כל פגישה"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "_צבע:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "רשימת משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "רשימת תזכורות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "מאפייני יומן"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "מאפייני רשימת משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "רשימת משימות חדשה"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "מאפייני רשימת תזכורות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "רשימת תזכורות חדשה"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "אירוע זה נמחק."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "משימה זו נמחקה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "תזכורת זו נמחקה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  ביצעת שינויים. לשכוח את השינויים ולסגור את העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  לא ביצעת שינויים, לסגור את העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "אירוע זה השתנה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "משימה זאת השתנתה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "תזכורת זאת השתנתה."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  ביצעת שינויים. לשכוח את השינויים ולעדכן את העורך?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -6038,361 +6077,366 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "שגיאת וידוא: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
 msgid " to "
 msgstr " אל "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
 msgid " (Completed "
 msgstr " (הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
 msgid "Completed "
 msgstr "הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
 msgid " (Due "
 msgstr " (עד "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
 msgid "Due "
 msgstr "עד "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "הודעה מצורפת - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "הודעה מצורפת"
 msgstr[1] "%d הודעות מצורפות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "_העבר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "בטל _גרירה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "לא ניתן לעדכן אובייקט"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:937
 msgid "Edit Appointment"
 msgstr "ערוך פגישה"
 
 # c-format
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Meeting - %s"
 msgstr "ישיבה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "פגישה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:954
 #, c-format
 msgid "Task - %s"
 msgstr "משימה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Memo - %s"
 msgstr "תזכורת - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "No Summary"
 msgstr "אין סיכום"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1116
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 #, fuzzy
 msgid "Click here to close the current window"
 msgstr "הקלק אישור לסגור את החיבור ולעבוד בצורה לא מקוונת"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1332
 msgid "Click here to view help available"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "Click here to save the current window"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1367
 msgid "Select all text"
 msgstr "בחר את כל הטקסט"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1374
 msgid "_Classification"
 msgstr "_סיווג"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1388
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "עזר_ה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Insert"
 msgstr "_הכנס"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Options"
 msgstr "א_פשרויות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1416 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_תצריף..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "Click here to attach a file"
 msgstr "לחץ כאן לצרף קובץ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Categories"
 msgstr "_קטגוריות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether to display categories"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Time _Zone"
 msgstr "אזור _זמן"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the time zone is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "Pu_blic"
 msgstr "_ציבורי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Classify as public"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1462
 msgid "_Private"
 msgstr "_פרטי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1464
 msgid "Classify as private"
 msgstr "סווג כפרטי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "_Confidential"
 msgstr "_חסוי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "Classify as confidential"
 msgstr "סווג כחסוי"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1479
 #, fuzzy
 msgid "R_ole Field"
 msgstr "שדה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1481
 msgid "Toggles whether the Role field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1487
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1489
 msgid "Toggles whether the RSVP field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1495
 #, fuzzy
 msgid "_Status Field"
 msgstr "_מצב:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1497
 msgid "Toggles whether the Status field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1503
 #, fuzzy
 msgid "_Type Field"
 msgstr "שדה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1505
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
-msgstr ""
+#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+msgid "Recent _Documents"
+msgstr "מסמכים _אחרונים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "צרף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1933
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "תצריף <b>אחד</b>"
 msgstr[1] "<b>%d</b> תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1965
 msgid "Hide Attachment _Bar"
 msgstr "הסתר את תיבת ה_תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1968
+#: ../calendar/gui/dialogs/comp-editor.c:2271
 msgid "Show Attachment _Bar"
 msgstr "הצג את תיבת ה_תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "ה_סר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "הוסף _תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "הצג תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2439
+#: ../calendar/gui/dialogs/comp-editor.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:3333
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3362
 msgid "Unable to use current version!"
 msgstr "לא ניתן להשתמש בגירסה הנוכחית"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "לא ניתן לפתוח את המקור"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "לא ניתן לפתוח את היעד"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "היעד הוא לקריאה בלבד"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "לא ניתן למחוק את האירוע עקב שגיאה"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "לא ניתן למחוק את המשימה עקב שגיאה"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "לא ניתן למחוק את התזכורת עקב שגיאה"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "לא ניתן למחוק את הפריט עקב שגיאה"
 
@@ -6401,7 +6445,7 @@ msgid "Contacts..."
 msgstr "אנשי קשר..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr ""
 
@@ -6409,69 +6453,70 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:194
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "ה_תרעות"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "מופע _חוזר"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "אפשרויות שליחה"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
 #, fuzzy
 msgid "Insert advanced send options"
 msgstr "המשתמש ביטל את הפעולה."
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "אירוע חדש לכל היום"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:234
 #, fuzzy
 msgid "Show Time as _Busy"
 msgstr "כותרת ההודעה"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "פנוי/_עסוק:"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6479,119 +6524,101 @@ msgstr ""
 msgid "Or_ganizer:"
 msgstr "_ארגון:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:845
 #, fuzzy
 msgid "_Delegatees"
 msgstr "מחק"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
 #, fuzzy
 msgid "Atte_ndees"
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "אירוע ללא תאריך התחלה"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "אירוע ללא תאריך סיום"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "תאריך ההתחלה שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "תאריך הסיום שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "שעת התחלה שגויה"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "שעת סיום שגויה"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "הוסף_ "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "לא ניתן לפתוח את היומן '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "אתה פועל בשם %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "יום אחד לפני הפגישה"
 msgstr[1] "%d ימים לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "שעה אחת לפני הפגישה"
 msgstr[1] "%d שעות לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "דקה אחת לפני הפגישה"
 msgstr[1] "%d שעות לפני הפגישה"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "התאם"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "ללא"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "יום אחד לפני הפגישה"
@@ -6668,19 +6695,19 @@ msgstr "אנשי _קשר..."
 msgid "Organizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
 msgid "Memo"
 msgstr "תזכורת"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "לא ניתן לפתוח תזכורות ב-'%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "אל"
 
@@ -6694,58 +6721,62 @@ msgid "T_o:"
 msgstr "אל_:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_קבוצה:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "מופע זה בלבד"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "מופע זה וקודמיו"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "מופע זה ומופעים עתידיים"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "כל המופעים"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "פגישה זאת מכילה מופעים חוזרים שלא ניתן לערוך."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "תאריך החזרה שגוי"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr ""
 
@@ -6753,7 +6784,7 @@ msgstr ""
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "ראשון"
 
@@ -6762,7 +6793,7 @@ msgstr "ראשון"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "שני"
 
@@ -6770,7 +6801,7 @@ msgstr "שני"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "שלישי"
 
@@ -6778,7 +6809,7 @@ msgstr "שלישי"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "רביעי"
 
@@ -6786,13 +6817,13 @@ msgstr "רביעי"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "אחרון"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "תאריך אחר"
 
@@ -6800,7 +6831,7 @@ msgstr "תאריך אחר"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr ""
 
@@ -6808,7 +6839,7 @@ msgstr ""
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr ""
 
@@ -6816,46 +6847,46 @@ msgstr ""
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr ""
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "יום"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "מופעים"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "הוסף חריגה"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 #, fuzzy
 msgid "Could not get a selection to delete."
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "תאריך/שעה"
 
@@ -6906,12 +6937,12 @@ msgstr "שבוע(ות)"
 msgid "year(s)"
 msgstr "שנה(ים)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "תאריך הסיום שגוי"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "דף מארג"
 
@@ -6926,55 +6957,55 @@ msgstr "<span weight=\"bold\">מצב</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "הסתיים"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "גבוה"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
 msgid "In Progress"
 msgstr "בתהליך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "נמוך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:970 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "רגיל"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "לא התחיל"
 
@@ -6987,7 +7018,7 @@ msgid "Stat_us:"
 msgstr "_מצב:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "לא מוגדר"
 
@@ -7004,39 +7035,39 @@ msgstr "_עדיפות:"
 msgid "_Web Page:"
 msgstr "_דף מארג:"
 
-#: ../calendar/gui/dialogs/task-editor.c:111
+#: ../calendar/gui/dialogs/task-editor.c:113
 #, fuzzy
 msgid "_Status Details"
 msgstr "פרטים"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-editor.c:121
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr " _אפשרויות שליחה"
 
-#: ../calendar/gui/dialogs/task-editor.c:316
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_משימה"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "פרטי משימה"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Organi_zer:"
 msgstr "_ארגון:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "תאריך היעד שגוי"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "לא ניתן לפתוח משימות ב-'%s'."
@@ -7058,7 +7089,7 @@ msgid "Time zone:"
 msgstr "אזור זמן:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7066,123 +7097,123 @@ msgstr[0] "יום אחד"
 msgstr[1] "%d ימים"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "שבוע אחד"
 msgstr[1] "%d שבועות"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "לחץ כדי לפתוח את %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "ללא-שם"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "תאריך התחלה:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "דף מארג:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "סיכום:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "תאריך יעד:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "מצב:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "עדיפות:"
 
@@ -7195,246 +7226,246 @@ msgstr "תאריך סיום"
 msgid "Start Date"
 msgstr "תאריך התחלה"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "פנוי"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "כן"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "לא"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:974
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "שמור בשם..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "בחר תיקייה למירת התצריפים..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "תמונה_ללא_שם.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "_שמירה בשם..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "קבע כ_רקע"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 #, fuzzy
 msgid "_Save Selected"
 msgstr "נבחר"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "פתח ב-%s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* אין סיכום *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2368
 #, fuzzy, c-format
 msgid "Organizer: %s <%s>"
 msgstr "_ארגון:"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2372
 #, fuzzy, c-format
 msgid "Organizer: %s"
 msgstr "_ארגון:"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "התחלה:"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 #, fuzzy
 msgid "Due: "
 msgstr "עד "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "מעדכן אובייקטים"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "שמירה בשם..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "New _Task"
 msgstr "משימה _חדשה"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "פתח _דף מארג"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1732 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1752 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_גזור"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1735
+#: ../calendar/gui/e-calendar-view.c:1754 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ה_דבק"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "סמן כה_סתיים"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "סמן כ_לא הסתיים"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
 #, fuzzy
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "העבר את ההודעות שנבחרו לאשפה"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "‏לחץ כאן כדי להוסיף משימה"
@@ -7457,8 +7488,8 @@ msgid "Due date"
 msgstr "תאריך יעד"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "עדיפות"
 
@@ -7466,109 +7497,156 @@ msgstr "עדיפות"
 msgid "Start date"
 msgstr "תאריך התחלה"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "מצב"
+
+#: ../calendar/gui/e-calendar-view.c:1415
 msgid "Moving items"
 msgstr "מעביר פריטים"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1417
 msgid "Copying items"
 msgstr "מעתיק פריטים"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1726
 msgid "New _Appointment..."
 msgstr "_פגישה חדשה..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1727
 msgid "New All Day _Event"
 msgstr "_אירוע של כל היום חדש"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "New _Meeting"
 msgstr "ישיבה _חדשה"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1739
 msgid "_Current View"
 msgstr "_תצוגה נוכחית"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1741
 msgid "Select T_oday"
 msgstr "בחר את _היום"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1742
 msgid "_Select Date..."
 msgstr "בחר _תאריך..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1748
 msgid "Pri_nt..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1758
 msgid "Cop_y to Calendar..."
 msgstr "הע_תק ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1759
 msgid "Mo_ve to Calendar..."
 msgstr "ה_עבר ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1760
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_מחק..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1761
 msgid "_Schedule Meeting..."
 msgstr "_קבע ישיבה..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1762
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1763
 msgid "_Reply"
 msgstr "ה_שב"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1764 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "השב ל_כולם"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1769
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1770 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "מחק _מופע זה"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1771
 msgid "Delete _All Occurrences"
 msgstr "מחק את _כל המופעים"
 
+#: ../calendar/gui/e-calendar-view.c:2223
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2126
+msgid "Accepted"
+msgstr "התקבל"
+
+#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2132
+msgid "Declined"
+msgstr "נדחה"
+
+#: ../calendar/gui/e-calendar-view.c:2225
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2135
+msgid "Delegated"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:2227
+#, fuzzy
+#| msgid "Select a location"
+msgid "Needs action"
+msgstr "בחר מיקום"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2388 ../calendar/gui/print.c:2507
 #, c-format
 msgid "Location: %s"
 msgstr "_מיקום: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2422
 #, c-format
 msgid "Time: %s %s"
 msgstr "שעה: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7579,53 +7657,59 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:589
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the second time zone"
+msgstr "Show the \"Preview\" pane"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1567
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "כל יום"
 msgstr[1] "כל %d ימים"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "כל שבוע"
 msgstr[1] "כל %d שבועות"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7633,72 +7717,74 @@ msgstr[0] "כל שבוע ב"
 msgstr[1] "כל %d שבועות ב"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "כל חודש"
 msgstr[1] "כל %d חודשים"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "כל שנה"
 msgstr[1] "כל %d שנים"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
+#| msgid "a total of %d time"
+#| msgid_plural " a total of %d times"
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ""
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "מתחיל"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "מסתיים"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "שגיאת iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/itip-formatter/itip-view.c:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7709,294 +7795,284 @@ msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
-msgid "Accepted"
-msgstr "התקבל"
-
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2129
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
-msgid "Declined"
-msgstr "נדחה"
-
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "מידע ישיבה"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "‏<b>%s</b> מבקש את הנוכחות של %s בישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "‏<b>%s</b> מבקש את הנוכחות שלך בישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "הצעת ישיבה"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "‏<b>%s</b> מבקש להצתרף לישיבה קיימת."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "עדכון לגבי ישיבה"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "‏<b>%s</b> מבקש לקבל את המידע העדכני ביותר לגבי הישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "‏<b>%s</b> ביטל ישיבה."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "ביטול ישיבה"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "ביטול משימה"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "העדכון הושלם\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "הפריט נשלח!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "בחר פעולה:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "קבל"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "סרב"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -8024,113 +8100,94 @@ msgstr "טוען יומן..."
 msgid "Server Message:"
 msgstr "הודעת שרת:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "משתתפים דרושים"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "משאבים"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 #, fuzzy
 msgid "Attendees"
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "משאב"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "חדר"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
-msgid "Tentative"
-msgstr ""
-
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
-msgid "Delegated"
-msgstr ""
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr ""
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "בתהליך"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8138,79 +8195,79 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "מחוץ למשרד"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "אין מידע"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
 #, fuzzy
 msgid "A_ttendees..."
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "_אפשרויות"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "שעת ה_תחלה:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "שעת _סיום:"
 
@@ -8238,16 +8295,15 @@ msgstr "שפה"
 msgid "Member"
 msgstr "חבר"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_מחק את התזכורות שנבחרו"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "לחץ כאן כדי להוסיף תזכורת"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8284,51 +8340,51 @@ msgstr "מסיים משימות..."
 msgid "Expunging"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "בחר אזור זמן"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2621
 msgid "_Custom View"
 msgstr "_תצוגה מותאמת אישית"
 
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2622
 msgid "_Save Custom View"
 msgstr "_שמור תצוגה מותאמת אישית"
 
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2627
 #, fuzzy
 msgid "_Define Views..."
 msgstr "תצוגת שבוע"
 
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2869
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "טוען פגישות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2884
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "טוען משימות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2893
 #, c-format
 msgid "Loading memos at %s"
 msgstr "טוען תזכורות ב-%s"
 
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:2998
 #, c-format
 msgid "Opening %s"
 msgstr "פותח %s"
 
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3966
 msgid "Purging"
 msgstr ""
 
@@ -8397,19 +8453,19 @@ msgstr ""
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "מידע אירוע"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "מידע משימה"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "מידע תזכורת"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr ""
 
@@ -8417,116 +8473,180 @@ msgstr ""
 msgid "Calendar information"
 msgstr "מידע יומן"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+#, fuzzy
+#| msgid "Accepted"
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "התקבל"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "ההזדהות נכשלה"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+#| msgid "Declined"
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "נדחה"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "מחק"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+#, fuzzy
+#| msgid "Updated"
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "עודכן"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+#, fuzzy
+#| msgid "Cancel"
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "ביטול"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+#, fuzzy
+#| msgid "Refresh"
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "רענן"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+#| msgid "Counter-proposal"
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "הצעה נגדית"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "רשימת ת_זכורות חדשה"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "תזכורת אחת"
 msgstr[1] "%d תזכורות"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "תזכורת חדשה"
 
-#: ../calendar/gui/memos-component.c:1261
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1176
 msgctxt "New"
 msgid "Mem_o"
 msgstr "תז_כורת"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "צור תזכורת חדשה"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "תזכורת משותפת חדשה"
 
-#: ../calendar/gui/memos-component.c:1269
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1184
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "תזכורת _משותפת"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "צור תזכורת משותפת חדשה"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "רשימת תזכורות חדשה"
 
-#: ../calendar/gui/memos-component.c:1277
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1192
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_רשימת תזכורות"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "צור רשימת תזכורות חדשה"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "הדפס תזכורות"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "7 הימים הבאים"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8562,284 +8682,284 @@ msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "הערות"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr ""
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr ""
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr ""
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr ""
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr ""
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr ""
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr ""
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr ""
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr ""
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr ""
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr ""
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr ""
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr ""
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr ""
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr ""
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr ""
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr ""
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr ""
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr ""
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr ""
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr ""
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr ""
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr ""
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr ""
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr ""
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr ""
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr ""
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr ""
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr ""
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr ""
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr ""
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "ראשון"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "שני"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "שלישי"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "רביעי"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "חמישי"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "שישי"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "שבת"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2471
 msgid "Appointment"
 msgstr "פגישה"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2473
 msgid "Task"
 msgstr "משימה"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2498
 #, c-format
 msgid "Summary: %s"
 msgstr "סיכום: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2521
 #, fuzzy
 msgid "Attendees: "
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2561
 #, c-format
 msgid "Status: %s"
 msgstr "מצב: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Priority: %s"
 msgstr "עדיפות: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2590
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "אחוז הושלם: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2602
 #, c-format
 msgid "URL: %s"
 msgstr "כתובת: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Categories: %s"
 msgstr "קטגוריות: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2626
 msgid "Contacts: "
 msgstr "אנשי קשר: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "רשימת משימות _חדשה"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "משימה אחת"
 msgstr[1] "%d משימות"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1240
 #, fuzzy
 msgctxt "New"
 msgid "_Task"
 msgstr "_משימה"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "צור משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1248
 #, fuzzy
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "משימות פעילות"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1249
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "הוסף משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "רשימת משימות חדשה"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1256
 #, fuzzy
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "רשימת _משימות"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "צור רשימת משימות _חדשה"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8847,11 +8967,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "אל תשאל אותי שוב."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "הדפס משימות"
 
@@ -8860,58 +8980,58 @@ msgstr "הדפס משימות"
 msgid "% Completed"
 msgstr "% השלמה"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "בוטל"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 #, fuzzy
 msgid "In progress"
 msgstr "בתהליך"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr ""
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 msgid "Opening calendar"
 msgstr "פותח יומן"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "קבצי iCalendar ‏(ics.)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "תזכורת!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "קבצי vCalendar ‏(vcf.)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
@@ -10464,254 +10584,260 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 #, fuzzy
 msgid "Could not open autosave file"
 msgstr "לא ניתן לפתוח קובץ"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "הוסף תצריף"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "צ_רף"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "הודעה ללא שם"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "צרף קובץ"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_סגור"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "סגור את הקובץ הנוכחי"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ה_דפס..."
 
-#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_תצוגה לפני הדפסה"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "שמור את הקובץ הנוכחי"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "שמור _בשם..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "שמור את הקובץ הנוכחי בשם אחר"
 
-#: ../composer/e-composer-actions.c:514
-msgid "Save _Draft"
-msgstr "שמור _טיוטה"
+#: ../composer/e-composer-actions.c:511
+#| msgid "Save as draft"
+msgid "Save as _Draft"
+msgstr "שמור כ_טיוטה"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "שמור כטיוטה"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "ש_לח"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "שלח את ההודעה"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:527
 #, fuzzy
 msgid "Insert Send options"
 msgstr "אפשרויות"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "הו_דעה חדשה"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:534
 #, fuzzy
 msgid "Open New Message window"
 msgstr "ש_לח הודעה ל..."
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "קידוד _תווים"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_אבטחה"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "ה_צפנת PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "הצפן הודעה זו עם PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "_חתימת PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "חתום על הודעה זאת עם מפתח ה-PGP שלך"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:574
 #, fuzzy
 msgid "_Prioritize Message"
 msgstr "הדפס הודעה"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:576
 #, fuzzy
 msgid "Set the message priority to high"
 msgstr "שמור את ההודעה כקובץ מלל"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:582
 #, fuzzy
 msgid "Re_quest Read Receipt"
 msgstr "משתתפים דרושים"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "שדה _Bcc"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "שדה _Cc"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "שדה _הנושא"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+#| msgid "Save _Draft"
+msgid "Save Draft"
+msgstr "שמור טיוטה"
+
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "הכנס את הנמענים של ההודעה"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "_מאת:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "השב _אל:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "א_ל:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 #, fuzzy
 msgid "_Post To:"
 msgstr "_לך אל"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "נו_שא:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "ח_תימה:"
 
@@ -10731,42 +10857,38 @@ msgstr ""
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "מסמכים _אחרונים"
-
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "_הצג את תיבת התצריפים"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "תצריף"
 msgstr[1] "תצריפים"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "ה_סתר את תיבת התצריפים"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "חבר הודעה"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10847,7 +10969,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 
@@ -10913,7 +11035,7 @@ msgstr "שמור _טיוטה"
 msgid "Evolution Mail and Calendar"
 msgstr "דואר ויומן Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr ""
 
@@ -10929,40 +11051,97 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "תקלת Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "אזהרת Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "מידע Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "שאילתת Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr ""
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "רכיב"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr ""
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:339
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "יומני ניפוי"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "שניות."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "הודעות יומן:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "רמת יומן"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "שעה"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "הודעות"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "סגור חלון זה"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "שגיאות"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "אזהרות ושגיאות"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "ניפוי"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "הודעות אזהרה, שגיאה וניפוי"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "מופעל"
 
@@ -11011,179 +11190,183 @@ msgstr "להחליף קובץ?"
 msgid "_Overwrite"
 msgstr "ה_חלף"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "לא ניתן לפתוח את הקישור."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr ""
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "_חשוב"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "ע_בודה"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_אישי"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 #, fuzzy
 msgid "_To Do"
 msgstr "_לך אל"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "_מאוחר יותר"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_שם תוית:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "ערוך תוית"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "הוסף תוית"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "שם תווית לא יכול להיות ריק."
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr ""
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "שגיאת GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "כל השגיאות הנוספות מוצגות במסוף בלבד."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שניה"
 msgstr[1] "לפני %d שניות"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "עוד שנייה"
 msgstr[1] "עוד %d שניות"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "עוד דקה"
 msgstr[1] "עוד %d דקות"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה אחת"
 msgstr[1] "לפני %d שנים"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "עוד שעה"
 msgstr[1] "עוד %d שעות"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "אתמול"
 msgstr[1] "לפני %d ימים"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "עוד יום"
 msgstr[1] "עוד %d ימים"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "עוד שבוע"
 msgstr[1] "עוד %d שבועות"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "עוד חודש"
 msgstr[1] "עוד %d חודשים"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "לפני שנה"
 msgstr[1] "לפני %d שנים"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "עוד שנה"
 msgstr[1] "עוד %d שנים"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<לחץ כאן כדי לבחור תאריך>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "עכשיו"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr ""
 
@@ -11196,57 +11379,60 @@ msgstr "בחר קובץ"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "שם החוק_:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+#| msgid "Find items that meet the following criteria"
+msgid "Find items that meet the following conditions"
 msgstr "חפש פריטים שמתאימים לקריטריון הבא"
 
-#: ../filter/filter-rule.c:914
+#: ../filter/filter-rule.c:915
 #, fuzzy
-msgid "A_dd Filter Criteria"
-msgstr "הוסף חוק סינון"
+#| msgid "Add Ac_tion"
+msgid "A_dd Condition"
+msgstr "הוסף _פעולה"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
 msgstr ""
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_חפש פריטים:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr ""
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr ""
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr ""
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr ""
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "נכנס"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "יוצא"
 
@@ -11340,7 +11526,7 @@ msgstr "בעתיד"
 msgid "months"
 msgstr "חודשים"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
 msgid "seconds"
 msgstr "שניות"
 
@@ -11352,10 +11538,11 @@ msgstr ""
 msgid "the time you specify"
 msgstr ""
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
 msgstr "שבועות"
 
@@ -11363,15 +11550,15 @@ msgstr "שבועות"
 msgid "years"
 msgstr "שנים"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "הוסף חוק"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "ערוך חוק"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "שם החוק"
 
@@ -11425,8 +11612,8 @@ msgstr "Evolution Mail preferences control"
 msgid "Evolution Network configuration control"
 msgstr "Evolution Network configuration control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
 #: ../mail/mail-component.c:597 ../mail/mail-component.c:598
 #: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
@@ -11439,7 +11626,7 @@ msgid "Mail Accounts"
 msgstr "חשבונות דואר"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mail Preferences"
 msgstr "העדפות דואר"
 
@@ -11451,12 +11638,12 @@ msgstr "Network Preferences"
 msgid "_Mail"
 msgstr "_דואר"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s הסכם שימוש"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11465,65 +11652,65 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr ""
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 #, fuzzy
 msgid "Ask for each message"
 msgstr "הודעה שלא נקראה:"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
 msgid "Identity"
 msgstr "זהות"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
 msgid "Receiving Email"
 msgstr "קבלת דוא\"ל"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "בדוק אם קיים _דואר חדש כל"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "ד_קות"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
 msgstr "שליחת דוא\"ל"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ברירת מחדל"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "אבטחה"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "אפשרויות קבלה"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "בודק עבור הודעות חדשות"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "עורך חשבונות"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
 msgid "Evolution Account Assistant"
 msgstr "עוזר החשבונות של Evolution"
 
@@ -11541,40 +11728,40 @@ msgid "Protocol"
 msgstr "פרוטוקול"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "ללא שם"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
 msgid "Language(s)"
 msgstr "שפה/ות"
 
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
 msgid "Add signature script"
 msgstr "הוסף תסריט חתימה"
 
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
 msgid "Signature(s)"
 msgstr "חתימה/ות"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- הודעה מועברת --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "שולח בלתי ידוע"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----הודעה מקורית-----"
 
@@ -11624,7 +11811,7 @@ msgid "Date sent"
 msgstr "תאריך שליחה"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11705,7 +11892,7 @@ msgstr "לא ניתן לפתוח קובץ"
 msgid "is set"
 msgstr "%d נשלח"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "דואר זבל"
@@ -11714,7 +11901,7 @@ msgstr "דואר זבל"
 msgid "Junk Test"
 msgstr "מבחן דואר זבל"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "תוית"
 
@@ -11755,48 +11942,52 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "קרא"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "נמענים"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "שולח"
 
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "שלח / קבל"
+
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "קבע תווית"
@@ -11831,9 +12022,9 @@ msgstr ""
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "נושא"
 
@@ -11842,65 +12033,65 @@ msgid "Unset Status"
 msgstr ""
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr ""
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "הוסף _פעולה"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
 msgstr "צור תיקייה וירטואלית מההודעה"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "כל ההודעות"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "הודעות שלא נקראו"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "ללא תוית"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "הודעות שנקראו"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "הודעות אחרונות"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "הודעות מ-5 הימים האחרונים"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "הודעות עם תצריף"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "הודעות חשובות"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "הודעות שאינן זבל"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "חיפוש חשבון"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "חיפוש בכל החשבונות"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "הודעה שלא נקראה:"
@@ -11908,27 +12099,32 @@ msgstr[1] "הודעות שלא נקראו:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "סה\"כ הודעות:"
 msgstr[1] "סה\"כ הודעות:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "סה\"כ הודעות:"
+
+#: ../mail/em-folder-properties.c:198
+#, fuzzy, c-format
 msgid "Quota usage"
 msgstr "סה\"כ הודעות:"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "דואר נכנס"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "מאפייני תיקייה"
@@ -11945,9 +12141,9 @@ msgstr "_צור"
 msgid "Folder _name:"
 msgstr "_שם תיקייה:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "תיקיות חיפוש"
 
@@ -11956,19 +12152,24 @@ msgstr "תיקיות חיפוש"
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
 msgid "Drafts"
 msgstr "טיוטות"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "תבניות"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "נשלח"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "טוען..."
 
@@ -12008,12 +12209,12 @@ msgstr "מעביר את התיקייה %s"
 msgid "Copying folder %s"
 msgstr "מעתיק את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "מעביר הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "מעתיק הודעות אל התיקייה %s"
@@ -12030,448 +12231,450 @@ msgstr "הע_תק אל תיקייה"
 msgid "_Move to Folder"
 msgstr "הע_בר אל תיקייה"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "סורק תיקיות ב-\"%s\""
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "פתח ב_חלון חדש"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "הע_בר..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_שנה שם..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_רענן"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_רוקן את האשפה"
 
-#: ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2243
+#, fuzzy
+#| msgid "Create _Search Folder"
+msgid "_Unread Search Folder"
+msgstr "צור תיקיית _חיפוש"
+
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "מעתיק את `%s' אל `%s'"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "_העתק"
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "יוצר את התיקייה `%s'"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "צור תיקייה"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ציין היכן ליצור את התיקייה:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "מחיקת הדואר נכשלה"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "הע_בר"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_ערוך כהודעה חדשה..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "_בטל מחיקה"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "הע_בר לתיקייה..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "ה_עתק לתיקייה..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "_סמן כנקרא"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "סמן כ_לא נקרא"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "סמן כ_חשוב"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "סמן כל_א חשוב"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "סמן כ_דואר זבל"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "סמן _כלא דואר זבל"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_תוית"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "לל_א"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "תווית _חדשה"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "_צור חוק מהודעה"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 #, fuzzy
 msgid "Search Folder based on _Subject"
 msgstr "חפש אנשי קשר..."
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 #, fuzzy
 msgid "Search Folder based on Se_nder"
 msgstr "מקור הנייר:"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 #, fuzzy
 msgid "Search Folder based on _Recipients"
 msgstr "חפש אנשי קשר..."
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 #, fuzzy
 msgid "Search Folder based on Mailing _List"
 msgstr "צור תיקייה וירטואלית עבור רשימת תפוצה זו"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "לא ניתן לקבל הודעה"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "מקבל הודעה..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "צור תיקיית _חיפוש"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_מכתובת זו"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "אל כ_תובת זו"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "לחץ כדי לשלוח דואר ל-%s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
 #, fuzzy, c-format
 msgid "Click to call %s"
 msgstr "‏לחץ כאן כדי להוסיף משימה"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "_חפש:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "ה_קודם"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "ה_בא"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "התאם _רשיות"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "לא חתום"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "הודעה זו לא חתומה. אין שום ביטחון שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "חתימה חוקית"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "הודעה זו חתומה באופן חוקי. קיימת סבירות גבוהה שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "חתימה בלתי חוקית"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 #, fuzzy
 msgid "Valid signature, but cannot verify sender"
 msgstr "חתימה חוקית, לא מצליח לאשר את השולח"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "לא מוצפן"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "מוצפן, חלש"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "מוצפן"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "מוצפן, חזק"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_הצג תעודה"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "תעודה זאת אינה ניתנת לצפייה"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "הסתיים ב-%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "תאריך תפוגה:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "עד %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_תצוגה פנימית"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "ה_חבא"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "הצג גודל _מקורי"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "שמור תצריף בשם"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "בחר תיקייה לשמירת כל התצריפים"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
 #, fuzzy
 msgid "_Save Selected..."
 msgstr "בחר..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "_תצריף אחד"
 msgstr[1] "_%d תצריפים"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "_שמור"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "שמור ה_כל"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "ללא תצריף"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 #, fuzzy
 msgid "View _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
 #, fuzzy
 msgid "Hide _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "_פתח בעזרת"
 
-#: ../mail/em-format-html-display.c:2468
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12544,7 +12747,7 @@ msgstr "Bcc"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr ""
 
@@ -12561,14 +12764,14 @@ msgstr " (%R %Z)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1912
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "מאת"
 
@@ -12578,8 +12781,8 @@ msgid "Reply-To"
 msgstr "השב אל"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "תאריך"
 
@@ -12587,108 +12790,113 @@ msgstr "תאריך"
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "פנים"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "תצריף %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr ""
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "תצורת חתימה לא נתמכת"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "לא ניתן לפענח הודעת PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "לא ניתן לפענח הודעת PGP: שגיאה לא ידועה"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "כל פעם"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "פעם ביום"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "פעם בשבוע"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "פעם בחודש"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 #, fuzzy
 msgid "Add Custom Junk Header"
 msgstr "כותרת"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 #, fuzzy
 msgid "Header Name:"
 msgstr "_שם תיקייה:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 #, fuzzy
 msgid "Header Value Contains:"
 msgstr "השולח מכיל"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "מכיל ערך"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "צבע"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 #, fuzzy
 msgid "No Junk plugin available"
 msgstr "אין תיאור זמין."
@@ -12746,84 +12954,84 @@ msgstr ""
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "השב ל_רשימה"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_הוסף לספר הכתובות"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "תיקייה"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "נא לבחור שרת."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "לא נבחר שרת"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "אל תציג הודעה זאת _שוב."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "מסנני הודעה"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "הודעה"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "שמור הודעה..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "הוסף כתובת"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "הודעה מ-%s"
@@ -12832,7 +13040,7 @@ msgstr "הודעה מ-%s"
 msgid "Search _Folders"
 msgstr "תיקיות _חיפוש"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "מקור תיקיית חיפוש"
 
@@ -12849,17 +13057,14 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Send and Receive Mail\" window width"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
-msgstr "Allows evolution to display text part of limited size"
+#| msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
+msgstr "Allows Evolution to display text part of limited size"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Amount of time in seconds the error should be shown on the status bar."
-
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
@@ -12977,30 +13182,27 @@ msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialog."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-#, fuzzy
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 
 #: ../mail/evolution-mail.schemas.in.h:34
-#, fuzzy
 msgid "Determines whether to lookup in address book for sender email"
-msgstr "Determines whether to lookup in addressbook for sender email"
+msgstr "Determines whether to lookup in address book for sender email"
 
 #: ../mail/evolution-mail.schemas.in.h:35
-#, fuzzy
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 
 #: ../mail/evolution-mail.schemas.in.h:36
@@ -13034,8 +13236,9 @@ msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Disable or enable ellipsizing of folder names in folder tree"
+#| msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Disable or enable ellipsizing of folder names in side bar"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13105,19 +13308,33 @@ msgstr "Enable to render message text part of limited size."
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13125,7 +13342,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13133,17 +13350,22 @@ msgstr ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
+#| 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 in GNOME's mime-type database may be used for displaying "
+#| "content."
 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 "
-"in GNOME's mime-type database may be used for displaying content."
+"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 "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"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 "
-"in GNOME's mime-type database may be used for displaying content."
+"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 "
+"in GNOME's MIME type database may be used for displaying content."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13151,7 +13373,7 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13165,7 +13387,7 @@ msgstr ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13173,11 +13395,11 @@ msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "It disables/enables the prompt while marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13185,7 +13407,7 @@ msgstr ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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 "
@@ -13195,31 +13417,32 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Last time empty junk was run"
 msgstr "Last time empty junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty trash was run"
 msgstr "Last time empty trash was run"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "Level beyond which the message should be logged."
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colors"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+#| msgid "List of mime types to check for bonobo component viewers"
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "List of MIME types to check for Bonobo component viewers"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of accepted licenses"
 msgstr "List of accepted licenses"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13227,15 +13450,15 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 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."
@@ -13243,127 +13466,128 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "List of mime types to check for bonobo component viewers"
-
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose license has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+#| msgid "Load images for HTML messages over http"
+msgid "Load images for HTML messages over HTTP"
+msgstr "Load images for HTML messages over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
+#| 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 "
+#| "contacts. \"2\" - Always load images off the net."
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Prompt to check if the user wants to go offline immediately"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13371,76 +13595,75 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognize emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Search for the sender photo in local address books"
-msgstr "Search for the sender photo in local addressbooks"
+msgstr "Search for the sender photo in local address books"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Sender email-address column in the message list"
 msgstr "Sender email-address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Server synchronization interval"
 msgstr "Server synchronization interval"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13448,59 +13671,59 @@ msgstr ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Spell checking color"
 msgstr "Spell checking color"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialog default height"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialog default width"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Text message part limit"
 msgstr "Text message part limit"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "The last time empty junk was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty trash was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13508,15 +13731,18 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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 "
@@ -13526,7 +13752,7 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 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."
@@ -13534,7 +13760,7 @@ msgstr ""
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 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 &lt;"
@@ -13546,22 +13772,21 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:147
 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 "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 "This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13569,7 +13794,7 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13577,7 +13802,7 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 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 "
@@ -13587,115 +13812,116 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline color for misspelled words when using inline spelling."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Use side-by-side or wide layout"
 msgstr "Use side-by-side or wide layout"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Whether disable ellipsizing feature of folder names in folder tree."
+#: ../mail/evolution-mail.schemas.in.h:178
+#| msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "Whether disable ellipsizing feature of folder names in side bar."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13703,15 +13929,15 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
@@ -13728,78 +13954,72 @@ msgstr ""
 msgid "Import mail from Elm."
 msgstr "יבא _קובץ יחיד"
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "תיקיית יעד:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "בחר תיקייה לייבא אליה"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "מייבא תיבת דואר"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "מייבא `%s'"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "סורק %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "יבא דואר מ-Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "הנושא הוא %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "רשימת תפוצה %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "הוסף חוק סינון"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "תבניות"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -13856,94 +14076,36 @@ msgid_plural "%d total"
 msgstr[0] "%d סה\"כ"
 msgstr[1] "%d סה\"כ"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
 msgid "New Mail Message"
 msgstr "הודאת דואר חדשה"
 
-#: ../mail/mail-component.c:924
-#, fuzzy
+#: ../mail/mail-component.c:928
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_הודעת דואר"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
 msgid "Compose a new mail message"
 msgstr "חבר הודעת דואר חדשה"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
 msgid "New Mail Folder"
 msgstr "תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:932
-#, fuzzy
+#: ../mail/mail-component.c:936
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_תיקיית דואר"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
 msgid "Create a new mail folder"
 msgstr "צור תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-component.c:1593
-msgid "Error"
-msgstr "שגיאה"
-
-#: ../mail/mail-component.c:1593
-msgid "Errors"
-msgstr "שגיאות"
-
-#: ../mail/mail-component.c:1594
-msgid "Warnings and Errors"
-msgstr "אזהרות ושגיאות"
-
-#: ../mail/mail-component.c:1595
-msgid "Debug"
-msgstr "ניפוי"
-
-#: ../mail/mail-component.c:1595
-msgid "Error, Warnings and Debug messages"
-msgstr "הודעות אזהרה, שגיאה וניפוי"
-
-#: ../mail/mail-component.c:1722
-msgid "Debug Logs"
-msgstr "יומני ניפוי"
-
-#: ../mail/mail-component.c:1736
-msgid "Show _errors in the status bar for"
-msgstr ""
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1752
-msgid "second(s)."
-msgstr "שניות."
-
-#: ../mail/mail-component.c:1758
-msgid "Log Messages:"
-msgstr "הודעות יומן:"
-
-#: ../mail/mail-component.c:1799
-msgid "Log Level"
-msgstr "רמת יומן"
-
-#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "שעה"
-
-#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "הודעות"
-
-#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "סגור חלון זה"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _בדוק עבור סוגים נתמכים "
@@ -14227,131 +14389,133 @@ msgid "Empty trash folders on e_xit"
 msgstr "רוקן את תיקיות האשפה בי_ציאה"
 
 #: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
-msgstr ""
+#, fuzzy
+#| msgid "Enable or disable magic space bar"
+msgid "Enable Magic S_pacebar"
+msgstr "Enable or disable magic space bar"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "אפשר _תיקיות חיפוש"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Encry_ption certificate:"
 msgstr "תעודת ה_צפנה:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Encrypt out_going messages (by default)"
 msgstr "הצפן הודעות יוצ_אות (כברירת מחדל)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Fi_xed-width:"
 msgstr "רו_חב-קבוע:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "Fix_ed width Font:"
 msgstr "גופן _רוחב קבוע:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Font Properties"
 msgstr "מאפייני גופן"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Full Nam_e:"
 msgstr "_שם מלא:"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
 msgid "HTML Messages"
 msgstr "הודעות HTML"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "H_TTP Proxy:"
 msgstr "_מתווך HTTP:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Headers"
 msgstr "כותרות"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Highlight _quotations with"
 msgstr "הדגש _ציטוטים עם"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Inline"
 msgstr "פנימי"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "תויות"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Languages Table"
 msgstr "טבלת שפות"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Configuration"
 msgstr "הגדרות דואר"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Mailbox location"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Message Composer"
 msgstr "עורך הודעה"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "No _Proxy for:"
 msgstr "אין _מתווך עבור:"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "Or_ganization:"
 msgstr "_ארגון:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "PGP/GPG _Key ID:"
 msgstr "מזהה מפתח _PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pass_word:"
 msgstr "_סיסמה:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14359,7 +14523,7 @@ msgstr ""
 "אנא הכנס מידע על דרך שליחת הדואר. אם אינך בטוח, שאל את מנהל המערכת או את ספק "
 "האינטרנט."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 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 "
@@ -14368,130 +14532,138 @@ msgstr ""
 "נא הכנס את שמך וכתובת הדוא\"ל שלך. אין חובה למלא את השדות ה \"לא הכרחיים\","
 "אלא אם אתה מעוניין לכלול מידע זה בהודעות שאתה שולח."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Please select among the following options"
 msgstr "בחר בבקשה מהאפשרויות הבאות"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Port:"
 msgstr "שער:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_member password"
 msgstr "_זכור את הסיסמה"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Re_ply-To:"
 msgstr "ה_שב אל:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Remember _password"
 msgstr "זכור _סיסמה"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_OCKS Host:"
 msgstr "מארח S_OCKS:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Search for the sender photo in local addressbooks"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_elect..."
 msgstr "ב_חר..."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 #, fuzzy
 msgid "S_end message receipts:"
 msgstr "ש_לח הודעה ל..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_tandard Font:"
 msgstr "גופן _רגיל:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "בחר תיקיית טיוטות"
+
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "בחר גופן רוחב קבוע עבור HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
 msgstr "בחר גופן רוחב קבוע עבור הדפסת HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
 msgstr "בחר גופן רוחב משתנה עבור HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font for printing"
 msgstr "בחר גופן רוחב משתנה עבור הדפסת HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "בחר תיקיית דואר נשלח"
+
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "שליחת דואר"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
 msgid "Sent _Messages Folder:"
 msgstr "תיקיית הודעת ש_נשלחו:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr "ה_שרת דורש הזדהות"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_סוג השרת: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid "Sig_ning certificate:"
 msgstr "תעודת _חתימה:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "ח_תימה:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "חתימות"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "Signatures Table"
 msgstr "טבלת חתימות"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid "Spell Checking"
 msgstr "בדיקת איות"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "_סוג: "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14499,26 +14671,26 @@ msgstr ""
 "הקלד את שם החשבון.\n"
 "למשל \"עבודה\" או \"אישי\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "Us_ername:"
 msgstr "שם מ_שתמש:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
 msgstr "שימוש בה_זדהות"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "שם משתמש:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "V_ariable-width:"
 msgstr "_רוחב-משתנה:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14528,127 +14700,127 @@ msgstr ""
 "\n"
 "לחץ \"קדימה\" להתחיל. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Add Signature"
 msgstr "הו_סף חתימה"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Always load images from the Internet"
 msgstr "תמיד _טען תמונות מהאינטרנט"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Automatic proxy configuration URL:"
 msgstr "Automatic smiley recognition"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Direct connection to the Internet"
 msgstr "חיבור _ישיר לאינטרנט"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
 msgid "_Forward style:"
 msgstr "_סגנון העברה:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "_Load images in messages from contacts"
 msgstr "טען _תמונות בהודעות מאנשי קשר"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Lookup in local address book only"
 msgstr "ספר הכתובות של אבולוציה"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
 msgid "_Make this my default account"
 msgstr "ה_פוך חשבון זה לחשבון ברירת המחדל"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
 msgid "_Manual proxy configuration:"
 msgstr "הגדרות מתווך י_דניות:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Mark messages as read after"
 msgstr "_סמן הודעות כאילו שנ_קראו לאחר"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "_Never load images from the Internet"
 msgstr "אל תטען תמונות מהאינטרנט ל_עולם"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "_Path:"
 msgstr "_נתיב:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_התרע כאשר הודעות HTML נשלחות לאנשי קשר של רוצים אותן"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ה_תרע כאשר הודעות עם נושא ריק נשלחות"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
 msgid "_Script:"
 msgstr "_תסריט:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
 msgid "_Secure HTTP Proxy:"
 msgstr "_מתווך HTTP מאובטח"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
 msgid "_Select..."
 msgstr "ב_חר..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
 msgid "_Show image animations"
 msgstr "הצג _אנימציות"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
 msgid "_Show the photograph of sender in the message preview"
 msgstr "הצג את _תמונת השולח בתצוגה המקדימה של ההודעה"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
 msgid "_Use Secure Connection:"
 msgstr "השתמש ב_תקשורת מאובטחת:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
 msgid "_Use system defaults"
 msgstr "הש_תמש בברירת מחדל של המערכת"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
 msgid "_Use the same fonts as other applications"
 msgstr "השתמש באותם _גופנים כמו יישומים אחרים"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "כתובות"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "צבע"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
 msgid "description"
 msgstr "תיאור"
 
@@ -14696,7 +14868,7 @@ msgstr "_חפש:"
 msgid "Find in Message"
 msgstr "חפש בהודעה"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -14747,135 +14919,135 @@ msgstr ""
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "מסנן את ההודעות המסומנות"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "מקבל דואר"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "שולח הודעה"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "שולח הודעה %d מתןך %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "בוטל."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "הסתיים."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "שומר את ההודעה בתיקייה"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "מעביר את ההודעות ל%s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "מעתיק את ההודעות ל%s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "פותח את התיקייה %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "עורך אנשי הקשר"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
-msgstr ""
+msgstr "מסיר את התיקייה %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
-msgstr ""
+msgstr "רענן תיקייה"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "מרוקן את האשפה ב-'%s'"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "תיקיות מקומיות"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "מקבל הודעה %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14883,52 +15055,52 @@ msgstr[0] "מקבל הודעה %d"
 msgstr[1] "מקבל %d הודעות"
 
 # c-format
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "שומר הודעה אחת"
 msgstr[1] "שומר %d הודעות"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "שומר תצריף"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "מתנתק מ %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "מתחבר מחדש ל %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "בודק שירות"
 
@@ -14944,39 +15116,39 @@ msgstr "שלח וקבל דואר"
 msgid "Cancel _All"
 msgstr "בטל ה_כל"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "ממתין..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "בדיקת דואר חדש"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "הכנס סיסמה עבור %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "הכנס סיסמה"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:214
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "הכנס סיסמה עבור %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "הכנס סיסמה"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "המשתמש ביטל את הפעולה."
 
@@ -15021,21 +15193,21 @@ msgstr "תיקייה לא תקינה: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "ערוך תיקיית חיפוש"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "תיקיית חיפוש חדשה"
 
@@ -15211,9 +15383,8 @@ msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "בדוק דואר _זבל"
+msgstr "בדיקת דואר זבל נכשלה"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15223,7 +15394,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
-msgstr ""
+msgstr "לא ניתן לשמור קובץ חתימה."
 
 #: ../mail/mail.error.xml.h:44
 msgid "Delete \"{0}\"?"
@@ -15593,85 +15764,85 @@ msgstr ""
 msgid "_Open Messages"
 msgstr "_פתח הודעות"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "לא נצפה"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "נצפה"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "נענה"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "הועבר"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "הכי נמוך"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "נמוך יותר"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "גבוה יותר"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "הכי גבוה"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "היום %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "אתמול %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "יוצר רשימת הודעות"
 
-#: ../mail/message-list.c:4223
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4225
+#: ../mail/message-list.c:4290
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr "Whether to notify new messages in Inbox folder only."
@@ -15705,39 +15876,45 @@ msgstr "הודעות שנשלחו"
 msgid "Size"
 msgstr "גודל"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+#| msgid "_Subject Field"
+msgid "Subject - Trimmed"
+msgstr "שדה _הנושא"
+
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "אל תעביר"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "לידיעתך"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "העבר"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "השב"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "השב לכולם"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr ""
 
@@ -15794,8 +15971,8 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "מילות מפתח"
 
@@ -15828,7 +16005,7 @@ msgstr "_ערוך הודעה"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
@@ -15853,7 +16030,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
-msgstr ""
+msgstr "שחזר מגיבוי"
 
 #: ../plugins/backup-restore/backup-restore.c:278
 msgid ""
@@ -16008,7 +16185,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
-msgstr ""
+msgstr "הרשאות לא מספקות"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 #, fuzzy
@@ -16046,37 +16223,37 @@ msgstr "שחזר _הגדרות..."
 msgid "_Backup Settings..."
 msgstr "_הגדרות גיבוי..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "אנשי קשר אוטומטיים"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 #, fuzzy
 msgid "Instant Messaging Contacts"
 msgstr "<b>הודעות מידיות</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 #, fuzzy
 msgid "Select Address book for Pidgin buddy list"
 msgstr "בחר ספר כתובות"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -16092,27 +16269,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
 #, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "Convert mail text to Unicode"
@@ -16130,34 +16307,42 @@ msgstr ""
 "different character sets."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid "Bogofilter Options"
-msgstr "Log filter actions"
+msgstr "אפשרויות Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "Log filter actions"
+msgstr "תוסף דואר זבל Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_כתובת:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "השתמש ב-_SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "_רענן:"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "מקורות יומני CalDAV"
@@ -16174,13 +16359,6 @@ msgstr "יומנים מקומיים"
 msgid "Provides core functionality for local calendars."
 msgstr ""
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
-msgid "Re_fresh:"
-msgstr "_רענן:"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "חיבור _מאובטח"
@@ -16197,48 +16375,61 @@ msgstr "יומני HTTP"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "מזג אויר: מעונן"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "מזג אויר: ערפל"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "מזג אויר: מעונן חלקית"
+msgid "Weather: Cloudy"
+msgstr "מזג אויר: מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "מזג אויר: גשם"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "מזג אויר: מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "מזג אויר: גשם"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "מזג אויר: ממטרים"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Snow"
 msgstr "מזג אויר: שלג"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Sunny"
 msgstr "מזג אויר: שמש"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "לוחות שנה"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
 msgstr "מזג אויר: סופות רעמים"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "בחר מיקום"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_יחידות:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
@@ -16284,26 +16475,26 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "הם ברצונך להפוך את Evolution ללקוח דואר ברירת המחדל?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 #, fuzzy
 msgid "Mark as _default address book"
 msgstr "_סמן כנקרא"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 #, fuzzy
 msgid "Mark as _default calendar"
 msgstr "_סמן כנקרא"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 #, fuzzy
 msgid "Mark as _default task list"
 msgstr "_סמן כנקרא"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 #, fuzzy
 msgid "Mark as _default memo list"
 msgstr "_סמן כנקרא"
@@ -16319,18 +16510,18 @@ msgid ""
 "default one."
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 #, fuzzy
 msgid "_Custom Header"
 msgstr "כותרות"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 #, fuzzy
 msgid "Key"
 msgstr "קניה"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "ערכים"
 
@@ -16369,6 +16560,13 @@ msgstr ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "פתח תיקייה של משתמש אחר"
@@ -16386,120 +16584,126 @@ msgid "_User:"
 msgstr "_משתמש:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "סיסמה מאובטחת"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "סיסמת טקסט פשוט"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "אני מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "אני במשרד"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "החלף את הסיסמה עבור חשבון ה-Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "החלף סיסמה"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 #, fuzzy
 msgid "Delegation Assistant"
 msgstr "אשף ההגדרות של Evolution"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "כללי"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "גודל תיקיות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "הגדרות Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_כתובת OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
 msgstr "הז_דהה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+#, fuzzy
+#| msgid "Specify _filename:"
+msgid "S_pecify the mailbox name"
+msgstr "ציין _שם קובץ:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_תיבת דואר:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
 msgstr "סוג _הזדהות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "ב_דוק עבור סוגים נתמכים"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16534,38 +16738,38 @@ msgstr "סיסמה חדשה:"
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "הרשאות עבור %s"
@@ -16573,7 +16777,7 @@ msgstr "הרשאות עבור %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16581,14 +16785,14 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr ""
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 #, fuzzy
 msgid "You are also permitted to see my private items."
 msgstr "צור פריט מבחן חדש"
@@ -16596,53 +16800,53 @@ msgstr "צור פריט מבחן חדש"
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 #, fuzzy
 msgid "Delegate To"
 msgstr "מחק"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "לא ניתן לבטל"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "שגיאה בזמן טעינת ספר הכתובות."
@@ -16696,11 +16900,11 @@ msgstr "_משימות:"
 msgid "Permissions..."
 msgstr "הרשאות..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "שם תיקייה"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "גודל תיקייה"
 
@@ -16718,21 +16922,21 @@ msgstr "הרשם לתיקייה של משתמש אחר"
 msgid "Exchange Folder Tree"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr ""
@@ -16791,19 +16995,19 @@ msgstr ""
 msgid "_Change Password"
 msgstr "ה_חלף סיסמה"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "אין הרשאות"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "הוסף משתמש:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:408
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "הוסף משתמש"
 
@@ -16922,11 +17126,11 @@ msgstr "_רגישות:"
 msgid "_User"
 msgstr "_משתמש:"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "בחר משתמש"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "ספר כתובות..."
 
@@ -16949,94 +17153,98 @@ msgid "Exchange Operations"
 msgstr "פעולות Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot change password due to configuration problems."
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "לא ניתן להציג תיקיות."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "לא ניתן לבצע  את הפעולה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not authenticate to server."
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "לא ניתן לשנות את הסיסמה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 #, fuzzy
 msgid "Could not connect to Exchange server."
 msgstr "מתחבר לשרת..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 #, fuzzy
 msgid "Could not connect to server {0}."
 msgstr "מתחבר לשרת..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17052,109 +17260,109 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "התיקייה כבר קיימת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "התיקייה אינה קיימת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "התיקייה אינה מקוונת"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "שגיאה כללית"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "אין משתמש כזה {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "נא לאתחל את Evolution כדי שהשינויים יכנסו לתוקף"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "נא לבחור משתמש."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17163,70 +17371,70 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "שגיאה לא ידועה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "סוג לא ידוע"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "פעולה לא ניתמכת."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "אתה משתמש ב: {0} KB. נסה לפנות קצת מקום על ידי מחיקת מספר הודעות."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "אתה משתמש ב: {0} KB. לא תוכל לשלוח או לקבל דואר עכשיו."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17234,19 +17442,19 @@ msgstr ""
 "אתה משתמש ב: {0} KB. לא תוכל לשלוח או לקבל דואר עד שלא תפנה מקום על ידי "
 "מחיקת מספר הודעות."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "פג תוקף הסיסמה שלך."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} כבר ברשימה"
 
@@ -17290,7 +17498,8 @@ msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
-"‏Evolution לא הצליח ליצור קובץ זמני כדי לשמור את הדואר שלך. נסה שוב מאוחר יותר."
+"‏Evolution לא הצליח ליצור קובץ זמני כדי לשמור את הדואר שלך. נסה שוב מאוחר "
+"יותר."
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
 msgid ""
@@ -17336,17 +17545,13 @@ msgid ""
 "faces This will be used in messages that are sent further."
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "פנים"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
@@ -17359,65 +17564,61 @@ msgstr ""
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
-msgid "Please enter user name first."
-msgstr "נא להכניס את שם המשתמש קודם."
-
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:440
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:540
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-source.c:693
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Cal_endar:"
 msgstr "יו_מן:"
 
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
 #, fuzzy
 msgid "Retrieve _list"
 msgstr "מקבל `%s'"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>שרת</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 #, fuzzy
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "תוסף להגדרת יומן google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "מקורות Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr ""
+#, fuzzy
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "תוסף להגדרת יומן google."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr ""
+msgid "GroupWise Account Setup"
+msgstr "הגדרות חשבון GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17432,24 +17633,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr ""
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "הגדרות דואר זבל"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "הגדרות דואר זבל"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "הגדרות דואר זבל..."
 
@@ -17463,7 +17664,7 @@ msgid "Email:"
 msgstr "דוא\"ל:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_כבה"
 
@@ -17472,9 +17673,8 @@ msgid "_Enable"
 msgstr "_אפשר"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "מבחן דואר זבל"
+msgstr "רשימת _דואר זבל"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
 #, fuzzy
@@ -17496,16 +17696,18 @@ msgid "Retract Mail"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+msgid "Add Send Options to GroupWise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr ""
+#, fuzzy
+#| msgid "GroupWise"
+msgid "GroupWise Features"
+msgstr "GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 #, fuzzy
@@ -17523,21 +17725,24 @@ msgstr "פתח את ההודעה שנבחרה בחלון חדש"
 msgid "Invalid user"
 msgstr "משתמש לא תקין"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "לא ניתן לפתוח קובץ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "ציין משתמש"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 
@@ -17559,23 +17764,25 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
 msgid "Would you like to accept it?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 #, fuzzy
 msgid "Would you like to decline it?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
 #, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "לא ניתן לפתוח קובץ"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17595,7 +17802,7 @@ msgid "Con_tacts..."
 msgstr "אנשי _קשר..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "הודעה"
 
@@ -17667,7 +17874,8 @@ msgstr "_כתוב"
 msgid "permission to read|_Read"
 msgstr "אין הרשאות"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "מתווך"
 
@@ -17675,14 +17883,15 @@ msgstr "מתווך"
 msgid "<b>Account Name</b>"
 msgstr "<b>שם חשבון</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "כניסת מתווך"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s הכנס סיסמה ל%s (משתמש %s("
@@ -17690,20 +17899,26 @@ msgstr "%s הכנס סיסמה ל%s (משתמש %s("
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "כניסת _מתווך..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "אפשרויות שליחה מתקדמות"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "משתמשים"
 
@@ -17719,71 +17934,71 @@ msgstr "תיקייה משותפת _חדשה..."
 msgid "Sharing"
 msgstr "משתף"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "התרעה מותאמת אישית"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "הוסף   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 #, fuzzy
 msgid "Modify"
 msgstr "מודל"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
 #, fuzzy
 msgid "Message Status"
 msgstr "של_ח הודעה לאיש קשר..."
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "נושא:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "מאת:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "תאריך יצירה :"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "נמענים:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
 #, fuzzy
 msgid "Delivered: "
 msgstr "_מחק"
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "נפתח: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "התקבל: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "נמחק: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "סורב: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "הסתיים: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "לא נימסר: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "של_ח הודעה לאיש קשר..."
@@ -17847,29 +18062,29 @@ msgstr ""
 msgid "IMAP Features"
 msgstr ""
 
-#: ../plugins/import-ics-attachments/icsimporter.c:77
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "י_בא ליומן"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_יבא למשימות"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:200
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 #, fuzzy
 msgid "Import ICS"
 msgstr "_יבא"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:223
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 #, fuzzy
 msgid "Select Task List"
 msgstr "משימות"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:227
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "בחר לוח שנה"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_יבא"
@@ -17883,28 +18098,28 @@ msgstr "יבא ליומן"
 msgid "Imports ICS attachments to calendar."
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr ""
 
@@ -17921,191 +18136,191 @@ msgstr "סנכרן ל-iPod"
 msgid "iPod Synchronization"
 msgstr "סנכרון iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:741
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:748
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:752
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:756
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:827
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:996
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1054
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1066
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1075
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1080
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1174
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1181
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1183
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1318
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1322
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 #, fuzzy
 msgid "Meeting information sent"
 msgstr "בחר פעולה"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 #, fuzzy
 msgid "Task information sent"
 msgstr "איש הקשר לא נמצא"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1354
 #, fuzzy
 msgid "Memo information sent"
 msgstr "איש הקשר לא נמצא"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1369
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1490
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1601
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1530
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2240
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2243
 msgid "This task recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2246
 msgid "This memo recurs"
 msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2492
+#: ../plugins/itip-formatter/itip-formatter.c:2524
 msgid "Conflict Search"
 msgstr ""
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2507
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "היום"
 
@@ -18559,11 +18774,11 @@ msgstr ""
 msgid "Show time as _free"
 msgstr "כותרת ההודעה"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_משימות :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "תזכורות :"
 
@@ -18591,7 +18806,7 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr ""
 
@@ -18671,22 +18886,22 @@ msgstr "Whether the icon should blink or not."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Whether to notify new messages in Inbox folder only."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "צור הו_דעת D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
 #, fuzzy
 msgid "Evolution's Mail Notification"
 msgstr "התרעות דואר"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
 #, fuzzy
 msgid "Mail Notification Properties"
 msgstr "התרעות דואר"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18701,56 +18916,56 @@ msgstr[1] ""
 "יש לך %d הודעות חדשות\n"
 "ב%s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "יש לך הודעה חדשה אחת."
 msgstr[1] "יש לך %d הודעות חדשות."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "דוא\"ל חדש"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "הצג איקון באיזור הה_תראות"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
 #, fuzzy
 msgid "_Play sound when new messages arrive"
 msgstr "השמע _צליל כאשר מגיע דואר חדש"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "_צפצף"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "_נגן קובץ שמע"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "ציין _שם קובץ:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "בחר קובץ שמע"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "נ_גן"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
@@ -18856,9 +19071,8 @@ msgid "_Un-subscribe to list"
 msgstr "_בטל רישום לרשימה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-#, fuzzy
 msgid "Action not available"
-msgstr "TLS לא זמין"
+msgstr "הפעולה לא זמינה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
@@ -18895,8 +19109,8 @@ msgstr "יוצר רשימת הודעות"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -19010,25 +19224,6 @@ msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 msgid "Used for marking all the messages under a folder as read"
 msgstr ""
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr ""
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-#, fuzzy
-msgid "Marks the selected calendar for offline viewing."
-msgstr "העבר את ההודעות שנבחרו לאשפה"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-#, fuzzy
-msgid "_Do not make available for offline use"
-msgstr "התחל במצב לא מקוון"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
-msgid "_Make available for offline use"
-msgstr "התחל במצב לא מקוון"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr ""
@@ -19044,7 +19239,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "מנהל תוספים"
 
@@ -19056,25 +19251,24 @@ msgstr "הפעל וכה תוספים"
 msgid "_Plugins"
 msgstr "_תוספים"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "יוצר(ים)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "הערה: חלק מהשינויים יכנסו לפעולה רק לאחר הפעלה מחדש"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
-msgstr "החלף"
+msgstr "סיכום"
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "תוסף"
 
@@ -19088,27 +19282,26 @@ msgstr ""
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "מודל טקסט"
+msgstr "מצב טקסט פשוט"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "הצג HTML אם קיים"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "העדף טקסט פשוט"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "מצב _HTML"
 
@@ -19121,6 +19314,20 @@ msgstr "תקלת Evolution"
 msgid "Writes a log of profiling data events."
 msgstr ""
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import mail from Pine."
+msgid "Import Outlook messages from PST file"
+msgstr "יבא דואר מ-Pine."
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr ""
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr ""
@@ -19139,8 +19346,10 @@ msgstr "מיקומים"
 msgid "_Publish Calendar Information"
 msgstr "מידע אישי"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+#| msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "להסיר את הכתובת"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19164,7 +19373,7 @@ msgstr "א_פשר"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
-msgstr "_פתחה:"
+msgstr "_שער:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 #, fuzzy
@@ -19176,8 +19385,17 @@ msgid "Publishing _Frequency:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
+#| msgid ""
+#| "SSH\n"
+#| "Public FTP\n"
+#| "FTP (with login)\n"
+#| "Windows share\n"
+#| "WebDAV (HTTP)\n"
+#| "Secure WebDAV (HTTPS)\n"
+#| "Custom Location"
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19225,6 +19443,17 @@ msgstr ""
 "‏iCal\n"
 "פנוי/עסוק:"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#, fuzzy
+#| msgid "Location"
+msgid "New Location"
+msgstr "מיקום"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#| msgid "Location"
+msgid "Edit Location"
+msgstr "ערוך מיקום"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 #, fuzzy
 msgid "Hello Python"
@@ -19243,7 +19472,7 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr ""
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr ""
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
@@ -19251,51 +19480,51 @@ msgstr ""
 msgid "Python Loader"
 msgstr "העבר לתיקייה"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, fuzzy, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, fuzzy, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, fuzzy, c-format
 msgid "SpamAssassin is not available."
 msgstr "אפשרויות שליחה לא זמינות."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "זה יהפוך את SpamAssassin לאמין יותר, אך הוא יעבוד לאט יותר"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "כלול בדיקות מ_רוחקות"
 
@@ -19306,12 +19535,14 @@ msgid ""
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "תוסף דואר זבל SpamAssassin"
+#, fuzzy
+#| msgid "Spamassassin Options"
+msgid "SpamAssassin Options"
+msgstr "אפשרויות Spamassassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "אפשרויות Spamassassin"
+msgid "SpamAssassin junk plugin"
+msgstr "תוסף דואר זבל SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19319,7 +19550,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "שמור תצריפים"
 
@@ -19331,16 +19562,16 @@ msgstr "שמור תצריפים..."
 msgid "Save all attachments"
 msgstr "שמור את כל התצריפים"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 #, fuzzy
 msgid "Select save base name"
 msgstr "בחר אזור זמן"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "סוג MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "שמור"
 
@@ -19348,81 +19579,81 @@ msgstr "שמור"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "רשימת תיאור"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "רשימת קטגוריות"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "רשימת הערות"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "נוצר"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "רשימת תפוצה"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "התחלה"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "סיום"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "כתובת"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 #, fuzzy
 msgid "Attendees List"
 msgstr "רענן רשימה"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 #, fuzzy
 msgid "Modified"
 msgstr "מודל"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
@@ -19444,15 +19675,15 @@ msgstr "שמירה ל_דיסק"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "תצורת RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "בחר קובץ יעד"
 
@@ -19487,15 +19718,15 @@ msgstr ""
 msgid "Setup Assistant"
 msgstr "עוזר"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "אשף ההגדרות של Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "ברוכים הבאים"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19507,28 +19738,28 @@ msgstr ""
 "\n"
 "לחצו \"קדימה\" כדי להמשך. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "מייבא קבצים"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "אנא בחר את המידע שברצומך לייבא:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "מ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "מייבא נתונים."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "המתן בבקשה"
@@ -19561,17 +19792,17 @@ msgstr ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:603
 #, fuzzy
 msgid "No title"
 msgstr "כותרת תפקיד"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 #, fuzzy
 msgid "Save as _Template"
 msgstr "שמור כטיוטה"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 #, fuzzy
 msgid "Save as Template"
 msgstr "שמור כטיוטה"
@@ -19581,7 +19812,7 @@ msgid "Drafts based template plugin"
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19610,7 +19841,7 @@ msgid "URL:"
 msgstr "כתובת:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19753,7 +19984,7 @@ msgstr "Sidebar is visible"
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialog"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -19956,17 +20187,16 @@ msgstr "יבא נתונים והגדרות מ תוכנות _ישנות יותר"
 msgid "Import a _single file"
 msgstr "יבא _קובץ יחיד"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "העדפות Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
-msgstr ""
-"‏%s ‏- Evolution"
+msgstr "‏%s ‏- Evolution"
 
 #: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -19988,7 +20218,7 @@ msgstr "אין אפשרות להריץ את כלי דיווח הבאגים."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "יאיר הרשקוביץ <yairhr@gmail.com>\n"
@@ -19997,27 +20227,23 @@ msgstr ""
 "פרוייקט תרגום GNOME לעברית:\n"
 "‏http://gnome-il.berlios.de"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "אתר Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr ""
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "עבודה במצב _לא מקוון"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "עבודה במצב לא מקוון"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20025,11 +20251,11 @@ msgstr ""
 "Evolution נמצאת במצב מקוון.\n"
 "לחץ כאן כדי לעבור למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "אבולוציה במהלך העברה למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20037,33 +20263,33 @@ msgstr ""
 "Evolution נמצאת במצב לא מקוון.\n"
 "לחץ כאן כדי לעבור למצב מקוון."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "החלף ל-%s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "שגיאת מערכת לא ידועה."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ק\"ב"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "אישור"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr ""
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "בסיס נתוני ההגדרות לא נמצא"
 
@@ -20071,17 +20297,16 @@ msgstr "בסיס נתוני ההגדרות לא נמצא"
 #: ../shell/e-user-creatable-items-handler.c:688
 #: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
-msgstr "חדש "
+msgstr "חדש"
 
 #: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
-msgstr "מבחן חדש"
+msgstr "בדיקה חדשה"
 
 #: ../shell/test/evolution-test-component.c:106
-#, fuzzy
 msgctxt "New"
 msgid "_Test"
-msgstr "_מבחן"
+msgstr "_בדיקה"
 
 #: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
@@ -20108,8 +20333,10 @@ msgid "Importer Type"
 msgstr ""
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr ""
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select Information to Import"
+msgstr "בחר תיקייה לייבא אליה"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20123,7 +20350,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20143,7 +20370,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:241
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20151,43 +20378,43 @@ msgstr ""
 "תודה\n"
 "צוות Evolution\n"
 
-#: ../shell/main.c:248
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "אל תודיע לי שוב"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:572
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and Email Client"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20201,32 +20428,38 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "לשכוח את כל הסיסמאות השמורות?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Cannot start Evolution"
+msgstr "הפעל מחדש את Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "המשך"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "מחיקת מידע ישן מגרסה {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution לא יכולה להתחיל."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "באמת למחוק מידע ישן?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20239,9 +20472,9 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20249,11 +20482,11 @@ msgid ""
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20262,14 +20495,14 @@ msgid ""
 "can continue."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20278,19 +20511,19 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_שכח"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_השאר נתונים"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_הזכר לי מאוחר יותר"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20351,7 +20584,7 @@ msgid "Purposes"
 msgstr "מטרות"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "מספר סידורי"
 
@@ -20371,22 +20604,22 @@ msgstr "כתובת דוא\"ל"
 msgid "All CA certificate files"
 msgstr "כל קבצי התעודות"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "מציג תעודות: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "הכנס את הסיסמה עבור `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr ""
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "הכנס סיסמה חדשה"
 
@@ -20415,11 +20648,11 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b>שדות תעודה</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>היררכית תעודה</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
@@ -20427,11 +20660,11 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>טביעות אצבע</b>"
 
 #: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
-msgstr ""
+msgstr "<b>הונפק על ידי</b>"
 
 #: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
@@ -20463,7 +20696,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "תעודה"
 
@@ -20539,11 +20772,11 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr "חתימת SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "תעודת לקוח SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "תעודת שרת SSL"
 
@@ -20589,182 +20822,182 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "התעודה כבר קיימת"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "גירסה"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "גירסה 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "גירסה 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "גירסה 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "רשות חתימת SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "לא קריטי"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "הרחבות"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
-msgstr ""
+msgstr "מנפיק"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "תעודה מיובאת"
 
@@ -20794,7 +21027,6 @@ msgid "Co_py All Contacts To..."
 msgstr "הע_תק את כל אנשי הקשר ל..."
 
 #: ../ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Contact _Preview"
 msgstr ""
 
@@ -20805,7 +21037,7 @@ msgstr "העתק"
 
 #: ../ui/evolution-addressbook.xml.h:7
 #, fuzzy
-msgid "Copy Selected Contacts to Another Folder..."
+msgid "Copy selected contacts to another folder"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
 #: ../ui/evolution-addressbook.xml.h:8
@@ -20858,7 +21090,7 @@ msgstr "הזז אנשי קשר ל"
 
 #: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
-msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -20901,14 +21133,15 @@ msgid "Save as VCard..."
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr ""
+#, fuzzy
+msgid "Save selected contacts as a VCard"
+msgstr "אנשי קשר..."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "בחר הכל"
 
@@ -20921,16 +21154,19 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr ""
+#, fuzzy
+#| msgid "Delete selected contacts"
+msgid "Send a message to the selected contacts"
+msgstr "מחק את איש הקשר הנבחר"
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr ""
+#, fuzzy
+msgid "Send selected contacts to another person"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
@@ -20952,7 +21188,7 @@ msgstr "עצור טעינה"
 msgid "View the current contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_פעולות"
@@ -21045,7 +21281,7 @@ msgid "Month"
 msgstr "חודש"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "הבא"
 
@@ -21054,7 +21290,7 @@ msgid "Previews the calendar to be printed"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "הקודם"
 
@@ -21110,15 +21346,24 @@ msgstr "הצג את שבוע העבודה"
 msgid "View the current appointment"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "שבוע"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "שבוע עבודה"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "עמוד"
+
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Open Appointment"
 msgstr "_פתח פגישה"
 
@@ -21191,10 +21436,6 @@ msgstr ""
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr ""
-
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_תצוגה קלאסית"
@@ -21203,11 +21444,6 @@ msgstr "_תצוגה קלאסית"
 msgid "_Copy Folder To..."
 msgstr "ה_עתק תיקייה אל..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-#, fuzzy
-msgid "_Debug Logs"
-msgstr "עמוד"
-
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr "_הורדת הודעות לשימוש לא מקוון"
@@ -21233,7 +21469,7 @@ msgstr "ת_צוגה מקדימה"
 #.
 #: ../ui/evolution-mail-global.xml.h:32
 #, fuzzy
-msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "תיאור:"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21317,10 +21553,6 @@ msgstr "הסר לצמיתות את כל ההודעות שנמחקו מהתיקי
 msgid "Permanently remove this folder"
 msgstr "הסר את תיקייה זאת לצמיתות"
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "_רענן:..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "רענן את התיקייה"
@@ -22076,9 +22308,8 @@ msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
-msgstr "Toolbar is visible"
+msgstr "סגנון _סרגל כלים"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -22142,7 +22373,7 @@ msgstr "_חלון"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr ""
+msgstr "לפי _חברה"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
@@ -22248,7 +22479,7 @@ msgstr ""
 "לחץ על הפתור הימני בעכבר כדי להתרחק."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 #, fuzzy
 msgid "Collection"
 msgstr "מיקום"
@@ -22271,17 +22502,17 @@ msgid "Define Views for \"%s\""
 msgstr ""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "טבלה"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr ""
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "שמור תצוגה נוכחית"
 
@@ -22294,43 +22525,43 @@ msgid "_Replace existing view"
 msgstr "ה_חלף תצוגה קיימת"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "תצוגה מותאמת אישית"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr ""
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "תצוגה _נוכחית"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:328
 #, fuzzy, c-format
 msgid "Select View: %s"
 msgstr "תצוגת שבוע"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:382
 #, fuzzy
 msgid "Save current custom view"
 msgstr "שמור תצוגה נוכחית"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:396
 #, fuzzy
 msgid "Create or edit views"
 msgstr "צור פריט מבחן חדש"
@@ -22356,17 +22587,17 @@ msgstr "תצוגת יום"
 msgid "Type of view:"
 msgstr "סוג תצוגה:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "לא ניתן לצרף את הקובץ %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -22388,438 +22619,438 @@ msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 #, fuzzy
 msgid "Month Calendar"
 msgstr "לוח שנה"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 #, fuzzy
 msgid "Fill color"
 msgstr "צבע"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 #, fuzzy
 msgid "Fill stipple"
 msgstr "_סוג הקובץ:"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "רוחב מינימלי"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "רוחב מינימלי"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "עכשיו"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "ערבית"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "בלטי"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "מרכז אירופי"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "סינית"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "קירילי"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "יוונית"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "יפנית"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "קוראנית"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "תאילנדית"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "טורקית"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "יוניקוד"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "מערב אירופאי, חדש"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "מסורתי"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "מופשט"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "אוקראינית"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "ויזואלי"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "קידוד תווים לא ידוע: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "קידוד תווים"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "אחר..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "קידוד _תווים"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "תאריך ושעה"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "ע_כשיו"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "ה_יום"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "תאריך בלתי חוקית"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 #, fuzzy
 msgid "Invalid Time Value"
 msgstr "חתימה בלתי חוקית"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "חיפוש מתקדם"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "שמור חיפוש"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_חיפושים"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "חיפושים"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "שמור _חיפוש..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "_ערוך חיפושים שמורים"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "חיפוש _מתקדם..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "כל החשבונות"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "חשבון נוכחי"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "תיקייה נוכחית"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "הודעה נוכחית"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "בחר תמונה"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "מפת עולם"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "מקוון"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync with:"
 msgstr "מסתיים ב"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "קטגוריות סנכרון:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "הודעה ריקה"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "רוחב עמודה"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "לחץ כאן לצרף קובץ"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "חפש _עכשיו"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_נקה"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "טקסט"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "ת_צוגה: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "_חיפוש: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr ""
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 #, fuzzy
 msgid "Cursor Row"
 msgstr "יש סמן"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr ""
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 #, fuzzy
 msgid "Sorter"
 msgstr "מקור"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 #, fuzzy
 msgid "Selection Mode"
 msgstr "בחר תיקייה"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
-msgstr ""
+msgstr "מצב סמן"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 #, fuzzy
 msgid "When de_leted:"
 msgstr "%d נמחק"
@@ -22953,19 +23184,19 @@ msgid "_When opened:"
 msgstr "_איפה:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% הסתיים)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "לחץ כאן כדי לעבור לכתובת"
 
@@ -22986,7 +23217,7 @@ msgstr "_קטגוריות אפשרויות:"
 msgid "categories"
 msgstr "קטגוריות"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr ""
 
@@ -23006,23 +23237,23 @@ msgstr ""
 msgid "Unselected Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr ""
 
@@ -23060,7 +23291,7 @@ msgid "A_vailable Fields:"
 msgstr "_שדות אפשריים:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "עולה"
 
@@ -23073,7 +23304,7 @@ msgid "Clear _All"
 msgstr "_נקה הכל"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "יורד"
 
@@ -23139,17 +23370,17 @@ msgid "_Sort..."
 msgstr "_מיין..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 #, fuzzy
 msgid "DnD code"
 msgstr "יוניקוד"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "כותרת מלאה"
 
@@ -23168,326 +23399,405 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (פריט אחד)"
 msgstr[1] "%s : %s (%d פריטים)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (פריט אחד)"
 msgstr[1] "%s (%d פריטים)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 #, fuzzy
 msgid "Draw focus"
 msgstr "יש פוקוס"
 
+#: ../widgets/table/e-table-group-container.c:950
 #: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 #, fuzzy
 msgid "Selection model"
 msgstr "בחר תיקייה"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 #, fuzzy
 msgid "Frozen"
 msgstr "מאת"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 #, fuzzy
 msgid "Customize Current View"
 msgstr "תצוגה נוכחית"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "מיין בסדר _עולה"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "מיין בסדר _יורד"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_בטל מיון"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "קבץ לפי ש_דה זה"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 #, fuzzy
 msgid "Group By _Box"
 msgstr "ה_עתק..."
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "הוסף עמודה..."
 
-#: ../widgets/table/e-table-header-item.c:1483
-#, fuzzy
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
-msgstr "פגישה"
+msgstr "_יישור"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 #, fuzzy
 msgid "Format Column_s..."
 msgstr "הוסף _עמודה..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 #, fuzzy
 msgid "Custo_mize Current View..."
 msgstr "תצוגה נוכחית"
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_מיין לפי"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_מותאם אישית"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "תיאור גופן"
 
-#: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "מידע מיון"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 #, fuzzy
 msgid "Tree"
 msgstr "פנוי"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 #, fuzzy
 msgid "Table header"
 msgstr "כותרת ההודעה"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 #, fuzzy
 msgid "Table model"
 msgstr "מודל טקסט"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 #, fuzzy
 msgid "Cursor row"
 msgstr "יש סמן"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 #, fuzzy
 msgid "Always search"
 msgstr "תמיד"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 #, fuzzy
 msgid "Use click to add"
 msgstr "לחץ כאן כדי להוסיף משימה"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr ""
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "שיטות קלט"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 #, fuzzy
 msgid "Event Processor"
 msgstr "הכנס סיסמה"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "מודגש"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "קו חוצה"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "עוגן"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "יישור"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 #, fuzzy
 msgid "Clip Width"
 msgstr "רוחב עמודה"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 #, fuzzy
 msgid "Clip Height"
 msgstr "גובה"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "רוחב טקסט"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "גובה טקסט"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 #, fuzzy
 msgid "Line wrap"
 msgstr "ליבריה"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 #, fuzzy
 msgid "Max lines"
 msgstr "שוליים"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "מיקום סמן"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
 msgid "IM Context"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#, fuzzy
+#~ msgid "Business"
+#~ msgstr "פקס עסקי"
+
+#, fuzzy
+#~ msgid "Competition"
+#~ msgstr "תאריך סיום"
+
+#~ msgid "Favourites"
+#~ msgstr "מועדפים"
+
+#~ msgid "Gifts"
+#~ msgstr "מתנות"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "מטרות/יעדים"
+
+#~ msgid "Holiday"
+#~ msgstr "חג"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "כרטיסי ברכה"
+
+#, fuzzy
+#~ msgid "Hot Contacts"
+#~ msgstr "אנשי קשר"
+
+#~ msgid "Ideas"
+#~ msgstr "רעיונות"
+
+#, fuzzy
+#~ msgid "International"
+#~ msgstr "מסורתי"
+
+#, fuzzy
+#~ msgid "Key Customer"
+#~ msgstr "התאם"
+
+#, fuzzy
+#~ msgid "Miscellaneous"
+#~ msgstr "כללי"
+
+#~ msgid "Phone Calls"
+#~ msgstr "שיחות טלפון"
+
+#, fuzzy
+#~ msgid "Strategies"
+#~ msgstr "קטגוריות"
+
+#, fuzzy
+#~ msgid "Suppliers"
+#~ msgstr "ה_חל מסננים"
+
+#~ msgid "Waiting"
+#~ msgstr "ממתין"
+
+#~ msgid "Next 7 Days"
+#~ msgstr "7 הימים הבאים"
+
+#, fuzzy
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "הוסף חוק סינון"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "מזג אויר: מעונן חלקית"
+
+#~ msgid "Please enter user name first."
+#~ msgstr "נא להכניס את שם המשתמש קודם."
+
+#, fuzzy
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "העבר את ההודעות שנבחרו לאשפה"
+
+#~ msgid "Re_fresh..."
+#~ msgstr "_רענן:..."
+
 #~ msgid "Upcoming Appointments"
 #~ msgstr "פגישות קרובות"
 
@@ -23658,9 +23968,6 @@ msgstr ""
 #~ msgid "PGP Sign"
 #~ msgstr "חתימת PGP"
 
-#~ msgid "Save As"
-#~ msgstr "שמור בשם"
-
 #~ msgid "Save in folder..."
 #~ msgstr "שמור בתיקייה..."
 
@@ -23682,14 +23989,6 @@ msgstr ""
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>מידע על השרת</b>"
 
-#, fuzzy
-#~ msgid "Select Drafts Folder"
-#~ msgstr "בחר תיקייה"
-
-#, fuzzy
-#~ msgid "Select Sent Folder"
-#~ msgstr "בחר תיקייה"
-
 #~ msgid "_Categories..."
 #~ msgstr "_קטגוריות..."
 
@@ -23910,9 +24209,6 @@ msgstr ""
 #~ msgid "description of appointment"
 #~ msgstr "תחילת הפגישה"
 
-#~ msgid "Dismiss"
-#~ msgstr "שחרר"
-
 #~ msgid "Dismiss All"
 #~ msgstr "שחרר הכל"
 
diff --git a/po/ru.po b/po/ru.po
index f9d2323cee..a664f1ea2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,12 +6,12 @@
 # Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008.
 # Michael Yakhontov <mvy@asplinux.ru>, 2003, 2005.
 # Anatol Kamynin <anatol@tiflocomp.ru>, 2008.
-#: ../shell/main.c:594
+#: ../shell/main.c:603
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 04:25+0300\n"
+"POT-Creation-Date: 2009-01-19 08:13+0300\n"
 "PO-Revision-Date: 2008-08-04 16:58+0300\n"
 "Last-Translator: Nickolay V. Shmyrev <nshmyrev@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -156,7 +156,7 @@ msgid "calendar view for one or more days"
 msgstr "окно календаря для просмотра одного или более дней"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:792
+#: ../calendar/gui/calendar-component.c:803
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
@@ -167,8 +167,8 @@ msgstr "%A, %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1584
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d %b"
@@ -176,9 +176,9 @@ msgstr "%a, %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:797
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:804
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -186,10 +186,10 @@ msgstr "%a, %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:816
-#: ../calendar/gui/calendar-component.c:823
-#: ../calendar/gui/calendar-component.c:829
-#: ../calendar/gui/calendar-component.c:831
+#: ../calendar/gui/calendar-component.c:827
+#: ../calendar/gui/calendar-component.c:834
+#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:842
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -199,8 +199,8 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:821
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1600
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -415,11 +415,11 @@ msgstr "Ошибка сохранения {0} в {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
-msgstr "Сбой аутентификации на сервере LDAP."
+msgstr "Сбой проверки подлинности на сервере LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
 msgid "Failed to delete contact"
 msgstr "Не удалось удалить контакт"
 
@@ -559,7 +559,7 @@ msgstr "_Использовать как есть"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -568,17 +568,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:491
 msgid "Default Sync Address:"
 msgstr "Адрес синхронизации по умолчанию:"
 
-#: ../addressbook/conduit/address-conduit.c:1321
-#: ../addressbook/conduit/address-conduit.c:1322
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
 msgid "Could not load address book"
 msgstr "Не удалось загрузить адресную книгу"
 
-#: ../addressbook/conduit/address-conduit.c:1399
-#: ../addressbook/conduit/address-conduit.c:1402
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
 msgid "Could not read pilot's Address application block"
 msgstr "Не удалось прочитать блок приложения адресов Пилота"
 
@@ -601,7 +601,7 @@ msgstr "Здесь настраивается автозавершение"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1325
+#: ../addressbook/gui/component/addressbook-view.c:1213
 #: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
@@ -648,9 +648,9 @@ msgstr "Здесь можно управлять вашими сертифика
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
 #: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1518
+#: ../mail/message-list.c:1516
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
@@ -662,12 +662,11 @@ msgstr "На этом компьютере"
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:255 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Личное"
 
@@ -728,18 +727,18 @@ msgstr "Скопировать _книгу локально для автоно�
 
 #: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2444
+#: ../plugins/itip-formatter/itip-formatter.c:2466
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Общие"
 
 #: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Адресная книга"
@@ -750,7 +749,7 @@ msgstr "Сведения о сервере"
 
 #: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
-msgstr "Аутентификация"
+msgstr "Проверка подлинности"
 
 #: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
@@ -833,53 +832,60 @@ msgstr ""
 "\n"
 "Производится преобразование ваших данных Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../addressbook/gui/component/addressbook-view.c:422
 #: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Переименовать папку \"%s\" в:"
 
-#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../addressbook/gui/component/addressbook-view.c:425
 #: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Переименование папки"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Имена папок не может содержать '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:941
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "_Новая адресная книга"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Сохранить как VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:945
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:652
-#: ../calendar/gui/e-calendar-table.c:1608
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "Пе_реименовать..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../addressbook/gui/component/addressbook-view.c:948
-#: ../calendar/gui/calendar-component.c:657
-#: ../calendar/gui/dialogs/comp-editor.c:2043
-#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
-#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Свойства"
 
-#: ../addressbook/gui/component/addressbook-view.c:1336
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
 msgstr "Выбор источника контактов"
 
@@ -951,7 +957,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI папки, использовавшейся в последний раз в диалоге выбора имен"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Vertical pane position"
 msgstr "Позиция вертикальной панели"
 
@@ -1186,7 +1192,7 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"Это метод, используемый Evolution для авторизации вас на сервере. Учтите, "
+"Это метод, используемый Evolution для проверки подлинности отправителя на сервере. Учтите, "
 "что установка этого параметра в \"Адрес электронной почты\" требует "
 "использования анонимного доступа к вашему серверу LDAP."
 
@@ -1274,8 +1280,9 @@ msgstr "карточек"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
 #: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/calendar-weather/calendar-weather.c:524
 #: ../plugins/google-account-setup/google-source.c:671
 #: ../plugins/google-account-setup/google-contacts-source.c:338
 msgid "minutes"
@@ -1318,8 +1325,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Рабочий</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "AIM"
 msgstr "AIM"
 
@@ -1330,16 +1337,16 @@ msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -1348,11 +1355,12 @@ msgid "Full _Name..."
 msgstr "По_лное имя..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Изображение"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1365,7 +1373,7 @@ msgid "Nic_kname:"
 msgstr "Псевдон_им:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
@@ -1383,10 +1391,10 @@ msgstr "Телефон"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Служебное"
@@ -1409,7 +1417,7 @@ msgid "_Birthday:"
 msgstr "_День рождения:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:791
+#: ../calendar/gui/dialogs/event-page.c:792
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
@@ -1499,16 +1507,16 @@ msgstr "_Где:"
 msgid "_Zip/Postal Code:"
 msgstr "_Почтовый индекс:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "Address"
 msgstr "Адрес"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
@@ -1517,980 +1525,980 @@ msgstr "Адрес"
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
 #: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Изменяемый"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Соединенные Штаты"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Афганистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Албания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Алжир"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Американское Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Андорра"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Ангола"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Ангилья"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Антигуа и Барбуды"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Армения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Аруба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Азербайджан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Багамы"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Бахрейн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Беларусь"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Бельгия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Белиз"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Бенин"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Бермуды"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Боливия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Босния и Герцеговина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Ботсвана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Остров Буве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Британская территория Индийского океана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Бруней"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Болгария"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Буркина Фасо"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Канада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Кейп Верде"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Каймановы острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Центрально-Африканская Республика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Чад"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Чили"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Китай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Остров Рождества"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокосовые острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Колумбия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Коморос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Конго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Демократическая республика Конго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Острова Кука"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Коста-Рика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Кот-д-Ивуар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Куба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Кипр"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Чешская республика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Дания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Джибути"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Доминика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Доминиканская республика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Эквадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Египет"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "Сальвадор"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Экваториальная Гвинея"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Эритрея"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Эстония"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Фолклендские о-ва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Фарерские острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Фиджи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Финляндия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Франция"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Французская Гвиана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Французская Полинезия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Южные французские территории"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Габон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Гамбия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Грузия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Германия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Греция"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Гренландия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Гваделупа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Гуам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Гвинея Бисау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Гвиана"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Гаити"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Острова Heard и Макдональд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Holy See"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Гондурас"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Гонконг"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Венгрия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Исландия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Индия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Иран"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Остров Мэн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Израиль"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Италия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Ямайка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Япония"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Джерси"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Иордания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Кения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Корейская Народно-Демократическая Республика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Республика Корея"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Кувейт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Киргизстан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Лаос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Латвия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Ливан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Либерия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Ливия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Лихтенштейн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Литва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Макао"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Македония"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Малави"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Мальдивы"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Мали"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Мальта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Маршалловы о-ва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Мартиника"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Мавритания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Маврикий"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Майот"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Микронезия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Республика Молдова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Монако"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Монголия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Монтсеррат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Марокко"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Мьянма"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Намибия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Науру"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Непал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Нидерланды"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Нидерландские Антиллы"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Новая Каледония"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Новая Зеландия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Нигер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Нигерия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Острова Ниуе"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Норфолкские острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Северные Марианские острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Оман"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Палау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Палестинские территории"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Панама"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Папуа Новая Гвинея"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Парагвай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Перу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Филиппины"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Питкерн"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Польша"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Пуэрто-Рико"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Катар"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Реюньон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Румыния"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Российская Федерация"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Сент-Киттс и Невис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Санта Люсия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Сент-Винсент и Гренадины"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Самоа"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "Сан-Марино"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Сан-Томе и Принсипи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Саудовская Аравия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Сербия и Черногория"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Сейшеллы"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Сьерра-Леоне"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Словения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Соломоновы о-ва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Сомали"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Южная Африка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Южная Георгия и Южные Сандвичевы острова"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Испания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Остров Святой Елены"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Сен-Пьер и Микелон"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Судан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Суринам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Острова Свалбард и Йан Майен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Свазилэнд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Сирия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Таджикистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Соединённая Республика Танзания"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Тимор-Лист"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Того"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Тонга"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Тринидад и Тобаго"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Турция"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Острова Теркс и Кэйкос"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Уганда"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Украина"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Объединённые Арабские Эмираты"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Соединённое Королевство"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Венесуэла"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Вьетнам"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Британские Вирджинские о-ва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Американские Вирджинские о-ва"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Острова Вэлис и Футуна"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Западная Сахара"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Йемен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Замбия"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
@@ -2502,119 +2510,125 @@ msgstr "Зимбабве"
 msgid "Name"
 msgstr "Имя"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
 msgid "Service"
 msgstr "Служба"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Адрес"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Домашний"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../calendar/gui/e-calendar-view.c:2152
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2255
 msgid "Other"
 msgstr "Другие"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Книга-источник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Книга назначения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Является новым контактом"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Поля для записи"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Required Fields"
 msgstr "Требуемые поля"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
 msgid "Changed"
 msgstr "Изменено"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор контактов - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Выберите изображение для этого контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
 msgid "_No image"
 msgstr "_Нет изображения"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2622,43 +2636,43 @@ msgstr ""
 "Данные контакта неверны:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "неверный формат «%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "неверный формат %s«%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» пуст"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 msgid "Invalid contact."
 msgstr "Неверный контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
 msgid "_Edit Full"
 msgstr "_Изменить все"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
 msgid "_Full name"
 msgstr "_Полное имя"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
 msgid "E_mail"
 msgstr "_Эл. почта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
 msgid "_Select Address Book"
 msgstr "_Выберите адресную книгу"
 
@@ -2795,7 +2809,7 @@ msgstr "Служба сообщений:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/calendar-weather/calendar-weather.c:372
 #: ../plugins/exchange-operations/exchange-calendar.c:247
 #: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
@@ -2811,6 +2825,9 @@ msgid "Contact List Editor"
 msgstr "Редактор списка контактов"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:219
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
 msgid "Select..."
 msgstr "Выбрать..."
 
@@ -2839,7 +2856,7 @@ msgstr "_Участники"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2897,23 +2914,23 @@ msgstr "Объединить контакты"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
 #: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Эл. почта"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
@@ -2935,7 +2952,7 @@ msgstr[2] "%d контактов"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
@@ -2958,108 +2975,114 @@ msgstr "Модель"
 msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Источник"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
 msgid "Save as vCard..."
 msgstr "Сохранить как vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2041
-#: ../calendar/gui/e-calendar-table.c:1586
-#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2081
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1773 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "Со_здать контакт..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Соз_дать список контактов..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Сохранить как vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Переслать контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Переслать контакты"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Отправить _сообщение к контакту"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Отправить _сообщение в список"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Отправить _сообщение к контактам"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Печать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Коп_ировать в адресную книгу..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Пере_местить в адресную книгу..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Вырезать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:484
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1780 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "Вст_авить"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
 #: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
 #: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Любая категория"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Прочее"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
 msgid "Assistant"
 msgstr "Помощник"
 
@@ -3089,7 +3112,7 @@ msgstr "Телефон в машине"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3097,7 +3120,7 @@ msgid "Categories"
 msgstr "Категории"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Company"
 msgstr "Компания"
 
@@ -3146,22 +3169,22 @@ msgid "Journal"
 msgstr "Журнал"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Manager"
 msgstr "Мeнеджер"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Note"
 msgstr "Примечание"
 
@@ -3190,14 +3213,14 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Должность"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Spouse"
 msgstr "Супруг(а)"
 
@@ -3366,61 +3389,61 @@ msgstr "Выбрано"
 msgid "Has Cursor"
 msgstr "Имеет курсор"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2792
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
 msgid "_Send New Message To..."
 msgstr "_Отправить новое сообщение к..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Копировать адрес _эл.почты"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "(map)"
 msgstr "(карта)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
 msgid "map"
 msgstr "карта"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
 msgid "List Members"
 msgstr "Участники списка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Department"
 msgstr "Отдел"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Profession"
 msgstr "Профессия"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Position"
 msgstr "Должность"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
 msgid "Video Chat"
 msgstr "Видеочат"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:94
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2462
+#: ../calendar/gui/gnome-cal.c:2496
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
@@ -3432,50 +3455,48 @@ msgstr "Видеочат"
 msgid "Calendar"
 msgstr "Календарь"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Cвободен/занят"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Home Page"
 msgstr "Домашняя страница"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Web Log"
 msgstr "Веб-журнал"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2431
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2534
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2432
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2535
 msgid "Anniversary"
 msgstr "Годовщина"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
 msgid "Job Title"
 msgstr "Должность"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
 msgid "Home page"
 msgstr "Домашняя страничка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Blog"
 msgstr "Блог"
 
@@ -3509,7 +3530,7 @@ msgstr "Свой контакт не определён"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -3531,11 +3552,11 @@ msgstr "Протокол не поддерживается"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:364
 #: ../calendar/gui/e-cal-model-tasks.c:681
 #: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/print.c:2557
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2554
 msgid "Canceled"
 msgstr "Отменено"
 
@@ -3546,12 +3567,13 @@ msgstr "Не удалось отменить"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "Сбой проверки подлинности"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Required"
 msgstr "Требуется проверка подлинности"
 
@@ -3584,59 +3606,50 @@ msgstr "Неверная версия сервера"
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
 #: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
-msgstr "Неподдерживаемый метод авторизации"
+msgstr "Неподдерживаемый метод проверки подлинности"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 "Не удалось открыть эту адресную книгу. Это значит, что либо книга не "
-"помечена для автономного использования, либо еще не загружена для "
+"помечена для автономного использования, либо ещё не загружена для "
 "автономного использования. Загрузите эту книгу в режиме подключения к сети, "
-"чтобы получить доступ к ее содержимому"
+"чтобы получить доступ к её содержимому"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this address book.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 "Не удалось открыть эту адресную книгу. Убедитесь, что путь %s существует и "
 "что у вас имеются необходимые права доступа."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Не удалось открыть эту адресную книгу. Это значит, что либо введён неверный "
-"URI, либо сервер LDAP недоступен."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
+"Эта версия Evolution не имеет встроенной поддержки LDAP. Чтобы "
 "использовать LDAP в Evolution, необходимо установить пакет Evolution с "
 "поддержкой LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this address book.  This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
-"Не удалось открыть эту адресную книгу. Это значит, что либо введен неверный "
+"Не удалось открыть эту адресную книгу. Это значит, что либо введён неверный "
 "URI, либо сервер недоступен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
-msgid "Detailed error:"
-msgstr "Подробная ошибка:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "Подробное сообщение об ошибке:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3649,10 +3662,10 @@ msgstr ""
 "поднимите ограничения для выдачи результатов в\n"
 "настройках сервера каталога для этой адресной книги."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
@@ -3660,50 +3673,50 @@ msgstr ""
 "или ограничения, определённого для этой адресной книги.\n"
 "Пожалуйста, точнее определите условия поиска или\n"
 "поднимите ограничения времени в настройках сервера\n"
-"каталога для этой адресной книги."
+"каталога или в настройках этой адресной книги."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Компонент обработки этой адресной книги не смог обработать текущий запрос."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Компонент обработки этой адресной книги отказался обрабатывать текущий "
 "запрос."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:190
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Этот запрос завершился с ошибкой."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Ошибка добавления списка"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
-#: ../addressbook/gui/widgets/eab-gui-util.c:688
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Ошибка добавления контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Ошибка изменения списка"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Ошибка изменения контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Ошибка удаления списка"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:638
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Ошибка удаления контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3721,16 +3734,16 @@ msgstr[2] ""
 "Открытие %d контактов также откроет %d новых окон.\n"
 "Вы действительно хотите отобразить все эти контакты?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Не отображать"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:326
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Отображать _все контакты"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3739,15 +3752,15 @@ msgstr ""
 "%s уже существует\n"
 "Хотите переписать?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:356
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Перезаписать"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-#: ../addressbook/gui/widgets/eab-gui-util.c:400
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "контакт"
@@ -3755,50 +3768,50 @@ msgstr[1] "контакта"
 msgstr[2] "контактов"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:483
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Выберите адресную книгу"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "список"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:749
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Переместить контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Копировать контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Переместить контакты в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Копировать контакты в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Множество карточек"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard для %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:921
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Контактная информация"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:949
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Контактная информация %s"
@@ -4028,7 +4041,7 @@ msgstr "С тенью"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
 #: ../plugins/exchange-operations/exchange-calendar.c:236
 #: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
@@ -4059,28 +4072,6 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "Проверка редактора стиля печати контакта"
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
-msgid "This should test the contact print style editor widget"
-msgstr ""
-"Так можно проверить виджет правки стиля отображения контакта при печати"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "Проверка печати контакта"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "Проверка кода печати контакта"
-
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
@@ -4614,13 +4605,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Не удалось прочитать блок приложения ToDo пилота"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2435
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:1437
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4661,19 +4652,19 @@ msgid "Memo_s"
 msgstr "_Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1777 ../calendar/gui/memos-component.c:575
-#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1807 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
 msgid "Memos"
 msgstr "Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:713 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1645 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:566
-#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1675 ../calendar/gui/print.c:1981
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
@@ -4708,8 +4699,9 @@ msgstr[2] "минут"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
 #: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/calendar-weather/calendar-weather.c:525
 #: ../plugins/google-account-setup/google-source.c:672
 #: ../plugins/google-account-setup/google-contacts-source.c:339
 msgid "hours"
@@ -4729,9 +4721,9 @@ msgstr "Встречи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Адрес:"
@@ -4745,7 +4737,7 @@ msgid "_Dismiss"
 msgstr "_Отменить"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1336
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -4765,31 +4757,32 @@ msgstr "Напомнить по_зже"
 msgid "location of appointment"
 msgstr "место проведения встречи"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
 msgid "No summary available."
 msgstr "Сводка недоступна."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No location information available."
 msgstr "Данные об адресе недоступны."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "У вас есть %d сигналов"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4801,7 +4794,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4818,7 +4811,7 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -4995,50 +4988,66 @@ msgid "Level beyond which the message should be logged."
 msgstr "Уровень, за которым сообщение должно заноситься в журнал."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr "Список недавно использованных вторичных часовых поясов в обзоре дня."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of server URLs for free/busy publishing."
 msgstr "Список URL серверов для публикации сведений о занятости."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Marcus Bains Line"
 msgstr "Маркер текущего времени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Цвет маркера текущего времени - Обзор месяца"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Цвет маркера текущего времени - полоса времени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Максимальное количество хранимых недавних часовых поясов в списке "
+"«day_second_zones»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Максимальное число недавних часовых поясов."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Минуты завершения рабочего дня, от 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минуты начала рабочего дня, от 0 до 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Month view horizontal pane position"
 msgstr "Позиция горизонтальной панели в обзоре месяца"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view vertical pane position"
 msgstr "Позиция вертикальной панели в обзоре месяца"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Number of units for determining a default reminder."
 msgstr "Количество единиц для напоминания по умолчанию."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining when to hide tasks."
 msgstr "Количество единиц для определения момента, когда скрывать задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Overdue tasks color"
 msgstr "Цвет просроченных задач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5046,7 +5055,7 @@ msgstr ""
 "Положение горизонтальной панели между навигатором обзора и даты и списком "
 "задач когда не в режиме обзора месяца, в пикселах."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5054,7 +5063,7 @@ msgstr ""
 "Положение горизонтальной панели между навигатором обзора и даты и списком "
 "задач в режиме обзора месяца, в пикселах."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5062,7 +5071,7 @@ msgstr ""
 "Позиция вертикальной панели между списками календаря и навигатором дат "
 "календаря."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5070,7 +5079,7 @@ msgstr ""
 "Позиция вертикальной панели между списком задач и предварительным просмотром "
 "задачи, в пикселах."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5078,7 +5087,7 @@ msgstr ""
 "Положение вертикальной панели между навигатором обзора и даты и списком "
 "задач в режиме обзора месяца, в пикселах."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5086,70 +5095,82 @@ msgstr ""
 "Положение вертикальной панели между навигатором обзора и даты и списком "
 "задач когда не в режиме обзора месяца, в пикселах."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Программы, которые разрешено использовать как часть сигналов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr "Недавние вторичные часовые пояса в обзоре дня"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Save directory for alarm audio"
 msgstr "Каталог для сохранения звуковых файлов будильника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Отображать поле \"Должность\" в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show appointment end times in week and month views"
 msgstr "Отображать время окончания встреч в обзоре недели и месяца"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Отображать поле категорий в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show display alarms in notification tray"
 msgstr "Отображать экранные сигналы в области уведомления"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Отображать поле состояния в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "Show the \"Preview\" pane"
 msgstr "Показывать панель предварительного просмотра"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the \"Preview\" pane."
 msgstr "Отображать панель предварительного просмотра."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Отображать поле часового пояса в редакторе событий/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Отображать поле \"тип\" в редакторе событий/задач/собраний"
+msgstr "Отображать поле «тип» в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show week numbers in date navigator"
 msgstr "Показывать номера недель в навигаторе по датам"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Показывать вторичный часовой пояс в обзоре дня. Смысл значения такой же, как и в "
+"ключе «timezone»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Tasks due today color"
 msgstr "Цвет задач на сегодня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Tasks vertical pane position"
 msgstr "Позиция вертикальной панели задач"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5158,7 +5179,7 @@ msgstr ""
 "Шаблон URL для отправки данных о занятости. %u заменяется на левую часть "
 "почтового адреса (имя пользователя), %d - домен."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5167,7 +5188,11 @@ msgstr ""
 "непереведенного имени Olsen из базы часовых поясов, например \"America/New "
 "York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "The second timezone for a Day View"
+msgstr "Вторичный часовой пояс в обзоре дня"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5175,20 +5200,20 @@ msgstr ""
 "У этого ключа может быть одно из трёх значений: 0 — ошибки, 1 — "
 "предупреждения; 2 — отладочные сообщения."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Time divisions"
 msgstr "Разделители времени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Time the last alarm ran, in time_t."
 msgstr "Время последнего запуска сигнала, в формате in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5196,42 +5221,42 @@ msgstr ""
 "Прозрачность элементов в видах календаря, значение между 0 (полная "
 "прозрачность) и 1 (непрозрачность)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Twenty four hour time format"
 msgstr "24-часовой формат времени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Единицы напоминания по умолчанию, \"minutes\", \"hours\" или \"days\"."
+msgstr "Единицы напоминания по умолчанию, «minutes», «hours» или «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Единицы для определения момента скрытия задач, \"minutes\", \"hours\" или "
-"\"days\"."
+"Единицы для определения момента скрытия задач, «minutes», «hours» или "
+"«days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Week start"
 msgstr "Начало недели"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "День, с которого начинается неделя, с воскресенья (0) до субботы (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Использовать или нет область уведомления для отображения сигналов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Запрашивать подтверждение при удалении встречи или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Запрашивать подтверждение при очистке встречи или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5239,82 +5264,82 @@ msgstr ""
 "Ужимать ли выходные дни в обзоре месяца (суббота и воскресенье занимают "
 "место одного рабочего дня)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Показывать ли время завершения событий в обзоре недели и месяца."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Отображать ли маркер текущего времени в календаре."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Скрывать ли завершенные задачи в обзоре задач."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to set a default reminder for appointments."
 msgstr "Устанавливать ли напоминание для событий по умолчанию."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
-"Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+"Отображать ли поле «Просьба ответить» в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Отображать ли поле категорий в редакторе событий/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Отображать ли поле \"Должность\" в редакторе событий/задач/собраний"
+msgstr "Отображать ли поле «Должность» в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Отображать ли поле состояния в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Показывать ли время в 24-часовом формате вместо am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Отображать ли поле часового пояса в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Отображать ли поле \"тип\" в редакторе событий/задач/собраний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Показывать ли номера недель в навигаторе по датам."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Использовать ли летнее время при отображении событий."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Work days"
 msgstr "Рабочие дни"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Workday end hour"
 msgstr "Час завершения рабочего дня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Workday end minute"
 msgstr "Минуты завершения рабочего дня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Workday start hour"
 msgstr "Час начала рабочего дня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Workday start minute"
 msgstr "Минута начала рабочего дня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "daylight savings time"
 msgstr "летнее время"
 
@@ -5338,11 +5363,6 @@ msgstr "Комментарий содержит"
 msgid "Location contains"
 msgstr "Адрес содержит"
 
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "Прочее"
-
 #: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи на следующую неделю"
@@ -5371,13 +5391,13 @@ msgstr "Активные встречи"
 msgid "Next 7 Days' Appointments"
 msgstr "Встречи на следующую неделю"
 
-#: ../calendar/gui/calendar-commands.c:94 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печать"
 
-#: ../calendar/gui/calendar-commands.c:319
+#: ../calendar/gui/calendar-commands.c:315
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5386,14 +5406,15 @@ msgstr ""
 "Это действие безвозвратно уничтожит все события старше указанного промежутка "
 "времени. Если вы продолжите, вы не сможете восстановить эти события."
 
-#: ../calendar/gui/calendar-commands.c:325
+#: ../calendar/gui/calendar-commands.c:321
 msgid "Purge events older than"
 msgstr "Очистить элементы старше чем"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:326
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
 #: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-weather/calendar-weather.c:526
 #: ../plugins/google-account-setup/google-source.c:673
 #: ../plugins/google-account-setup/google-contacts-source.c:340
 #: ../widgets/misc/e-send-options.glade.h:39
@@ -5417,96 +5438,96 @@ msgstr "Дни рождения и годовщины"
 
 #. Create the weather group
 #: ../calendar/gui/calendar-component.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Погода"
 
-#: ../calendar/gui/calendar-component.c:648
+#: ../calendar/gui/calendar-component.c:658
 msgid "_New Calendar"
 msgstr "_Создать календарь"
 
-#: ../calendar/gui/calendar-component.c:649
-#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: ../calendar/gui/calendar-component.c:653
-#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
 msgid "_Make available for offline use"
 msgstr "Сде_лать доступным автономно"
 
-#: ../calendar/gui/calendar-component.c:654
-#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
 msgid "_Do not make available for offline use"
 msgstr "_Не делать доступным автнономно"
 
-#: ../calendar/gui/calendar-component.c:984
+#: ../calendar/gui/calendar-component.c:995
 msgid "Failed upgrading calendars."
 msgstr "Ошибка обновления календарей."
 
-#: ../calendar/gui/calendar-component.c:1283
+#: ../calendar/gui/calendar-component.c:1176
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не удалось открыть календарь «%s» для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1299
+#: ../calendar/gui/calendar-component.c:1192
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1412
+#: ../calendar/gui/calendar-component.c:1305
 msgid "Calendar Source Selector"
 msgstr "Выбор источника календаря"
 
-#: ../calendar/gui/calendar-component.c:1633
+#: ../calendar/gui/calendar-component.c:1521
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: ../calendar/gui/calendar-component.c:1634
+#: ../calendar/gui/calendar-component.c:1522
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: ../calendar/gui/calendar-component.c:1635
+#: ../calendar/gui/calendar-component.c:1523
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ../calendar/gui/calendar-component.c:1641
+#: ../calendar/gui/calendar-component.c:1529
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: ../calendar/gui/calendar-component.c:1642
+#: ../calendar/gui/calendar-component.c:1530
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: ../calendar/gui/calendar-component.c:1643
+#: ../calendar/gui/calendar-component.c:1531
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: ../calendar/gui/calendar-component.c:1649
+#: ../calendar/gui/calendar-component.c:1537
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: ../calendar/gui/calendar-component.c:1650
+#: ../calendar/gui/calendar-component.c:1538
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ежедневная встреча"
 
-#: ../calendar/gui/calendar-component.c:1651
+#: ../calendar/gui/calendar-component.c:1539
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: ../calendar/gui/calendar-component.c:1657
+#: ../calendar/gui/calendar-component.c:1545
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: ../calendar/gui/calendar-component.c:1658
+#: ../calendar/gui/calendar-component.c:1546
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
-#: ../calendar/gui/calendar-component.c:1659
+#: ../calendar/gui/calendar-component.c:1547
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -5526,220 +5547,114 @@ msgstr "Как неделю"
 msgid "Month View"
 msgstr "как месяц"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Любое поле"
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Вложения"
 
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Участник"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
-msgid "Business"
-msgstr "Бизнес"
-
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Категория"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Классификация"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-msgid "Competition"
-msgstr "Выполнение"
-
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:556
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Описание"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Описание содержит"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Не существует"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Существует"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Favourites"
-msgstr "Избранное"
-
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Gifts"
-msgstr "Подарки"
-
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
-msgid "Goals/Objectives"
-msgstr "Задачи/Цели"
-
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
-msgid "Holiday"
-msgstr "Выходной"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Holiday Cards"
-msgstr "Карточки выходного дня"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Hot Contacts"
-msgstr "Горячие контакты"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
-msgid "Ideas"
-msgstr "Идеи"
-
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
-msgid "International"
-msgstr "Международный"
-
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
-msgid "Key Customer"
-msgstr "Ключевой клиент"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
-msgid "Miscellaneous"
-msgstr "Разное"
-
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-msgid "Next 7 days"
-msgstr "Следующие 7 дней"
-
-#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/caltypes.xml.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Организатор"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
-msgid "Phone Calls"
-msgstr "Телефонные звонки"
-
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:555
-#: ../calendar/gui/memotypes.xml.h:29
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Личное"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
 #: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
-#: ../calendar/gui/e-calendar-table.c:554 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Общее"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
 msgid "Recurrence"
 msgstr "Повторение"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2200
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Состояние"
-
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
-msgid "Strategies"
-msgstr "Стратегии"
-
-#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Сводка"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Сводка содержит"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
-msgid "Suppliers"
-msgstr "Поставщики"
-
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
-msgid "Time &amp; Expenses"
-msgstr "Время и затраты"
-
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
-msgid "VIP"
-msgstr "VIP"
-
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
-msgid "Waiting"
-msgstr "Ожидание"
-
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "содержит"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "не содержит"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "является"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "не является"
 
@@ -5755,7 +5670,7 @@ msgstr "Метод открытия календаря не поддержива
 msgid "Permission denied to open the calendar"
 msgstr "Отказ в доступе при открытии календаря"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -5879,25 +5794,52 @@ msgid "A_dd"
 msgstr "_Добавить"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Сигналы"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
 #: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предполагать автоматическое отображение вложения"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:143
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:192
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Нет"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:580
 msgid "Selected Calendars for Alarms"
 msgstr "Календари - источники сигналов"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(показывать при просмотре дня)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5911,7 +5853,7 @@ msgstr ""
 "10 минут\n"
 "05 минут"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
@@ -5919,52 +5861,52 @@ msgstr ""
 "<i>%u и %d будут заменены на пользователя и домен из адреса электронной "
 "почты.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Сигналы</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Сервер \"Свободен/Занят\" по умолчанию</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Общие</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Список задач</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Время</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Рабочая неделя</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Adjust for daylight sa_ving time"
 msgstr "Пе_рестроить на летнее время"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "День _заканчивается:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Отображение"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Пятница"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5974,13 +5916,13 @@ msgstr ""
 "Часы\n"
 "Дни"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Понедельник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5998,151 +5940,155 @@ msgstr ""
 "Суббота\n"
 "Воскресенье"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../mail/mail-config.glade.h:114
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "S_un"
 msgstr "Вск"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Суббота"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "Второй _часовой пояс:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Select the calendars for alarm notification"
 msgstr "Выберите календари для сигналов"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Sh_ow a reminder"
 msgstr "Показывать _напоминание"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week _numbers in date navigator"
 msgstr "Показывать номера недель в навигаторе по датам"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "T_asks due today:"
 msgstr "Задачи на _сегодняшний день:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "T_hu"
 msgstr "Чтв"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Template:"
 msgstr "Шаблон:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Четверг"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Часовой _пояс:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time format:"
 msgstr "Формат времени:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Среда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Wee_k starts on:"
 msgstr "Неделя начинается с:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Work days:"
 msgstr "Рабочие дни:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_12 hour (AM/PM)"
 msgstr "12-часовой (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_24 hour"
 msgstr "24-часовой"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Ask for confirmation when deleting items"
 msgstr "Запрашивать подтверждение при удалении элементов"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Compress weekends in month view"
 msgstr "Ужимать выходные дни в представлении месяца"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Day begins:"
 msgstr "_День начинается:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Fri"
 msgstr "Пят"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Hide completed tasks after"
 msgstr "Скрывать выполненные задачи через"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Mon"
 msgstr "Пон"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Overdue tasks:"
 msgstr "Просроченные задачи:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Sat"
 msgstr "Суб"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Show appointment end times in week and month view"
 msgstr "_Отображать время окончания встреч в обзоре недели и месяца"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Time divisions:"
 msgstr "Разделители времени:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Tue"
 msgstr "Втр"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Wed"
 msgstr "Срд"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
@@ -6194,46 +6140,46 @@ msgstr "Свойства списка заметок"
 msgid "New Memo List"
 msgstr "Новый список заметок"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Это событие было удалено."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Эта задача была удалена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Это заметка была удалена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Вы сделали изменения. Отменить их и закрыть редактор?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Вы ничего не изменили. Закрыть редактор?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Это событие было изменено."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Эта задача была изменена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
 msgstr "Это заметка была изменена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Вы сделали изменения. Отменить их?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
@@ -6243,35 +6189,35 @@ msgstr "%s Вы ничего не изменили. Обновить редак�
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2355
 msgid " to "
 msgstr " к "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2359
 msgid " (Completed "
 msgstr " (Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2361
 msgid "Completed "
 msgstr "Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2366
 msgid " (Due "
 msgstr " (к дате"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2368
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:239
 #, c-format
 msgid "Attached message - %s"
 msgstr "Вложенное сообщение - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:241
-#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
-#: ../composer/e-msg-composer.c:1985
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6279,212 +6225,216 @@ msgstr[0] "%d вложенное сообщение"
 msgstr[1] "%d вложенных сообщения"
 msgstr[2] "%d вложенных сообщений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
 msgid "Cancel _Drag"
 msgstr "Отменить _перенос"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
-#: ../calendar/gui/dialogs/comp-editor.c:3257 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3300 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "вложение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:846
+#: ../calendar/gui/dialogs/comp-editor.c:849
 msgid "Could not update object"
 msgstr "Не удалось обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:937
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:941
+#: ../calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Meeting - %s"
 msgstr "Собрание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначенная задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:954
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Memo - %s"
 msgstr "Заметка - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:972
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "No Summary"
 msgstr "Нет сводки"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1116
+msgid "Keep original item?"
+msgstr "Оставить первоначальное значение?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to close the current window"
 msgstr "Нажмите, чтобы закрыть текущее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Copy selected text to the clipboard"
 msgstr "Копировать выделенный текст в буфер обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Cut selected text to the clipboard"
 msgstr "Вырезать выделенный текст в буфер обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1332
 msgid "Click here to view help available"
 msgstr "Нажмите, чтобы просмотреть справку"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "Paste text from the clipboard"
 msgstr "Вставить текст из буфера обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "Click here to save the current window"
 msgstr "Нажмите, чтобы сохранить текущее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1367
 msgid "Select all text"
 msgstr "Выделить весь текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1374
 msgid "_Classification"
 msgstr "_Классификация"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1388
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Insert"
 msgstr "_Вставить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1364
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Options"
 msgstr "_Параметры"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1416 ../mail/em-folder-tree.c:2116
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Вид"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 #: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Вложение..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1383
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "Click here to attach a file"
 msgstr "Нажмите, чтобы вложить файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1391
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Categories"
 msgstr "_Категории"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1393
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether to display categories"
 msgstr "Переключает отображение категорий"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1399
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Time _Zone"
 msgstr "Часовой _пояс"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the time zone is displayed"
 msgstr "Переключает отображение часового пояса"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "Pu_blic"
 msgstr "Пу_бличное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Classify as public"
 msgstr "Классифицировать как публичное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417
+#: ../calendar/gui/dialogs/comp-editor.c:1462
 msgid "_Private"
 msgstr "_Личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1464
 msgid "Classify as private"
 msgstr "Классифицировать как личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1424
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "_Confidential"
 msgstr "_Конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1426
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "Classify as confidential"
 msgstr "Классифицировать как конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1434
+#: ../calendar/gui/dialogs/comp-editor.c:1479
 msgid "R_ole Field"
 msgstr "Поле «_Должность»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1481
 msgid "Toggles whether the Role field is displayed"
 msgstr "Переключает отображение поля «Должность»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:1487
 msgid "_RSVP"
 msgstr "П_росьба ответить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1489
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Переключает отображение поля «Просьба ответить»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1450
+#: ../calendar/gui/dialogs/comp-editor.c:1495
 msgid "_Status Field"
 msgstr "Поле _состояния"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1452
+#: ../calendar/gui/dialogs/comp-editor.c:1497
 msgid "Toggles whether the Status field is displayed"
 msgstr "Переключает отображение поля «Состояние»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1503
 msgid "_Type Field"
 msgstr "Поле _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:1505
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Переключает отображение поля типа участников"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1774
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1819
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
 msgid "Recent _Documents"
 msgstr "Недавние _документы"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1793
-#: ../composer/e-composer-actions.c:697
+#: ../calendar/gui/dialogs/comp-editor.c:1838
+#: ../composer/e-composer-actions.c:696
 msgid "Attach"
 msgstr "Вложить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1888
+#: ../calendar/gui/dialogs/comp-editor.c:1933
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6492,48 +6442,48 @@ msgstr[0] "<b>%d</b> вложение"
 msgstr[1] "<b>%d</b> вложения"
 msgstr[2] "<b>%d</b> вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:1965
 msgid "Hide Attachment _Bar"
 msgstr "Скрыть _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:1968
+#: ../calendar/gui/dialogs/comp-editor.c:2271
 msgid "Show Attachment _Bar"
 msgstr "Показать _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2042
-#: ../calendar/gui/dialogs/event-page.c:1875
-#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2045
-#: ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../composer/e-msg-composer.c:1042
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Добавить вложение..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../mail/em-format-html-display.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2293
+#: ../mail/em-format-html-display.c:2380
 msgid "Show Attachments"
 msgstr "Отображать вложения"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2254
+#: ../calendar/gui/dialogs/comp-editor.c:2294
 msgid "Press space key to toggle attachment bar"
 msgstr "Нажмите клавишу \"Пробел\" для переключения панели вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2398
-#: ../calendar/gui/dialogs/comp-editor.c:2445
-#: ../calendar/gui/dialogs/comp-editor.c:3290
+#: ../calendar/gui/dialogs/comp-editor.c:2439
+#: ../calendar/gui/dialogs/comp-editor.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:3333
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по электронной почте придет "
 "обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3319
+#: ../calendar/gui/dialogs/comp-editor.c:3362
 msgid "Unable to use current version!"
 msgstr "Не удалось использовать текущую версию!"
 
@@ -6553,51 +6503,51 @@ msgstr "Назначение доступно только для чтения"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Удалить этот элемент из ящиков всех остальных получателей?"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Это событие не может быть удалено из-за ошибки corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr "Эта задача не может быть удалена из-за ошибки corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Эта заметка не может быть удалена из-за ошибки corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr "Этот элемент не может быть удален из-за ошибки corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr "Это событие не может быть удалено: нет доступа"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr "Эта задача не может быть удалена: недостаточно прав"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Эта заметка не может быть удалена: нет доступа"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr "Этот элемент не может быть удален: нет доступа"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
 msgstr "Это событие не может быть удалено из-за ошибки"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
 msgstr "Эта задача не может быть удалена из-за ошибки"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
 msgstr "Эта заметка не может быть удалена из-за ошибки"
 
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
 msgstr "Этот элемент не может быть удален из-за ошибки"
 
@@ -6614,143 +6564,143 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
 msgid "_Alarms"
 msgstr "_Сигналы"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "Click here to set or unset alarms for this event"
 msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
 msgid "_Recurrence"
 msgstr "_Повторение"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "Make this a recurring event"
 msgstr "Сделать это событие повторяющимся"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Параметры отправки"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
 #: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Вставить дополнительные параметры оправки"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "All _Day Event"
 msgstr "Событие на весь _день"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to have All Day Event"
 msgstr "Переключает, является ли событие событием на весь день"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Show Time as _Busy"
 msgstr "Показать время как _Занят"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
 msgid "Toggles whether to show time as busy"
 msgstr "Переключить отображение времени как «занят»"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "_Free/Busy"
 msgstr "Cво_боден/Занят"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
 msgid "Query free / busy information for the attendees"
 msgstr "Запросить информацию о занятости для участников"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Встре_ча"
 
-#: ../calendar/gui/dialogs/event-page.c:735
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
 msgid "This event has alarms"
 msgstr "Это событие имеет сигналы"
 
-#: ../calendar/gui/dialogs/event-page.c:798
+#: ../calendar/gui/dialogs/event-page.c:799
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:844
+#: ../calendar/gui/dialogs/event-page.c:845
 msgid "_Delegatees"
 msgstr "_Представители"
 
-#: ../calendar/gui/dialogs/event-page.c:846
+#: ../calendar/gui/dialogs/event-page.c:847
 msgid "Atte_ndees"
 msgstr "_Участники"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1031
 msgid "Event with no start date"
 msgstr "Событие без даты начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no end date"
 msgstr "Событие без даты завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1202
-#: ../calendar/gui/dialogs/memo-page.c:640
-#: ../calendar/gui/dialogs/task-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: ../calendar/gui/dialogs/event-page.c:1212
+#: ../calendar/gui/dialogs/event-page.c:1213
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1235
+#: ../calendar/gui/dialogs/event-page.c:1236
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:1243
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1405
-#: ../calendar/gui/dialogs/memo-page.c:681
-#: ../calendar/gui/dialogs/task-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "The organizer selected no longer has an account."
 msgstr "Выбранный организатор больше не имеет учётной записи."
 
-#: ../calendar/gui/dialogs/event-page.c:1411
-#: ../calendar/gui/dialogs/memo-page.c:687
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1436
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Добавить "
 
-#: ../calendar/gui/dialogs/event-page.c:2594
+#: ../calendar/gui/dialogs/event-page.c:2600
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не удалось открыть календарь «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2638
-#: ../calendar/gui/dialogs/memo-page.c:890
-#: ../calendar/gui/dialogs/task-page.c:1797
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Вы действуете от лица %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2918
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6758,7 +6708,7 @@ msgstr[0] "%d день до встречи"
 msgstr[1] "%d дня до встречи"
 msgstr[2] "%d дней до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6766,7 +6716,7 @@ msgstr[0] "%d час до встречи"
 msgstr[1] "%d часа до встречи"
 msgstr[2] "%d часов до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6774,28 +6724,10 @@ msgstr[0] "%d минута до встречи"
 msgstr[1] "%d минуты до встречи"
 msgstr[2] "%d минут до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "Настроить"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2948
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2091
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:70
-msgid "None"
-msgstr "Нет"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 день до встречи"
@@ -6871,16 +6803,16 @@ msgstr "Ко_нтакты..."
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2475
 msgid "Memo"
 msgstr "Заметка"
 
-#: ../calendar/gui/dialogs/memo-page.c:851
+#: ../calendar/gui/dialogs/memo-page.c:857
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Не удалось открыть заметки в «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
@@ -6897,44 +6829,44 @@ msgid "T_o:"
 msgstr "_Кому:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:364
+#: ../calendar/gui/dialogs/task-page.c:365
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Группа:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Вы изменяете повторяющееся событие. Что именно вы хотите изменить?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Вы поручаете повторяющееся событие, что именно вы хотите поручить?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Вы изменяете повторяющуюся задачу. Что именно вы хотите изменить?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Вы изменяете повторяющуюся заметку. Что именно вы хотите изменить?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Только эту запись"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Эту и предыдущие записи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Эту и последующие записи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Все записи"
 
@@ -6946,9 +6878,13 @@ msgstr "Эта встреча имеет правила повторения, н
 msgid "Recurrence date is invalid"
 msgstr "Повторяющаяся дата некорректна"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr "Дата окончания повторяющегося события раньше даты начала"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "в"
 
@@ -6956,7 +6892,7 @@ msgstr "в"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "first"
 msgstr "первый"
 
@@ -6965,7 +6901,7 @@ msgstr "первый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "second"
 msgstr "второй"
 
@@ -6973,7 +6909,7 @@ msgstr "второй"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "third"
 msgstr "третий"
 
@@ -6981,7 +6917,7 @@ msgstr "третий"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1010
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fourth"
 msgstr "четвертый"
 
@@ -6989,13 +6925,13 @@ msgstr "четвертый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "last"
 msgstr "последний"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Другая дата"
 
@@ -7003,7 +6939,7 @@ msgstr "Другая дата"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "1st to 10th"
 msgstr "с 1-го по 10-е"
 
@@ -7011,7 +6947,7 @@ msgstr "с 1-го по 10-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "11th to 20th"
 msgstr "с 11-го по 20-е"
 
@@ -7019,45 +6955,45 @@ msgstr "с 11-го по 20-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1061
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 msgid "21st to 31st"
 msgstr "с 21-го по 31-е"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "день"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "случаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2089
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
 msgid "Add exception"
 msgstr "Добавить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2130
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
 msgid "Could not get a selection to modify."
 msgstr "Не удалось получить выделение для изменения."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2136
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Modify exception"
 msgstr "Изменить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2180
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
 msgid "Could not get a selection to delete."
 msgstr "Не удалось получить изменение для удаления."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2304
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
 msgid "Date/Time"
 msgstr "Дата/Время"
 
@@ -7128,55 +7064,55 @@ msgstr "<span weight=\"bold\">Состояние</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:247
 #: ../calendar/gui/e-cal-model-tasks.c:362
 #: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2551 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Завершена"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:576 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1066
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Высокий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:244
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-cal-model-tasks.c:754
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2551
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2548
 msgid "In Progress"
 msgstr "Выполняется"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:578 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Низкий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:577
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Нормальный"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:649 ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2545
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Не началась"
 
@@ -7189,7 +7125,7 @@ msgid "Stat_us:"
 msgstr "Сост_ояние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Не определено"
 
@@ -7219,24 +7155,24 @@ msgstr "Нажмите, чтобы изменить или просмотрет�
 msgid "_Send Options"
 msgstr "Параметры _отправки"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Описание задачи"
 
-#: ../calendar/gui/dialogs/task-page.c:372
+#: ../calendar/gui/dialogs/task-page.c:373
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:785
+#: ../calendar/gui/dialogs/task-page.c:786
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-page.c:1754
+#: ../calendar/gui/dialogs/task-page.c:1760
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удалось открыть задачи в «%s»."
@@ -7335,56 +7271,56 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3308
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Неозаглавленное"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Start Date:"
 msgstr "Дата начала:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Веб-страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Сводка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Due Date:"
 msgstr "Дата выполнения:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Состояние:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Priority:"
 msgstr "Приоритет:"
 
@@ -7398,13 +7334,13 @@ msgid "Start Date"
 msgstr "Дата начала"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:628
+#: ../calendar/gui/e-calendar-table.c:629
 msgid "Free"
 msgstr "Свободен"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:629
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Занят"
 
@@ -7419,16 +7355,16 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Нет"
@@ -7436,14 +7372,14 @@ msgstr "Нет"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
 #: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
 #: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2116
+#: ../plugins/itip-formatter/itip-formatter.c:2138
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7458,27 +7394,27 @@ msgstr "Повторение"
 msgid "Assigned"
 msgstr "Назначено"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
 msgid "Select folder to save selected attachments..."
 msgstr "Выберите папку для сохранения выделенных вложений..."
 
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1774 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
 msgid "Set as _Background"
 msgstr "Установить как _фон"
 
@@ -7486,7 +7422,7 @@ msgstr "Установить как _фон"
 msgid "_Save Selected"
 msgstr "_Сохранить выделенное"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в программе %s..."
@@ -7497,7 +7433,7 @@ msgstr "* Нет краткого описания *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2292
+#: ../calendar/gui/e-calendar-view.c:2395
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
@@ -7505,7 +7441,7 @@ msgstr "Организатор: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2399
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
@@ -7518,125 +7454,125 @@ msgstr "Начало: "
 msgid "Due: "
 msgstr "Завершение: "
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:600
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:601
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:602
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:603
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:604
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:605
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:888
-#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:670 ../calendar/gui/e-memo-table.c:437
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:835 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1296 ../calendar/gui/e-memo-table.c:819
 #: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1756
 msgid "New _Task"
 msgstr "Новая _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1759 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Печать..."
 
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1779 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1659
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1762
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: ../calendar/gui/e-calendar-table.c:1600 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1601
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1605
 msgid "_Mark as Incomplete"
 msgstr "По_метить как невыполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "По_метить выбранные задачи как выполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-table.c:1611
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1846
+#: ../calendar/gui/e-calendar-table.c:1848
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Нажмите, чтобы добавить задачу"
@@ -7659,7 +7595,7 @@ msgid "Due date"
 msgstr "Срок выполнения"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:20
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Приоритет"
@@ -7668,145 +7604,153 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Дата начала"
 
-#: ../calendar/gui/e-calendar-view.c:1339
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Состояние"
+
+#: ../calendar/gui/e-calendar-view.c:1442
 msgid "Moving items"
 msgstr "Перемещение элементов"
 
-#: ../calendar/gui/e-calendar-view.c:1341
+#: ../calendar/gui/e-calendar-view.c:1444
 msgid "Copying items"
 msgstr "Копирование элементов"
 
-#: ../calendar/gui/e-calendar-view.c:1650
+#: ../calendar/gui/e-calendar-view.c:1753
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1754
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1755
 msgid "New _Meeting"
 msgstr "Новое _собрание"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1766
 msgid "_Current View"
 msgstr "_Текущий вид"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1768
 msgid "Select T_oday"
 msgstr "Выделить _сегодняшний день"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1769
 msgid "_Select Date..."
 msgstr "Выделить _дату..."
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1775
 msgid "Pri_nt..."
 msgstr "_Печать..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ировать в календарь..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "Mo_ve to Calendar..."
 msgstr "Пере_местить в календарь..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "_Delegate Meeting..."
 msgstr "_Поручить собрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1790
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1791 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1796
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать это вхождение пере_мещаемым"
 
-#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1797 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1798
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: ../calendar/gui/e-calendar-view.c:2147
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../calendar/gui/e-calendar-view.c:2250
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2126
 msgid "Accepted"
 msgstr "Принято"
 
-#: ../calendar/gui/e-calendar-view.c:2148
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2110
+#: ../calendar/gui/e-calendar-view.c:2251
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2132
 msgid "Declined"
 msgstr "Отклонено"
 
-#: ../calendar/gui/e-calendar-view.c:2149
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
+#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Экспериментальный"
 
-#: ../calendar/gui/e-calendar-view.c:2150
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../calendar/gui/e-calendar-view.c:2253
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Delegated"
 msgstr "Поручено"
 
-#: ../calendar/gui/e-calendar-view.c:2151
+#: ../calendar/gui/e-calendar-view.c:2254
 msgid "Needs action"
 msgstr "Требуется действие"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2415 ../calendar/gui/print.c:2507
 #, c-format
 msgid "Location: %s"
 msgstr "Адрес: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2346
+#: ../calendar/gui/e-calendar-view.c:2449
 #, c-format
 msgid "Time: %s %s"
 msgstr "Время: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7819,39 +7763,43 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Деления через %02i минут"
 
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "Показывать второй часовой пояс"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1567
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1671
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
-#: ../calendar/gui/print.c:833
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложное повторение)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7859,7 +7807,7 @@ msgstr[0] "Каждый %d день"
 msgstr[1] "Каждые %d дня"
 msgstr[2] "Каждые %d дней"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7867,7 +7815,7 @@ msgstr[0] "Каждую %d неделю"
 msgstr[1] "Каждые %d недели"
 msgstr[2] "Каждые %d недель"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7876,21 +7824,21 @@ msgstr[1] "Каждые %d недели в "
 msgstr[2] "Каждые %d недель в "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7898,7 +7846,7 @@ msgstr[0] "каждый %d месяц"
 msgstr[1] "каждые %d месяца"
 msgstr[2] "каждые %d месяцев"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7906,7 +7854,7 @@ msgstr[0] "Каждый %d год"
 msgstr[1] "Каждые %d года"
 msgstr[2] "Каждые %d лет"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7915,36 +7863,36 @@ msgstr[1] "всего %d раза"
 msgstr[2] "всего %d раз"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:880
 msgid ", ending on "
 msgstr ", заканчивается на"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Starts"
 msgstr "Начинается"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Заканчивается"
 
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:956
 #: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Срок завершения"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
 msgid "iCalendar Information"
 msgstr "Сведения iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/itip-formatter/itip-view.c:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7955,7 +7903,7 @@ msgid "An unknown person"
 msgstr "Неизвестное лицо"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7963,278 +7911,284 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2107
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2129
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "Собрание было отменено, но оно не может быть найдено в ваших календарях"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Задача была отменена, но она не может быть найдена в ваших списках задач"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Information"
 msgstr "Информация о собрании"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запрашивает присутствие %s на собрании."
 
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> хочет быть добавленным к существующему собранию."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ответил на приглашение на собрание."
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> отменил собрание."
 
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Meeting Cancelation"
 msgstr "Отмена собрания"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> отправил невразумительное сообщение."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опубликовал информацию о задаче"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
 
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> хочет быть добавленным к существующей задаче."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ответил на назначение задачи."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> отменил собрание."
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Task Cancelation"
 msgstr "Отмена собрания"
 
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опубликовал информацию о занятости."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ответил на запрос информации о занятости."
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Вложение не содержит правильного сообщения календаря."
 
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1304
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
 msgid "Choose an action:"
 msgstr "Выберите действие:"
 
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Просьба ответить"
+
+#: ../calendar/gui/e-itip-control.c:2322
 msgid "Update"
 msgstr "Обновить"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
 #: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Принять"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -8262,99 +8216,93 @@ msgstr "Загрузка календаря..."
 msgid "Server Message:"
 msgstr "Сообщение сервера:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Председатели"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Необходимые участники"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Дополнительные участники"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Ресурсы"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Участники"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
 msgid "Individual"
 msgstr "Индивидуально"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Группа"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
 msgid "Resource"
 msgstr "Источник"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
 msgid "Room"
 msgstr "Комната"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
 msgid "Chair"
 msgstr "Председатель"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1002
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1003
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
 msgid "Non-Participant"
 msgstr "Не участвует"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
 msgid "Needs Action"
 msgstr "Необходимое действие"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../calendar/gui/e-meeting-list-view.c:505
 msgid "Attendee                          "
 msgstr "Участник                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "Просьба ответить"
-
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 msgid "In Process"
 msgstr "В процессе"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2120
+#: ../calendar/gui/e-meeting-time-sel.c:2124
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -8363,7 +8311,7 @@ msgstr "%A, %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2151
+#: ../calendar/gui/e-meeting-time-sel.c:2155
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -8373,67 +8321,67 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "Out of Office"
 msgstr "Не на работе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Нет информации"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:416
 msgid "A_ttendees..."
 msgstr "_Участники..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:437
 msgid "O_ptions"
 msgstr "_Параметры"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:454
 msgid "Show _only working hours"
 msgstr "Показывать _только рабочие часы"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _zoomed out"
 msgstr "Показывать уменьшенный"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:479
 msgid "_Update free/busy"
 msgstr "_Обновить информацию о занятости"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:494
 msgid "_<<"
 msgstr "<_<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "Автовыбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "_All people and resources"
 msgstr "_Все люди и ресурсы"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "All _people and one resource"
 msgstr "Все _люди и один ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "_Required people"
 msgstr "_Требуемые люди"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:571
 msgid "Required people and _one resource"
 msgstr "Требуемые люди и _один ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "_Start time:"
 msgstr "Нача_ло:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_End time:"
 msgstr "Коне_ц:"
 
@@ -8478,16 +8426,16 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
 msgid "Loading memos"
 msgstr "Загрузка заметок"
 
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Открываются заметки в %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
@@ -8495,63 +8443,63 @@ msgstr "Удаление выделенных объектов..."
 msgid "Loading tasks"
 msgstr "Загрузка задач"
 
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: ../calendar/gui/e-timezone-entry.c:128
+#: ../calendar/gui/e-timezone-entry.c:127
 msgid "Select Timezone"
 msgstr "Выбор часового пояса"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1652
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2587
+#: ../calendar/gui/gnome-cal.c:2621
 msgid "_Custom View"
 msgstr "_Пользовательский вид"
 
-#: ../calendar/gui/gnome-cal.c:2588
+#: ../calendar/gui/gnome-cal.c:2622
 msgid "_Save Custom View"
 msgstr "_Сохранить изменённый вид"
 
-#: ../calendar/gui/gnome-cal.c:2593
+#: ../calendar/gui/gnome-cal.c:2627
 msgid "_Define Views..."
 msgstr "_Определить виды..."
 
-#: ../calendar/gui/gnome-cal.c:2835
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Загрузка встреч на %s"
 
-#: ../calendar/gui/gnome-cal.c:2850
+#: ../calendar/gui/gnome-cal.c:2879
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка задач на %s"
 
-#: ../calendar/gui/gnome-cal.c:2859
+#: ../calendar/gui/gnome-cal.c:2888
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Загрузка заметок из %s"
 
-#: ../calendar/gui/gnome-cal.c:2964
+#: ../calendar/gui/gnome-cal.c:3000
 #, c-format
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: ../calendar/gui/gnome-cal.c:3932
+#: ../calendar/gui/gnome-cal.c:3968
 msgid "Purging"
 msgstr "Очистка"
 
@@ -8620,19 +8568,19 @@ msgstr "Организатор должен быть назначен."
 msgid "At least one attendee is necessary"
 msgstr "Необходим как минимум один участник"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Информация о событии"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
 msgid "Task information"
 msgstr "Информация о задаче"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
 msgid "Memo information"
 msgstr "Информация о заметке"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
 msgid "Free/Busy information"
 msgstr "Информация о занятости"
 
@@ -8640,36 +8588,95 @@ msgstr "Информация о занятости"
 msgid "Calendar information"
 msgstr "Информация календаря"
 
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Принято"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Экспериментально принято"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Отклонено"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Поручено"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Отмена"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+msgctxt "Meeting"
 msgid "Refresh"
-msgstr "Обновить"
+msgstr "Обновление"
 
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Контр-предложение"
 
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация о занятости (%s в %s)"
 
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
 msgid "iCalendar information"
 msgstr "Информация iCalendar"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: ../calendar/gui/memos-component.c:489
+#: ../calendar/gui/memos-component.c:499
 msgid "_New Memo List"
 msgstr "_Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:571
+#: ../calendar/gui/memos-component.c:582
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8677,7 +8684,7 @@ msgstr[0] "%d заметка"
 msgstr[1] "%d заметки"
 msgstr[2] "%d заметок"
 
-#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8685,70 +8692,66 @@ msgstr[0] ", выделено %d"
 msgstr[1] ", выделено %d"
 msgstr[2] ", выделено %d"
 
-#: ../calendar/gui/memos-component.c:620
+#: ../calendar/gui/memos-component.c:631
 msgid "Failed upgrading memos."
 msgstr "Не удалось обновить заметки."
 
-#: ../calendar/gui/memos-component.c:980
+#: ../calendar/gui/memos-component.c:873
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список заметок «%s» для создания событий и собраний"
 
-#: ../calendar/gui/memos-component.c:993
+#: ../calendar/gui/memos-component.c:886
 msgid "There is no calendar available for creating memos"
 msgstr "Нет календаря, доступного для создания заметок"
 
-#: ../calendar/gui/memos-component.c:1103
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "Выбор источника заметок"
 
-#: ../calendar/gui/memos-component.c:1287
+#: ../calendar/gui/memos-component.c:1175
 msgid "New memo"
 msgstr "Новая заметка"
 
-#: ../calendar/gui/memos-component.c:1288
+#: ../calendar/gui/memos-component.c:1176
 msgctxt "New"
 msgid "Mem_o"
 msgstr "За_метка"
 
-#: ../calendar/gui/memos-component.c:1289
+#: ../calendar/gui/memos-component.c:1177
 msgid "Create a new memo"
 msgstr "Создать новую заметку"
 
-#: ../calendar/gui/memos-component.c:1295
+#: ../calendar/gui/memos-component.c:1183
 msgid "New shared memo"
 msgstr "Новая общая заметка"
 
-#: ../calendar/gui/memos-component.c:1296
+#: ../calendar/gui/memos-component.c:1184
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Общая заме_тка"
 
-#: ../calendar/gui/memos-component.c:1297
+#: ../calendar/gui/memos-component.c:1185
 msgid "Create a shared new memo"
 msgstr "Создать новую общую заметку"
 
-#: ../calendar/gui/memos-component.c:1303
+#: ../calendar/gui/memos-component.c:1191
 msgid "New memo list"
 msgstr "Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:1304
+#: ../calendar/gui/memos-component.c:1192
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Список _заметок"
 
-#: ../calendar/gui/memos-component.c:1305
+#: ../calendar/gui/memos-component.c:1193
 msgid "Create a new memo list"
 msgstr "Создать новый список заметок"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
 msgid "Print Memos"
 msgstr "Напечатать заметки"
 
-#: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days"
-msgstr "Следующие 7 дней"
-
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8798,210 +8801,210 @@ msgstr "Не удалось открыть задачи в «%s»"
 msgid "Notes"
 msgstr "Примечания"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "3rd"
 msgstr "3-ье"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "23rd"
 msgstr "23-ье"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:518
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:519
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/gui/print.c:523
+#: ../calendar/gui/print.c:520
 msgid "31st"
 msgstr "31-ое"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Su"
 msgstr "Вс"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Mo"
 msgstr "Пн"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "Tu"
 msgstr "Вт"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Th"
 msgstr "Чт"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Fr"
 msgstr "Пт"
 
-#: ../calendar/gui/print.c:599
+#: ../calendar/gui/print.c:596
 msgid "Sa"
 msgstr "Cб"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2471
 msgid "Appointment"
 msgstr "Встреча"
 
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2473
 msgid "Task"
 msgstr "Задание"
 
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/print.c:2498
 #, c-format
 msgid "Summary: %s"
 msgstr "Сводка: %s"
 
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2521
 msgid "Attendees: "
 msgstr "Участники: "
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2561
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: ../calendar/gui/print.c:2581
+#: ../calendar/gui/print.c:2578
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2590
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: ../calendar/gui/print.c:2605
+#: ../calendar/gui/print.c:2602
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2626
 msgid "Contacts: "
 msgstr "Контакты: "
 
-#: ../calendar/gui/tasks-component.c:480
+#: ../calendar/gui/tasks-component.c:490
 msgid "_New Task List"
 msgstr "_Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:562
+#: ../calendar/gui/tasks-component.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -9009,63 +9012,63 @@ msgstr[0] "%d задача"
 msgstr[1] "%d задачи"
 msgstr[2] "%d задач"
 
-#: ../calendar/gui/tasks-component.c:611
+#: ../calendar/gui/tasks-component.c:622
 msgid "Failed upgrading tasks."
 msgstr "Не удалось обновить задачи."
 
-#: ../calendar/gui/tasks-component.c:968
+#: ../calendar/gui/tasks-component.c:861
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список задач «%s» для создания событий и собраний"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:874
 msgid "There is no calendar available for creating tasks"
 msgstr "Нет календаря, доступного для создания задач"
 
-#: ../calendar/gui/tasks-component.c:1092
+#: ../calendar/gui/tasks-component.c:985
 msgid "Task Source Selector"
 msgstr "Выбор источника задач"
 
-#: ../calendar/gui/tasks-component.c:1352
+#: ../calendar/gui/tasks-component.c:1239
 msgid "New task"
 msgstr "Новая задача"
 
-#: ../calendar/gui/tasks-component.c:1353
+#: ../calendar/gui/tasks-component.c:1240
 msgctxt "New"
 msgid "_Task"
 msgstr "З_адача"
 
-#: ../calendar/gui/tasks-component.c:1354
+#: ../calendar/gui/tasks-component.c:1241
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: ../calendar/gui/tasks-component.c:1360
+#: ../calendar/gui/tasks-component.c:1247
 msgid "New assigned task"
 msgstr "Новая назначенная задача"
 
-#: ../calendar/gui/tasks-component.c:1361
+#: ../calendar/gui/tasks-component.c:1248
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Наз_наченная задача"
 
-#: ../calendar/gui/tasks-component.c:1362
+#: ../calendar/gui/tasks-component.c:1249
 msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
-#: ../calendar/gui/tasks-component.c:1368
+#: ../calendar/gui/tasks-component.c:1255
 msgid "New task list"
 msgstr "Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:1369
+#: ../calendar/gui/tasks-component.c:1256
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Список за_дач"
 
-#: ../calendar/gui/tasks-component.c:1370
+#: ../calendar/gui/tasks-component.c:1257
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9077,11 +9080,11 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
 msgid "Do not ask me again."
 msgstr "Не задавать больше этот вопрос."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
 msgid "Print Tasks"
 msgstr "Напечатать задачи"
 
@@ -9090,19 +9093,19 @@ msgstr "Напечатать задачи"
 msgid "% Completed"
 msgstr "% Завершено"
 
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Выполняется"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "больше чем"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "меньше чем"
 
@@ -9112,7 +9115,7 @@ msgstr "Встречи и собрания"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 msgid "Opening calendar"
 msgstr "Открывается календарь"
 
@@ -10726,7 +10729,7 @@ msgstr "_Закрыть"
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -10752,8 +10755,8 @@ msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
 #: ../composer/e-composer-actions.c:511
-msgid "Save _Draft"
-msgstr "Сохранить _черновик"
+msgid "Save as _Draft"
+msgstr "Сохранить как _черновик"
 
 #: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
@@ -10893,6 +10896,10 @@ msgstr "Поле \"_Кому\""
 msgid "Toggles whether the To field is displayed"
 msgstr "Переключить отображение поля \"Кому\""
 
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "Сохранить черновик"
+
 #: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
@@ -10957,18 +10964,18 @@ msgstr "Выберите папки для помещения в них сооб
 msgid "Click here to select folders to post to"
 msgstr "Нажмите, чтобы выбрать папки для помещения в них сообщений"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1553
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
 msgid "Show _Attachment Bar"
 msgstr "Показать панель _вложений"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:866
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Не удалось подписать исходящее сообщение: нет сертификата подписи для этой "
 "учётной записи"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10976,8 +10983,8 @@ msgstr ""
 "Не удалось зашифровать исходящее сообщение: нет сертификата шифрования для "
 "этой учётной записи"
 
-#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10985,15 +10992,15 @@ msgstr[0] "Вложение"
 msgstr[1] "Вложения"
 msgstr[2] "Вложений"
 
-#: ../composer/e-msg-composer.c:1551
+#: ../composer/e-msg-composer.c:1550
 msgid "Hide _Attachment Bar"
 msgstr "Скрыть панель _вложений"
 
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2770
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
 msgid "Compose Message"
 msgstr "Новое сообщение"
 
-#: ../composer/e-msg-composer.c:4066
+#: ../composer/e-msg-composer.c:4093
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11195,7 +11202,7 @@ msgid "Evolution Query"
 msgstr "Запрос Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:450
+#: ../e-util/e-error.c:444
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Внутренняя ошибка, запрошена неизвестная ошибка «%s»"
@@ -11208,7 +11215,64 @@ msgstr "Компонент"
 msgid "Name of the component being logged"
 msgstr "Название компонента для журнала"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "Журналы отладки"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "Показывать о_шибки в строке состояния для"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "секунд."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "Сообщения журнала:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "Уровень журналирования"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Время"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Сообщения"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "Ошибки"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "Предупреждения и ошибки"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "Отладка"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "Ошибки, предупреждения и отладочные сообщения"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
 #: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:690
@@ -11260,51 +11324,55 @@ msgstr "Перезаписать файл?"
 msgid "_Overwrite"
 msgstr "_Перезаписать"
 
-#: ../e-util/e-util.c:96
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "Не удалось открыть ссылку."
+
+#: ../e-util/e-util.c:174
 msgid "Could not display help for Evolution."
 msgstr "Не удалось показать справку по Evolution."
 
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
 msgid "I_mportant"
 msgstr "_Важное"
 
 #. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
 msgid "_Work"
 msgstr "_Служебное"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
 msgid "_Personal"
 msgstr "_Личное"
 
 #. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
 msgid "_To Do"
 msgstr "В_ыполнить"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
 msgid "_Later"
 msgstr "_Позже"
 
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
 msgid "Label _Name:"
 msgstr "_Имя ярлыка:"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Edit Label"
 msgstr "Изменить ярлык"
 
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
 msgid "Add Label"
 msgstr "Добавить ярлык"
 
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
 msgstr "Имя ярлыка не может быть пустым"
 
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11312,12 +11380,12 @@ msgstr ""
 "Ярлык с такой меткой уже существует на сервере. Переименуйте, пожалуйста, "
 "ваш ярлык."
 
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
 #, c-format
 msgid "GConf error: %s"
 msgstr "Ошибка GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
 msgid "All further errors shown only on terminal."
 msgstr "Дальнейшие ошибки будут выведены на терминал."
 
@@ -11621,8 +11689,9 @@ msgstr "текущее время"
 msgid "the time you specify"
 msgstr "указанное вами время"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
 #: ../plugins/google-account-setup/google-source.c:674
 #: ../plugins/google-account-setup/google-contacts-source.c:341
 msgid "weeks"
@@ -11632,15 +11701,15 @@ msgstr "недели"
 msgid "years"
 msgstr "годы"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Добавить правило"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:463
 msgid "Edit Rule"
 msgstr "Изменить правило"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:809
 msgid "Rule name"
 msgstr "Имя правила"
 
@@ -11695,7 +11764,7 @@ msgstr "Настройка параметров почты Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Настройка параметров сети Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
 #: ../mail/mail-component.c:597 ../mail/mail-component.c:598
 #: ../mail/mail-component.c:767
@@ -11739,13 +11808,13 @@ msgstr ""
 "для %s, приведенное ниже\n"
 "и установите флажок, чтобы принять его\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
 #: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Создана автоматически"
 
@@ -11779,7 +11848,7 @@ msgstr "По умолчанию"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
 msgid "Security"
 msgstr "Безопасность"
 
@@ -11814,7 +11883,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1181 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Без названия"
 
@@ -11857,64 +11926,48 @@ msgstr "-------- Исходное сообщение --------"
 msgid "_Filter Rules"
 msgstr "_Правила фильтра"
 
-#.
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
-#. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
-#. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
-#. *
-#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
-#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Скорректировать вес"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Назначить цвет"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Назначить вес"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Сигнал"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Завершено в"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Скопировать в папку"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Получена дата"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Отправлена дата"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
@@ -11922,210 +11975,213 @@ msgstr "Отправлена дата"
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "не заканчивается на"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "не существует"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "не возвращает"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "не похоже на"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "не начинается с"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Черновик"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "заканчивается на"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "существует"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Выражение"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "К исполнению"
 
-#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Важное"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "после"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "до"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "Отмечено"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "не отмечено"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:38
 msgid "is not set"
 msgstr "не установлено"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:39
 msgid "is set"
 msgstr "установлено"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Тест на спам"
 
-#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Метка"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Список рассылки"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Соответствует всем"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Тело сообщения"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Заголовок сообщения"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Сообщение является спамом"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Сообщение не является спамом"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Переместить в папку"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Передать программе через канал"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Воспроизвести звук"
 
-#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Прочитанное"
 
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Получатели"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Соответствует рег. выражению"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Ответ на"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "возвращает"
 
-#: ../mail/em-filter-i18n.h:74
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "возвращает больше чем"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "возвращает меньше чем"
 
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Запустить программу"
 
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Вес"
 
-#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Отправитель"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "Отправитель или получатели"
+
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr "Установить ярлык"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Установить состояние"
 
-#: ../mail/em-filter-i18n.h:81
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Размер (кБ)"
 
-#: ../mail/em-filter-i18n.h:82
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "выглядит как"
 
-#: ../mail/em-filter-i18n.h:83
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Учётная запись - источник"
 
-#: ../mail/em-filter-i18n.h:84
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Указанный заголовок"
 
-#: ../mail/em-filter-i18n.h:85
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "начинается с"
 
-#: ../mail/em-filter-i18n.h:87
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Тема"
 
-#: ../mail/em-filter-i18n.h:89
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Сбросить состояние"
 
@@ -12216,15 +12272,15 @@ msgid "Quota usage"
 msgstr "Квота"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2560 ../mail/mail-component.c:164
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
 #: ../mail/mail-component.c:585
 #: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Входящие"
 
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Свойства папки"
@@ -12243,7 +12299,7 @@ msgstr "_Имя папки:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:975 ../mail/mail-vfolder.c:1042
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
 msgid "Search Folders"
 msgstr "Папки поиска"
 
@@ -12256,15 +12312,20 @@ msgstr "UNMATCHED"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
 msgid "Loading..."
 msgstr "Загрузка..."
 
@@ -12303,12 +12364,12 @@ msgstr "Перемещение папки %s"
 msgid "Copying folder %s"
 msgstr "Копирование папки %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в папку %s"
@@ -12330,47 +12391,47 @@ msgstr "Переместить в папку"
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на «%s»"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
 msgid "_Move..."
 msgstr "Пере_местить..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "Пе_реименовать..."
-
-#: ../mail/em-folder-tree.c:2115 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Обнов_ить"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
 msgid "Fl_ush Outbox"
 msgstr "Отправить исход_ящие"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "О_чистить корзину"
 
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "Отменить проч_итанные в папке поиска"
+
 #: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Копирование `%s' в `%s'"
+msgstr "Копирование «%s» в «%s»"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
 #: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
 msgid "C_opy"
 msgstr "_Копировать"
 
@@ -12378,7 +12439,7 @@ msgstr "_Копировать"
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
-msgstr "Создание папки `%s'"
+msgstr "Создание папки «%s»"
 
 #: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
@@ -12392,215 +12453,215 @@ msgstr "Создать новую папку"
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Сбой удаления почты"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "У вас недостаточно прав для удаления этого сообщения."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Пе_реслать"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
 msgid "Mark as _Unread"
 msgstr "Пометить как _непрочтенные"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
 msgid "Mark as _Important"
 msgstr "Пометить как _важное"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
 msgid "Mark as Un_important"
 msgstr "Пометить как нева_жное"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
 msgid "Mark for Follo_w Up..."
 msgstr "Пометить к _исполнению..."
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
 msgid "_Label"
 msgstr "_Метка"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Нет"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
 msgid "_New Label"
 msgstr "_Новый ярлык"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
 msgid "Fla_g Completed"
 msgstr "Отметка «_Завершено»"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
 msgid "Cl_ear Flag"
 msgstr "О_чистить отметку"
 
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1365
 msgid "Search Folder based on _Subject"
 msgstr "Папка поиска по _теме"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
 msgid "Search Folder based on Se_nder"
 msgstr "Папка поиска по _отправителю"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
 msgid "Search Folder based on _Recipients"
 msgstr "Папка поиска по _получателю"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка поиска по списку _рассылки"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1373
 msgid "Filter based on Sub_ject"
 msgstr "Фильтр по _теме"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
 msgid "Filter based on Sen_der"
 msgstr "Фильтр по _отправителю"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
 msgid "Filter based on Re_cipients"
 msgstr "Фильтр по _получателям"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on _Mailing List"
 msgstr "Фильтр по списку _рассылки"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
 #: ../plugins/google-account-setup/google-source.c:251
 #: ../plugins/google-account-setup/google-source.c:529
 #: ../plugins/google-account-setup/google-source.c:727
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
 msgid "Unable to retrieve message"
 msgstr "Не удалось получить сообщение"
 
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
 msgid "Retrieving Message..."
 msgstr "Получение сообщения..."
 
-#: ../mail/em-folder-view.c:2791
+#: ../mail/em-folder-view.c:2751
 msgid "C_all To..."
 msgstr "Позвон_ить..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2754
 msgid "Create _Search Folder"
 msgstr "Создать папку поиска"
 
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2755
 msgid "_From this Address"
 msgstr "_ этого адреса"
 
-#: ../mail/em-folder-view.c:2796
+#: ../mail/em-folder-view.c:2756
 msgid "_To this Address"
 msgstr "_По этому адресу"
 
-#: ../mail/em-folder-view.c:3289
+#: ../mail/em-folder-view.c:3249
 #, c-format
 msgid "Click to mail %s"
 msgstr "Нажмите, чтобы написать письмо %s"
 
-#: ../mail/em-folder-view.c:3301
+#: ../mail/em-folder-view.c:3261
 #, c-format
 msgid "Click to call %s"
 msgstr "Нажмите, чтобы позвонить %s"
 
-#: ../mail/em-folder-view.c:3306
+#: ../mail/em-folder-view.c:3266
 msgid "Click to hide/unhide addresses"
 msgstr "Нажмите, чтобы показать/скрыть адреса"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:471
+#: ../mail/em-format-html-display.c:474
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпадения: %d"
 
-#: ../mail/em-format-html-display.c:615
+#: ../mail/em-format-html-display.c:618
 msgid "Fin_d:"
 msgstr "_Найти:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:639
+#: ../mail/em-format-html-display.c:642
 msgid "_Previous"
 msgstr "_Предыдущее"
 
-#: ../mail/em-format-html-display.c:644
+#: ../mail/em-format-html-display.c:647
 msgid "_Next"
 msgstr "_Следующее"
 
-#: ../mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:652
 msgid "M_atch case"
 msgstr "_Учитывать регистр"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Не подписано"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+"Это сообщение не подписано. Подлинность отправителя не проверена."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Подпись действительна"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12608,11 +12669,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Подпись недействительна"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12620,11 +12681,11 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Подпись действительна, но проверить отправителя не удалось"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12632,11 +12693,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Подпись существует, но требуется публичный ключ"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:955
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12644,11 +12705,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, не не удалось найти "
 "соответствующий публичный ключ."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Не зашифровано"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12656,11 +12717,11 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Зашифровано, уязвимый шифр"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12670,11 +12731,11 @@ msgstr ""
 "Посторонние лица могут, хотя и с определёнными трудностями, получить доступ "
 "к содержимому письма за разумное время."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:964
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12682,11 +12743,11 @@ msgstr ""
 "Это сообщение зашифровано. Посторонним лицам будет очень сложно просмотреть "
 "содержимое этого сообщения."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Зашифровано, стойкий шифр"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:965
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12696,56 +12757,56 @@ msgstr ""
 "Для постороннего будет очень сложным просмотреть содержимое этого сообщения "
 "в разумный период времени."
 
-#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
-#: ../mail/em-format-html-display.c:1078
+#: ../mail/em-format-html-display.c:1081
 msgid "This certificate is not viewable"
 msgstr "Этот сертификат нельзя просмотреть"
 
-#: ../mail/em-format-html-display.c:1377
+#: ../mail/em-format-html-display.c:1407
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Выполнено %d %b %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1415
 msgid "Overdue:"
 msgstr "Просрочена:"
 
-#: ../mail/em-format-html-display.c:1388
+#: ../mail/em-format-html-display.c:1418
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "от %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1496
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1497
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: ../mail/em-format-html-display.c:1468
+#: ../mail/em-format-html-display.c:1498
 msgid "_Fit to Width"
 msgstr "_Уместить по ширине"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1499
 msgid "Show _Original Size"
 msgstr "Показать _исходный размер"
 
-#: ../mail/em-format-html-display.c:1989
+#: ../mail/em-format-html-display.c:2168
 msgid "Save attachment as"
 msgstr "Сохранить вложение как"
 
-#: ../mail/em-format-html-display.c:1993
+#: ../mail/em-format-html-display.c:2172
 msgid "Select folder to save all attachments"
 msgstr "Выберите папку для сохранения всех вложений"
 
-#: ../mail/em-format-html-display.c:2044
+#: ../mail/em-format-html-display.c:2223
 msgid "_Save Selected..."
 msgstr "_Сохранить выделенные..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
+#: ../mail/em-format-html-display.c:2290
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12753,31 +12814,31 @@ msgstr[0] "%d вложе_ние"
 msgstr[1] "%d вложе_ний"
 msgstr[2] "%d вложе_ний"
 
-#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
 msgid "S_ave"
 msgstr "С_охранить"
 
-#: ../mail/em-format-html-display.c:2129
+#: ../mail/em-format-html-display.c:2308
 msgid "S_ave All"
 msgstr "С_охранить все"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2382
 msgid "No Attachment"
 msgstr "Нет вложений"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
 msgid "View _Unformatted"
 msgstr "Отобразить _неотформатированные"
 
-#: ../mail/em-format-html-display.c:2346
+#: ../mail/em-format-html-display.c:2531
 msgid "Hide _Unformatted"
 msgstr "Скрыть _неформатированные"
 
-#: ../mail/em-format-html-display.c:2403
+#: ../mail/em-format-html-display.c:2588
 msgid "O_pen With"
 msgstr "О_ткрыть с помощью"
 
-#: ../mail/em-format-html-display.c:2479
+#: ../mail/em-format-html-display.c:2664
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12875,7 +12936,7 @@ msgstr "Это письмо было отослано <b>%s</b> от лица <b
 
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "От"
 
@@ -12936,11 +12997,11 @@ msgstr "Ошибка проверки подписи"
 msgid "Unknown error verifying signature"
 msgstr "Неизвестная ошибка при проверке подписи"
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message"
 msgstr "Не удалось разобрать сообщение PGP."
 
-#: ../mail/em-format.c:1663
+#: ../mail/em-format.c:1665
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Не удалось разобрать сообщение PGP: Неизвестная ошибка"
 
@@ -13047,19 +13108,19 @@ msgstr "Не удалось открыть сохраненные на серв�
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
-"Не удалось создать каталог для хранения данных на сервере POP3 `%s': %s"
+"Не удалось создать каталог для хранения данных на сервере POP3 «%s»: %s"
 
 #: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Не удалось скопировать сохраненные на сервере POP3 данные `%s': %s"
+msgstr "Не удалось скопировать сохраненные на сервере POP3 данные «%s»: %s"
 
 #: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Ошибка создания локального хранилища почты`%s': %s"
+msgstr "Ошибка создания локального хранилища почты «%s»: %s"
 
-#: ../mail/em-migrate.c:2898
+#: ../mail/em-migrate.c:2952
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13071,12 +13132,12 @@ msgstr ""
 "\n"
 "Подождите, пока Evolution преобразует ваши папки..."
 
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Не удалось создать локальные почтовые папки в `%s': %s"
+msgstr "Не удалось создать локальные почтовые папки в «%s»: %s"
 
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13084,38 +13145,38 @@ msgstr ""
 "Не удалось прочитать данные предыдущей установки Evolution, `evolution/"
 "config/xmldb' не существует или поврежден."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Ответить в _список"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
 msgid "_Add to Address Book"
 msgstr "_Добавить в адресную книгу"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:600
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Этот сервер не поддерживает подписку, или подписка запрещена."
 
-#: ../mail/em-subscribe-editor.c:615
+#: ../mail/em-subscribe-editor.c:633
 msgid "Subscribed"
 msgstr "Подписан"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:637
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:821
+#: ../mail/em-subscribe-editor.c:839
 msgid "Please select a server."
 msgstr "Пожалуйста, выберите сервер."
 
-#: ../mail/em-subscribe-editor.c:842
+#: ../mail/em-subscribe-editor.c:860
 msgid "No server has been selected"
 msgstr "Не был выбран сервер"
 
@@ -13349,8 +13410,8 @@ msgid "Directory for saving mail component files."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
 #: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "Включить или выключить сокращение имён папок в дереве"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Включить или выключить сокращение имён папок в боковой панели"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -14027,8 +14088,8 @@ msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Добавлять ли отчёт о прочтении к каждому сообщению."
 
 #: ../mail/evolution-mail.schemas.in.h:178
-msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr "Выключить ли сокращение имён в дереве папок."
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "Выключить ли сокращение имён в дереве папок в боковой панели."
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
@@ -14104,35 +14165,30 @@ msgstr "Evolution Pine importer"
 msgid "Import mail from Pine."
 msgstr "Импорт почты из Pine"
 
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Почта к %s"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Почта от %s"
 
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема %s"
 
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "список рассылки %s"
 
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Шаблоны"
-
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d selected, "
@@ -14261,7 +14317,7 @@ msgstr "<span weight=\"bold\">Описание учётной записи</span
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">Аутентификация</span>"
+msgstr "<span weight=\"bold\">Проверка подлинности</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
@@ -14346,7 +14402,7 @@ msgstr "<span weight=\"bold\">Параметры сервера</span>"
 
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">Тип _аутентификации</span>"
+msgstr "<span weight=\"bold\">Тип _проверки подлинности</span>"
 
 #: ../mail/mail-config.glade.h:35
 msgid "Account Management"
@@ -14810,9 +14866,9 @@ msgstr "_Имя пользователя:"
 
 #: ../mail/mail-config.glade.h:158
 msgid "Use Authe_ntication"
-msgstr "Использовать аутентифик_ацию"
+msgstr "Использовать проверку подл_инности"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
 #: ../plugins/google-account-setup/google-source.c:634
 #: ../plugins/google-account-setup/google-contacts-source.c:288
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
@@ -14999,7 +15055,7 @@ msgstr "_Найти:"
 msgid "Find in Message"
 msgstr "Поиск в сообщении"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Пометить к исполнению"
 
@@ -15051,7 +15107,7 @@ msgstr "_Отметка:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Установите, чтобы принять лицензионное соглашение"
 
-#: ../mail/mail-folder-cache.c:833
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
@@ -15098,11 +15154,11 @@ msgstr "Отправка сообщения %d из %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Не удалось отправить %d из %d сообщений"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Отменено."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Выполнено."
 
@@ -15255,15 +15311,15 @@ msgstr "Получение и отправка почты"
 msgid "Cancel _All"
 msgstr "Отменить _все"
 
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: ../mail/mail-send-recv.c:804
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Проверка новой почты"
@@ -15342,11 +15398,11 @@ msgstr "Обновление папок поиска для '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Обновление папок писка для «%s»"
 
-#: ../mail/mail-vfolder.c:1081
+#: ../mail/mail-vfolder.c:1086
 msgid "Edit Search Folder"
 msgstr "Изменить папку поиска"
 
-#: ../mail/mail-vfolder.c:1170
+#: ../mail/mail-vfolder.c:1175
 msgid "New Search Folder"
 msgstr "Новая папка поиска"
 
@@ -15663,7 +15719,7 @@ msgstr "Игнорировать"
 
 #: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
-msgstr "Неподдерживаемая аутентификация"
+msgstr "Не удалась проверка подлинности"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
@@ -15746,7 +15802,7 @@ msgstr "Запрашивается сервер"
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Опрашивается сервер для получения списка поддерживаемых механизмов "
-"аутентификации."
+"проверки подлинности."
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
@@ -15868,8 +15924,8 @@ msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
-"Ваш сервер не поддерживает этот тип аутентификации и, возможно, не "
-"поддерживает аутентификацию вообще."
+"Ваш сервер не поддерживает этот тип проверки подлинности и, возможно, совсем не "
+"поддерживает проверку подлинности."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
@@ -15972,83 +16028,79 @@ msgstr "Уни_чтожить удалённые"
 msgid "_Open Messages"
 msgstr "_Открыть сообщения"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Отвечено"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Переслано"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Низкий"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Высокий"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2519 ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Сообщения"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3981 ../mail/message-list.c:4452
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4288
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16056,7 +16108,7 @@ msgstr ""
 "Нет писем, удовлетворяющих критериям поиска. Очистите поле поиска с помощью "
 "меню Поиск → Очистить или измените критерии."
 
-#: ../mail/message-list.c:4293
+#: ../mail/message-list.c:4290
 msgid "There are no messages in this folder."
 msgstr "В папке нет сообщений."
 
@@ -16093,39 +16145,39 @@ msgstr "Размер"
 msgid "Subject - Trimmed"
 msgstr "Тема - Очищенная"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Позвонить"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Не пересылать"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "К исполнению"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Для сведения"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Переслать"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Можно не отвечать"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Ответить"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Проверить"
 
@@ -16495,27 +16547,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Произошла ошибка, пока выполнялся %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Дочерний процесс Bogofilter не отвечает, завершение..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Ожидание дочернего процесса Bogofilter прервано, завершение..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Ошибка канала для Bogofilter, код ошибки: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
 msgid "Convert message text to _Unicode"
 msgstr "Преобразовать текст письма в _Юникод"
 
@@ -16543,21 +16595,31 @@ msgstr "Антиспамовый модуль Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Фильтрует спам используя Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/caldav/caldav-source.c:372
 #: ../plugins/google-account-setup/google-source.c:627
 #: ../plugins/google-account-setup/google-contacts-source.c:311
 msgid "Use _SSL"
 msgstr "Использовать _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "Обнов_ить"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "Источники календарей CalDAV"
@@ -16574,13 +16636,6 @@ msgstr "Локальные календари"
 msgid "Provides core functionality for local calendars."
 msgstr "Предоставляет базовую функциональность для локальных календарей."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:651
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "Re_fresh:"
-msgstr "Обнов_ить"
-
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Использовать _защищенное соединение"
@@ -16597,48 +16652,55 @@ msgstr "Календари HTTP"
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Предоставляет базовую функциональность для календарей webcal и http."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "Погода: Облачно"
-
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr "Погода: Туман"
+msgstr "Погода: туман"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "Погода: Переменная облачность"
+msgid "Weather: Cloudy"
+msgstr "Погода: облачно"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "Погода: Дождь"
+msgid "Weather: Cloudy Night"
+msgstr "Погода: облачная ночь"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
-msgid "Weather: Snow"
-msgstr "Погода: Снег"
+msgid "Weather: Overcast"
+msgstr "Погода: сплошная облачность"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Sunny"
-msgstr "Погода: Солнечно"
+msgid "Weather: Showers"
+msgstr "Погода: облака"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Snow"
+msgstr "Погода: снег"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+msgid "Weather: Sunny"
+msgstr "Погода: солнечно"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Clear Night"
+msgstr "Погода: ясная ночь"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
-msgstr "Погода: Грозы"
+msgstr "Погода: грозы"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Выберите адрес"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
 msgid "_Units:"
 msgstr "_Единицы:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Метрические (Цельсий, сантиметры, и т.д.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Британские (Фаренгейт, дюймы, и т.д.)"
 
@@ -16687,7 +16749,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Сделать Evolution вашим почтовым клиентом по умолчанию?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:590
+#: ../shell/main.c:599
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16769,6 +16831,13 @@ msgstr ""
 "Сначала идёт имя заголовка, затем «=» и затем значения, разделённые символом "
 "«;»"
 
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+"[Секретность=Личное;Конфиденциально;Секретно;Строго секретно]"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Открыть папку другого пользователя"
@@ -16788,7 +16857,7 @@ msgstr "_Пользователь:"
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
-msgstr "Защищенный пароль"
+msgstr "Защищённый пароль"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
@@ -16797,11 +16866,11 @@ msgid ""
 "authentication."
 msgstr ""
 "Этот параметр позволит подключиться к серверу Exchange, используя "
-"аутентификацию с защищенным паролем (NTLM)."
+"проверку подлинности с защищённым паролем (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
-msgstr "Незащищенный пароль"
+msgstr "Незащищённый пароль"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
@@ -16809,13 +16878,13 @@ msgid ""
 "password authentication."
 msgstr ""
 "Этот параметр позволит подключиться к серверу Exchange средствами "
-"стандартной аутентификации (незащищенный текстовый пароль)."
+"стандартной проверки подлинности (незащищённый текстовый пароль)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
 msgid "Out Of Office"
 msgstr "Не на работе"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16823,81 +16892,85 @@ msgstr ""
 "Сообщение, указанное ниже, будет автоматически отправлено\n"
 "всем лицам, приславшим вам почту во время вашего отсутствия на работе."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:282
-#: ../plugins/exchange-operations/exchange-account-setup.c:287
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
 msgid "I am out of the office"
 msgstr "Я сейчас не на работе"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/exchange-operations/exchange-account-setup.c:286
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am in the office"
 msgstr "Я сейчас на работе"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Change the password for Exchange account"
 msgstr "Изменить пароль учётной записи Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Изменить пароль"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:341
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Управление параметрами поручения для учётной записи Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
 msgid "Delegation Assistant"
 msgstr "Помощник делегации"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
 msgid "Miscelleneous"
 msgstr "Разное"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:365
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 msgid "View the size of all Exchange folders"
 msgstr "Просмотр размера всех папок Excange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
 msgid "Folders Size"
 msgstr "Размер папок"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Параметры Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:696
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:722
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
 msgid "A_uthenticate"
-msgstr "А_утентификация"
+msgstr "Проверить п_одлинность"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "_Задать почтовый ящик"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:743
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
 msgid "_Mailbox:"
 msgstr "_Почтовый ящик:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:944
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
 msgid "_Authentication Type"
-msgstr "Тип _аутентификации"
+msgstr "Тип _проверки подлинности"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:958
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
 msgid "Ch_eck for Supported Types"
 msgstr "Пров_ерить поддерживаемые типы"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
@@ -17364,18 +17437,22 @@ msgid "Exchange Operations"
 msgstr "Операции с Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr "Закладка «Настройки Exchange» недоступна в автономном режиме."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot change password due to configuration problems."
 msgstr "Не удалось изменить пароль из-за проблем с настройкой."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot display folders."
 msgstr "Не удалось отобразить папки."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Cannot perform the operation."
 msgstr "Ошибка при выполнении операции."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17383,15 +17460,15 @@ msgstr ""
 "Изменения настройки учётной записи Exchange «{0}» вступят в силу только после "
 "перезапуска Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not authenticate to server."
-msgstr "Сбой аутентификации на сервере."
+msgstr "Проверка подлинности на сервере не удалась."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid "Could not change password."
 msgstr "Не удалось изменить пароль."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17402,61 +17479,61 @@ msgstr ""
 "Проверьте URL, имя пользователя, пароль\n"
 "и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to Exchange server."
 msgstr "Не удалось подключиться к серверу Exchange"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not connect to server {0}."
 msgstr "Не удалось подключиться к серверу {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr "Не удалось определить права папки для представителей."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr "Не удалось найти Exchange Web Storage System."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not locate server {0}."
 msgstr "Не удалось найти сервер {0}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not make {0} a delegate"
 msgstr "Не удалось сделать {0} представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions"
 msgstr "Не удалось прочитать права папки"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read folder permissions."
 msgstr "Не удалось прочитать права папки."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not read out-of-office state"
 msgstr "Не удалось прочитать состояние «не на работе»"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update folder permissions."
 msgstr "Не удалось обновить права папки."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Could not update out-of-office state"
 msgstr "Не удалось обновить состояние «не на работе»"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 "Для загрузки подписанного почтового ящика пользователя требуется перезапуск "
 "Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid "Exchange Account is offline."
 msgstr "Учётная запись Exchange отключена."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17484,32 +17561,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Failed to update delegates:"
 msgstr "Ошибка обновления представителей:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Папка не существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Папка отключена"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1270
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Общая ошибка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr "Сервер глобального каталога недоступен"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17517,73 +17594,73 @@ msgstr ""
 "Если OWA выполняется по другому пути, вы должны указать это в диалоге "
 "настройки учётной записи."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr "Почтовый ящик для {0} находится не на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr "Убедитесь, что URL верен, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Убедитесь, что имя сервера введено корректно, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr "Убедитесь, что имя пользователя и пароль верны, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr "Для этой учётной записи не настроен сервер Глобального каталога."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нет почтовых ящиков для пользователя {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Нет такого пользователя {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Password successfully changed."
 msgstr "Пароль успешно изменен."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Введите идентификатор представителя или уберите параметр отсылки сообщения "
 "как сообщения представителя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Убедитесь, что имя сервера глобального каталога корректно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Перезапустите Evolution, чтобы изменения вступили в силу"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Выберите пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr "Сервер отверг пароль, потому что он слишком уязвим."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Учётная запись Exchange запрещена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Учётная запись Exchange будет удалена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Сервер Exchange несовместим с Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17591,7 +17668,7 @@ msgstr ""
 "На этом сервере работает Exchange 5.5. Exchange Connector\n"
 " поддерживает только Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17604,58 +17681,58 @@ msgstr ""
 "\n"
 "Или же вы просто неправильно ввели пароль."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Try again with a different password."
 msgstr "Попробуйте еще раз с другим паролем."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr "Не удалось добавить пользователя в список управления доступом:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unable to edit delegates."
 msgstr "Не удалось изменить представителей."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error looking up {0}"
 msgstr "Неизвестная ошибка при поиске {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 #: ../plugins/google-account-setup/google-source.c:540
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Неизвестный тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Unsupported operation"
 msgstr "Неподдерживаемое действие"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Вы почти достигли квоты сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Вам разрешено посылать сообщение только от имени одного пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr "Вы не можете сделать себя своим представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Вы превысили квоту для сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr "Вы можете настроить только одну учётную запись Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17663,7 +17740,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Попробуйте очистить место, удалив некоторое "
 "количество сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17671,7 +17748,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете ни отправлять, ни получать "
 "сообщения."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17679,19 +17756,19 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете отправлять сообщения, пока не "
 "очистите место путем удаления некоторого количества сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "Your password has expired."
 msgstr "Срок действия вашего пароля истёк."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не может быть добавлен в список управления доступом"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already a delegate"
 msgstr "{0} уже является представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 msgid "{0} is already in the list"
 msgstr "{0} уже в списке"
 
@@ -17797,9 +17874,9 @@ msgid "Unsubscribing from folder \"%s\""
 msgstr "Отмена подписки на папку «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
 msgstr ""
-"Позволяет отменять подписку на почтовые папки в контекстном меню папки."
+"Позволяет отменять подписку на почтовые папки в контекстном меню папки в боковой панели."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -18122,7 +18199,8 @@ msgstr "_Запись"
 msgid "permission to read|_Read"
 msgstr "_Чтение"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Прокси"
 
@@ -18130,7 +18208,8 @@ msgstr "Прокси"
 msgid "<b>Account Name</b>"
 msgstr "<b>Имя учётной записи</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 msgid "Proxy Login"
 msgstr "Учётная запись прокси"
 
@@ -18196,56 +18275,56 @@ msgstr "Добавить   "
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../plugins/groupwise-features/status-track.c:107
+#: ../plugins/groupwise-features/status-track.c:97
 msgid "Message Status"
 msgstr "Состояние сообщения"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:121
+#: ../plugins/groupwise-features/status-track.c:111
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../plugins/groupwise-features/status-track.c:135
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "From:"
 msgstr "От:"
 
-#: ../plugins/groupwise-features/status-track.c:150
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Creation date:"
 msgstr "Дата создания:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:179
 msgid "Recipient: "
 msgstr "Получатель: "
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Delivered: "
 msgstr "Доставлено: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:192
 msgid "Opened: "
 msgstr "Открыто: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:197
 msgid "Accepted: "
 msgstr "Принято: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Deleted: "
 msgstr "Удалено: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Declined: "
 msgstr "Отклонено: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Completed: "
 msgstr "Завершено: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Undelivered: "
 msgstr "Не доставлено: "
 
-#: ../plugins/groupwise-features/status-track.c:251
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Track Message Status..."
 msgstr "Отслеживать состояние сообщения..."
 
@@ -18472,51 +18551,51 @@ msgstr "Представителю отправлено сообщение об
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Невозможно отправить уведомление об отмене представителю"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1318
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не удалось обновить участника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1300
+#: ../plugins/itip-formatter/itip-formatter.c:1322
 msgid "Attendee status updated"
 msgstr "Статус участника обновлён"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1326
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Meeting information sent"
 msgstr "Информация о собрании послана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1329
+#: ../plugins/itip-formatter/itip-formatter.c:1351
 msgid "Task information sent"
 msgstr "Информация о задаче послана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1332
+#: ../plugins/itip-formatter/itip-formatter.c:1354
 msgid "Memo information sent"
 msgstr "Информация о заметке послана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Не удалось послать информацию о встрече, встреча не существует"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1344
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не удалось послать информацию о задаче, задача не существует"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1347
+#: ../plugins/itip-formatter/itip-formatter.c:1369
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Не удалось послать информацию о заметке, заметка не существует"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
-#: ../plugins/itip-formatter/itip-formatter.c:1427
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "The calendar attached is not valid"
 msgstr "Вложенный календарь недействителен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18524,15 +18603,15 @@ msgstr ""
 "Это сообщение претендует, что содержит календарь, но календарь не является "
 "действительным iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1468
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1490
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The item in the calendar is not valid"
 msgstr "Элемент в календаре недействителен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1469
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1601
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18540,11 +18619,11 @@ msgstr ""
 "Это сообщение содержит календарь, но календарь не содержит событий, задач "
 "или сведений о занятости."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1530
 msgid "The calendar attached contains multiple items"
 msgstr "Вложенный календарь содержит несколько элементов"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18552,37 +18631,37 @@ msgstr ""
 "Чтобы обработать все эти элементы, файл должен быть сохранен и календарь "
 "должен быть импортирован"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2218
+#: ../plugins/itip-formatter/itip-formatter.c:2240
 msgid "This meeting recurs"
 msgstr "Эта встреча повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../plugins/itip-formatter/itip-formatter.c:2243
 msgid "This task recurs"
 msgstr "Эта задача повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2246
 msgid "This memo recurs"
 msgstr "Эта заметка повторяется"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "_Delete message after acting"
 msgstr "_Удалить сообщение после действия"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2470
-#: ../plugins/itip-formatter/itip-formatter.c:2502
+#: ../plugins/itip-formatter/itip-formatter.c:2492
+#: ../plugins/itip-formatter/itip-formatter.c:2524
 msgid "Conflict Search"
 msgstr "Поиск конфликтов"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../plugins/itip-formatter/itip-formatter.c:2507
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Выберите календари для поиска конфликтующих собраний"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../widgets/misc/e-cell-date-edit.c:297
 msgid "Today"
 msgstr "Сегодня"
 
@@ -19156,20 +19235,20 @@ msgstr "Должен ли значёк мигать или нет."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Надо ли оповещать о новых сообщениях только в папке Входящие."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:256
 msgid "Generate a _D-Bus message"
 msgstr "Генерировать сообщение D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:379
 msgid "Evolution's Mail Notification"
 msgstr "Уведомление о новой почте Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:400
 msgid "Mail Notification Properties"
 msgstr "Свойства уведомления о новой почте"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:479
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19187,7 +19266,7 @@ msgstr[2] ""
 "Вы получили %d новых сообщений\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:484
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19195,48 +19274,48 @@ msgstr[0] "Вы получили %d новое сообщение."
 msgstr[1] "Вы получили %d новых сообщения."
 msgstr[2] "Вы получили %d новых сообщений."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "New email"
 msgstr "Новое письмо"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "Show icon in _notification area"
 msgstr "Пока_зывать значок в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:569
 msgid "B_link icon in notification area"
 msgstr "Мер_цать значком в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:571
 msgid "Popup _message together with the icon"
 msgstr "Показ_ывать всплывающее сообщение вместе со значком"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Play sound when new messages arrive"
 msgstr "_Воспроизводить звук при приходе новой почты"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "_Beep"
 msgstr "По_давать гудок"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Play _sound file"
 msgstr "Про_игрывать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:770
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:771
 msgid "Select sound file"
 msgstr "Выбрать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:750
+#: ../plugins/mail-notification/mail-notification.c:772
 msgid "Pl_ay"
 msgstr "Вос_произвести"
 
-#: ../plugins/mail-notification/mail-notification.c:807
+#: ../plugins/mail-notification/mail-notification.c:829
 msgid "Notify new messages for _Inbox only"
 msgstr "Опове_щать о новых сообщениях только во «Входящих»"
 
@@ -19384,13 +19463,13 @@ msgstr "Отправить сообщение в список рассылки?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could process.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Действие не может быть выполнено. Заголовок этого действия не содержит "
-"действия, которое мы можем обработать.\n"
+"Действие не может быть выполнено. Заголовок не содержит "
+"действия, доступного для обработки.\n"
 "\n"
 "Заголовок: {0}"
 
@@ -19572,19 +19651,19 @@ msgstr "Режим обычного текста"
 msgid "Prefer plain-text"
 msgstr "Предпочитать обычный текст"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Показывать HTML, если есть"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
 msgstr "Предпочитать PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
 msgstr "Только когда показывается PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "Ре_жим HTML"
 
@@ -19596,6 +19675,18 @@ msgstr "Профайлер Evolution"
 msgid "Writes a log of profiling data events."
 msgstr "Ведет журнал событий профилирования данных"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Импорт сообщений Outlook из файла PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Импортирование из файлов PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Персональная папка Outlook (.pst)"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Предоставляет возможность публикации календарей на Веб"
@@ -19700,6 +19791,14 @@ msgstr ""
 "iCal\n"
 "Cвободен/занят"
 
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "Новый адрес"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "Правка адреса"
+
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -20092,7 +20191,7 @@ msgstr "Evolution Test component"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr "Авторизоваться при соединении с прокси"
+msgstr "Проверить подлинность при соединении с прокси"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
@@ -20175,7 +20274,7 @@ msgstr "Узлы для доступа без прокси"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Пароль для авторизации на прокси."
+msgstr "Пароль для проверки подлинности на прокси."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
@@ -20217,7 +20316,7 @@ msgstr "Боковая панель видима"
 msgid "Skip development warning dialog"
 msgstr "Пропускать диалог предупреждения о тестовой версии"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
@@ -20472,19 +20571,15 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Веб-сайт Evolution"
 
-#: ../shell/e-shell-window-commands.c:971
-msgid "Error opening the FAQ webpage."
-msgstr "Произошла ошибка при открытии веб-страницы вопросов."
-
-#: ../shell/e-shell-window-commands.c:1174
+#: ../shell/e-shell-window-commands.c:1170
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: ../shell/e-shell-window-commands.c:1200
+#: ../shell/e-shell-window-commands.c:1196
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
@@ -20514,28 +20609,28 @@ msgstr ""
 msgid "Switch to %s"
 msgstr "Переключиться в %s"
 
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
 msgid "Unknown system error."
 msgstr "Неизвестная системная ошибка."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld КБ"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
 msgid "OK"
 msgstr "Ок"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Не удалось зарегистрировать в OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
@@ -20597,7 +20692,7 @@ msgstr ""
 "внешних файлов в Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:221
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20633,7 +20728,7 @@ msgstr ""
 "Надеемся, что вам понравится результат нашего труда,\n"
 "и с нетерпением ждем вашей помощи!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:245
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20641,43 +20736,43 @@ msgstr ""
 "С благодарностью\n"
 "команда Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:252
 msgid "Do not tell me again"
 msgstr "Не напоминать больше"
 
-#: ../shell/main.c:474
+#: ../shell/main.c:481
 msgid "Start Evolution activating the specified component"
 msgstr "Запуск Evolution с активированием указанного компонента"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:485
 msgid "Start in online mode"
 msgstr "Запуск в режиме подключения к интернету"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:488
 msgid "Forcibly shut down all Evolution components"
 msgstr "Принудительное завершение работы всех компонентов Evolution"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:492
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Принудительная повторная миграция с Evolution 1.4"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:495
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: ../shell/main.c:490
+#: ../shell/main.c:497
 msgid "Disable loading of any plugins."
 msgstr "Запретить загрузку любых модулей."
 
-#: ../shell/main.c:492
+#: ../shell/main.c:499
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Выключить область просмотра почты, контактов и задач."
 
-#: ../shell/main.c:577
+#: ../shell/main.c:586
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Почтовый клиент и ежедневник Evolution"
 
-#: ../shell/main.c:605
+#: ../shell/main.c:614
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22349,10 +22444,6 @@ msgstr "У_величить"
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
@@ -22571,7 +22662,7 @@ msgstr "Переключить работу в/вне сети."
 
 #: ../ui/evolution.xml.h:36
 msgid "Tool_bar Style"
-msgstr "Ст_ль панели инструментов"
+msgstr "Сти_ль панели инструментов"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -22785,42 +22876,42 @@ msgid "_Replace existing view"
 msgstr "_Заменить существующий обзор"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
 msgid "Custom View"
 msgstr "Вид пользователя"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
 msgid "Save Custom View"
 msgstr "Сохранить параметры обзора"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
 msgid "Define Views..."
 msgstr "Режимы просмотра..."
 
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Тек_ущий вид"
 
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
 #, c-format
 msgid "Select View: %s"
 msgstr "Выбор обзора: %s"
 
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Current view is a customized view"
 msgstr "Текущий обзор настроен пользователем"
 
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
 msgid "Save Custom View..."
 msgstr "Сохранить вид пользователя..."
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
 msgid "Save current custom view"
 msgstr "Сохранить текущий обзор"
 
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
 msgid "Create or edit views"
 msgstr "Создать или настроить обзор"
 
@@ -22844,7 +22935,7 @@ msgstr "Тип обзора"
 msgid "Type of view:"
 msgstr "Тип обзора:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
 msgid "Attachment Bar"
 msgstr "Панель вложений"
 
@@ -22944,16 +23035,16 @@ msgstr "Минимальная ширина"
 msgid "Spacing"
 msgstr "Пространство"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
 msgid "Now"
 msgstr "Сейчас"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Время должно быть в формате: %s"
 
-#: ../widgets/misc/e-cell-percent.c:78
+#: ../widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значение процента должно быть между 0 и 100, включительно"
 
@@ -23068,10 +23159,6 @@ msgstr "Нажмите эту кнопку для отображения кал�
 msgid "Drop-down combination box to select time"
 msgstr "Выпадающий список для выбора времени"
 
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "Время"
-
 #: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "Сей_час"
@@ -23491,23 +23578,23 @@ msgstr "Столбец, имеющий фокус"
 msgid "Unselected Column"
 msgstr "Невыделенный столбец"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1794
 msgid "Strikeout Column"
 msgstr "Перечёркнутый столбец"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Underline Column"
 msgstr "Подчёркнутый столбец"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Bold Column"
 msgstr "Столбец с жирным текстом"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Color Column"
 msgstr "Цветной столбец"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1829
 msgid "BG Color Column"
 msgstr "Цвет фона столбца"
 
@@ -23952,124 +24039,3 @@ msgstr "Контекст метода ввода (IM)"
 msgid "Handle Popup"
 msgstr "Обрабатывать всплывающие окна"
 
-#~ msgid "A_dd Filter Criteria"
-#~ msgstr "_Добавить правило фильтра"
-
-#~ msgid "Error"
-#~ msgstr "Ошибка"
-
-#~ msgid "Errors"
-#~ msgstr "Ошибки"
-
-#~ msgid "Warnings and Errors"
-#~ msgstr "Предупреждения и ошибки"
-
-#~ msgid "Debug"
-#~ msgstr "Отладка"
-
-#~ msgid "Error, Warnings and Debug messages"
-#~ msgstr "Ошибки, предупреждения и отладочные сообщения"
-
-#~ msgid "Debug Logs"
-#~ msgstr "Журналы отладки"
-
-#~ msgid "Show _errors in the status bar for"
-#~ msgstr "Показывать о_шибки в строке состояния для"
-
-#~ msgid "second(s)."
-#~ msgstr "секунд."
-
-#~ msgid "Log Messages:"
-#~ msgstr "Сообщения журнала:"
-
-#~ msgid "Log Level"
-#~ msgstr "Уровень журналирования"
-
-#~ msgid "Mark calendar offline"
-#~ msgstr "Пометить календарь для автономной работы"
-
-#~ msgid "Marks the selected calendar for offline viewing."
-#~ msgstr "Помечает выделенный календарь для автономного просмотра."
-
-#~ msgid "Select Importers"
-#~ msgstr "Выберите импортер"
-
-#~ msgid "Re_fresh..."
-#~ msgstr "Обнов_ить..."
-
-#~ msgid "Please enter user name first."
-#~ msgstr "Введите имя пользователя."
-
-#~ msgid "Migrating `%s':"
-#~ msgstr "Переносится «%s»:"
-
-#~ msgid "_Properties..."
-#~ msgstr "_Свойства..."
-
-#~ msgid "Recent Docu_ments"
-#~ msgstr "Недавние доку_менты"
-
-#~ msgid "D_escription:"
-#~ msgstr "_Описание:"
-
-#~ msgid "De_scription:"
-#~ msgstr "Опис_ание:"
-
-#~ msgid "Updating query"
-#~ msgstr "Обновляется очередь"
-
-#~ msgid "Upcoming Appointments"
-#~ msgstr "Следующие встречи"
-
-#~ msgid "button-user"
-#~ msgstr "кнопка-пользователь"
-
-#~ msgid "Username:"
-#~ msgstr "Имя пользователя:"
-
-#~ msgid "Update every"
-#~ msgstr "Обновлять каждые"
-
-#~ msgid "Mark all messages in this folder and subfolders as read?"
-#~ msgstr "Пометить все сообщения в папке и подпапках как прочитанные?"
-
-#~ msgid "Do you want the operation to be performed also in the subfolders?"
-#~ msgstr "Выполнить эту операцию для подпапок?"
-
-#~ msgid "Mark All Messages as Read"
-#~ msgstr "Пометить все сообщения как «Прочитанные»"
-
-#~ msgid "Decides whether the crash detection should be run or not."
-#~ msgstr "Определяет, должно ли запускаться обнаружение сбоя."
-
-#~ msgid "Skip recovery warning dialog"
-#~ msgstr "Пропускать диалог предупреждения о восстановлении"
-
-#~ msgid "Whether crash detection should be done or not"
-#~ msgstr "Надо ли проводить обнаружение сбоя"
-
-#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
-#~ msgstr ""
-#~ "Надо ли пропускать диалог предупреждения при восстановлении Evolution."
-
-#~ msgid "Evolution Crash Detection"
-#~ msgstr "Обнаружение сбоев Evolution"
-
-#~ msgid "Ig_nore"
-#~ msgstr "И_гнорировать"
-
-#~ msgid ""
-#~ "Evolution appears to have exited unexpectedly the last time it was\n"
-#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
-#~ "You can restore the preview panes from the View menu.\n"
-#~ msgstr ""
-#~ "Похоже, в прошлый раз программа Evolution завершилась\n"
-#~ "неожиданно. В качестве меры предосторожности отключены\n"
-#~ "все панели предварительного просмотра. Вы можете снова\n"
-#~ "включить их через меню Вид.\n"
-
-#~ msgid "_Do not show this message again"
-#~ msgstr "Боль_ше не показывать это сообщение"
-
-#~ msgid "Show messages in the normal style"
-#~ msgstr "Отображать сообщения в обычном стиле"