Merge branch 'express2'

108 files changed, 7423 insertions, 7780 deletions

diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index 17aad19f0f..3701557062 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -1586,6 +1586,13 @@
                       </object>
                     </child>
                     <child type="label">
+                              <object class="GtkHBox" id="hbox5617">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">4</property>
+                                <child>
+
+
                       <object class="GtkLabel" id="label410">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Web Addresses</property>
@@ -1605,7 +1612,40 @@
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
-                    </child>
+		     </child>
+                                <child>
+                                  <object class="GtkButton" id="button-web-expand">
+                                    <property name="width_request">20</property>
+                                    <property name="height_request">20</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NONE</property>
+                                    <property name="focus_on_click">True</property>
+                                    <child>
+                                      <object class="GtkArrow" id="arrow-web-expand">
+                                        <property name="visible">True</property>
+                                        <property name="arrow_type">GTK_ARROW_RIGHT</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                      </object>
+                                    </child>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="a11y-button-web-expand1">
+                                        <property name="AtkObject::accessible_name" translatable="yes">Web addresses</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                         </child>
                   </object>
                   <packing>
                     <property name="padding">0</property>
@@ -1962,6 +2002,7 @@
                   <object class="GtkExpander" id="expander-personal-misc">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkTable" id="table89">
                         <property name="border_width">12</property>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 197ce2bdf5..2f885e4721 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1161,6 +1161,18 @@ expand_widget_list (EContactEditor *editor,
 }
 
 static void
+expand_web (EContactEditor *editor, gboolean expanded)
+{
+	const gchar *names[] = {
+		"label-videourl", "label-fburl",
+		"entry-videourl", "entry-fburl",
+		NULL
+	};
+	set_arrow_image (editor, "arrow-phone-expand", expanded);
+	expand_widget_list (editor, names, expanded);
+}
+
+static void
 expand_phone (EContactEditor *editor, gboolean expanded)
 {
 	const gchar *names[] = {
@@ -1803,6 +1815,8 @@ init_personal (EContactEditor *editor)
 		GTK_EXPANDER (e_builder_get_widget (editor->builder,
 						    "expander-personal-misc")),
 		!editor->compress_ui);
+
+	expand_web (editor, !editor->compress_ui);
 }
 
 static void
@@ -3455,6 +3469,19 @@ setup_tab_order(GtkBuilder *builder)
 }
 
 static void
+expand_web_toggle (EContactEditor *ce)
+{
+	GtkWidget *widget;
+
+	widget = e_builder_get_widget (ce->builder, "label-videourl");
+#if GTK_CHECK_VERSION(2,19,7)
+	expand_web (ce, !gtk_widget_get_visible (widget));
+#else
+	expand_web (ce, !GTK_WIDGET_VISIBLE (widget));
+#endif
+}
+
+static void
 expand_phone_toggle (EContactEditor *ce)
 {
 	GtkWidget *phone_ext_table;
@@ -3533,6 +3560,8 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 	g_signal_connect (widget, "clicked", G_CALLBACK (file_cancel_cb), e_contact_editor);
 	widget = e_builder_get_widget (e_contact_editor->builder, "button-help");
 	g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor);
+	widget = e_builder_get_widget (e_contact_editor->builder, "button-web-expand");
+	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_web_toggle), e_contact_editor);
 	widget = e_builder_get_widget (e_contact_editor->builder, "button-phone-expand");
 	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor);
 	widget = e_builder_get_widget (e_contact_editor->builder, "button-mail-expand");
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index afba3e4602..f7ef6fdcf4 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -183,6 +183,25 @@ message_push (Message *msg)
 	msg->func (msg);
 }
 
+/*
+ * use a static ring-buffer so we can call this twice
+ * in a printf without getting nonsense results.
+ */
+static const gchar *
+e_ctime (const time_t *timep)
+{
+  static gchar *buffer[4] = { 0, };
+  static gint next = 0;
+  const gchar *ret;
+
+  g_free (buffer[next]);
+  ret = buffer[next++] = g_strdup (ctime (timep));
+  if (next >= G_N_ELEMENTS (buffer))
+	next = 0;
+
+  return ret;
+}
+
 /* Queues an alarm trigger for midnight so that we can load the next day's worth
  * of alarms.
  */
@@ -199,7 +218,7 @@ queue_midnight_refresh (void)
 	zone = config_data_get_timezone ();
 	midnight = time_day_end_with_zone (time (NULL), zone);
 
-	d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, ctime(&midnight)));
+	d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, e_ctime(&midnight)));
 
 	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);
 	if (!midnight_refresh_id) {
@@ -471,7 +490,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 
 		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
 		if (!alarm_id) {
-			d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger))));
+			d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, e_ctime(&(instance->trigger))));
 			continue;
 		}
 
@@ -482,7 +501,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		qa->snooze = FALSE;
 
 		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow)));
+		d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), e_ctime(&tnow)));
 	}
 
 	id = e_cal_component_get_id (alarms->comp);
@@ -571,7 +590,8 @@ load_alarms_for_today (ClientAlarms *ca)
 	from = MAX (config_data_get_last_notification_time (ca->client) + 1, day_start);
 
 	day_end = time_day_end_with_zone (now, zone);
-	d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ctime (&from), ctime(&day_end)));
+	d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__,
+		 g_strdup (ctime (&from)), g_strdup (e_ctime(&day_end))));
 	load_alarms (ca, from, day_end);
 }
 
@@ -707,7 +727,7 @@ query_objects_changed_async (struct _query_msg *msg)
 
 	day_end = time_day_end_with_zone (time (NULL), zone);
 
-	d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, ctime(&from), ctime(&day_end)));
+	d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&day_end)));
 
 	for (l = objects; l != NULL; l = l->next) {
 		ECalComponentId *id;
@@ -771,7 +791,7 @@ query_objects_changed_async (struct _query_msg *msg)
 
 			alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
 			if (!alarm_id) {
-				d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&(instance->trigger))));
+				d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&(instance->trigger))));
 				continue;
 			}
 
@@ -869,14 +889,14 @@ create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, gint snooze_mins)
 
 	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);
 	if (!new_id) {
-		d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&t)));
+		d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&t)));
 		return;
 	}
 
 	orig_qa->instance->trigger = t;
 	orig_qa->alarm_id = new_id;
 	orig_qa->snooze = TRUE;
-	d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, ctime(&t)));
+	d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, e_ctime(&t)));
 }
 
 /* Launches a component editor for a component */
@@ -1839,7 +1859,7 @@ alarm_queue_init (gpointer data)
 
 	if (config_data_get_last_notification_time (NULL) == -1) {
 		time_t tmval = time (NULL);
-		d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, ctime(&tmval)));
+		d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, e_ctime(&tmval)));
 		config_data_set_last_notification_time (NULL, tmval);
 	}
 
@@ -2145,7 +2165,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 	from = time_day_begin_with_zone (time (NULL), zone);
 	to = time_day_end_with_zone (time (NULL), zone);
 
-	d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, ctime(&from), ctime(&to)));
+	d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&to)));
 	alarms = e_cal_util_generate_alarms_for_comp (newcomp, from, to, omit,
 					e_cal_resolve_tzid_cb, cqa->parent_client->client, zone);
 
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 14f66a68fb..a4be16bd69 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -152,7 +152,8 @@ setup_timeout (void)
 	now = time (NULL);
 
 	/* Add the time out */
-	d(g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now));
+	d(g_message ("Setting timeout for %d.%2d (from now) %lu %lu",
+		     diff / 60, diff % 60, ar->trigger, now));
 	d(g_message (" %s", ctime (&ar->trigger)));
 	d(g_message (" %s", ctime (&now)));
 	timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 38d5525b24..ea33ddc1ca 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -284,7 +284,7 @@
       <applyto>/apps/evolution/calendar/display/date_navigator_pane_position</applyto>
       <owner>evolution-calendar</owner>
       <type>int</type>
-      <default>150</default>
+      <default>200</default>
       <locale name="C">
         <short>Month view vertical pane position </short>
         <long>Position of the vertical pane, between the calendar lists and the date navigator calendar.</long>
@@ -666,14 +666,14 @@
     </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>
+      <key>/schemas/apps/evolution/calendar/display/show_week_numbers</key>
+      <applyto>/apps/evolution/calendar/display/show_week_numbers</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>
+        <short>Show week numbers in Day View, Work Week View, and Date Navigator</short>
+        <long>Whether to show week numbers in various places in the Calendar.</long>
       </locale>
     </schema>
 
@@ -682,27 +682,13 @@
       <applyto>/apps/evolution/calendar/display/month_scroll_by_week</applyto>
       <owner>evolution-calendar</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Scroll Month View by a week</short>
         <long>Whether to scroll a Month View by a week, not by a month.</long>
       </locale>
     </schema>
 
-    <!-- Date navigator -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/date_navigator/show_week_numbers</key>
-      <applyto>/apps/evolution/calendar/date_navigator/show_week_numbers</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show week numbers in date navigator</short>
-        <long>Whether to show week numbers in the date navigator.</long>
-      </locale>
-    </schema>
-
     <!-- Alarm notification -->
 
     <schema>
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 9afa8dc7e4..568e211acf 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -53,14 +53,11 @@ 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_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/display/show_week_numbers"
 #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"
 
-/* Date navigator settings */
-#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers"
-
 /* Task display settings */
 #define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks"
 #define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks"
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 559d5f879d..914c26c3ec 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -36,6 +36,7 @@
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-util-private.h"
+#include "shell/e-shell-utils.h"
 #include <glib/gi18n.h>
 #include <string.h>
 
@@ -739,16 +740,11 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 		shell_settings, "cal-compress-weekend",
 		widget, "active");
 
-	widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no");
+	widget = e_builder_get_widget (prefs->builder, "show_week_numbers");
 	e_mutual_binding_new (
 		shell_settings, "cal-show-week-numbers",
 		widget, "active");
 
-	widget = e_builder_get_widget (prefs->builder, "dview_show_week_no");
-	e_mutual_binding_new (
-		shell_settings, "cal-day-view-show-week-numbers",
-		widget, "active");
-
 	prefs->month_scroll_by_week = e_builder_get_widget (prefs->builder, "month_scroll_by_week");
 
 	widget = e_builder_get_widget (prefs->builder, "tasks_due_today_color");
@@ -780,16 +776,42 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 	e_mutual_binding_new (
 		shell_settings, "cal-free-busy-template",
 		widget, "text");
-	target = e_cal_config_target_new_prefs (ec, prefs->gconf);
-	e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
-	toplevel = e_config_create_widget ((EConfig *)ec);
-	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 
 	/* date/time format */
 	table = e_builder_get_widget (prefs->builder, "datetime_format_table");
 	e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Ti_me and date:"));
 	e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("_Date only:"));
 
+	/* Hide senseless preferences when running in Express mode */
+	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+					       "label_second_zone",
+					       "hbox_second_zone",
+					       "timezone",
+					       "timezone_label",
+					       "hbox_use_system_timezone",
+					       "hbox_time_divisions",
+					       "show_end_times",
+					       "month_scroll_by_week",
+					       NULL);
+
+	/* HACK:  GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns.
+	 * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General
+	 * preferences page.  However, due to that behavior in GTK+, we get a lot of extra spacing in that
+	 * section.  Since we know that in Express mode we only leave a single row visible, we'll make the
+	 * table's row spacing equal to 0 in that case.
+	 */
+	if (e_shell_get_express_mode (shell)) {
+		widget = e_builder_get_widget (prefs->builder, "time");
+		gtk_table_set_row_spacings (GTK_TABLE (widget), 0);
+	}
+
+	/* Hook up and add the toplevel widget */
+
+	target = e_cal_config_target_new_prefs (ec, prefs->gconf);
+	e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
+	toplevel = e_config_create_widget ((EConfig *)ec);
+	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
+
 	show_config (prefs);
 	/* FIXME: weakref? */
 	setup_changes (prefs);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 14011d8403..1ae585a0e8 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -79,8 +79,6 @@ struct _CalendarPrefsDialog {
 	GtkWidget *time_divisions;
 	GtkWidget *show_end_times;
 	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-	GtkWidget *dview_show_week_no;
 	GtkWidget *month_scroll_by_week;
 	GtkWidget *tasks_hide_completed;
 	GtkWidget *tasks_hide_completed_interval;
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index d4caf1b356..b94803fc43 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -167,7 +167,7 @@
                 <property name="column_spacing">6</property>
                 <property name="row_spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="label63">
+                  <object class="GtkLabel" id="label_second_zone">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Se_cond zone:</property>
@@ -182,7 +182,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox25">
+                  <object class="GtkHBox" id="hbox_second_zone">
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkButton" id="day_second_zone">
@@ -219,25 +219,41 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label11">
+                  <object class="ETimezoneEntry" id="timezone">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Time format:</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="timezone_label"/>
+                    </accessibility>
                   </object>
                   <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="timezone_label">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Time _zone:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">timezone</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox4">
+                  <object class="GtkHBox" id="hbox_use_system_timezone">
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkRadioButton" id="use_12_hour">
-                        <property name="label" translatable="yes">_12 hour (AM/PM)</property>
+                      <object class="GtkCheckButton" id="use-system-tz-check">
+                        <property name="label" translatable="yes">Use s_ystem time zone</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -246,19 +262,14 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="use_24_hour">
-                        <property name="label" translatable="yes">_24 hour</property>
+                      <object class="GtkLabel" id="system-tz-label">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">use_12_hour</property>
+                        <property name="xpad">5</property>
+                        <property name="label">(system/tz)</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -270,34 +281,16 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="ETimezoneEntry" id="timezone">
-                    <property name="visible">True</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="timezone_label"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="timezone_label">
+                  <object class="GtkLabel" id="label_time_format">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Time _zone:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">timezone</property>
+                    <property name="label" translatable="yes">Time format:</property>
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
@@ -305,27 +298,34 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox26">
+                  <object class="GtkHBox" id="hbox_time_format">
                     <property name="visible">True</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="use-system-tz-check">
-                        <property name="label" translatable="yes">Use s_ystem time zone</property>
+                      <object class="GtkRadioButton" id="use_12_hour">
+                        <property name="label" translatable="yes">_12 hour (AM/PM)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="system-tz-label">
+                      <object class="GtkRadioButton" id="use_24_hour">
+                        <property name="label" translatable="yes">_24 hour</property>
                         <property name="visible">True</property>
-                        <property name="xpad">5</property>
-                        <property name="label">(system/tz)</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">use_12_hour</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -338,6 +338,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
@@ -895,7 +896,7 @@
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkHBox" id="hbox10">
+                  <object class="GtkHBox" id="hbox_time_divisions">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
                     <child>
@@ -962,8 +963,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="dnav_show_week_no">
-                    <property name="label" translatable="yes">Show week _numbers in date navigator</property>
+                  <object class="GtkCheckButton" id="show_week_numbers">
+                    <property name="label" translatable="yes">Show week _numbers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -977,21 +978,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="dview_show_week_no">
-                    <property name="label" translatable="yes">Show week n_umber in Day and Work Week View</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkCheckButton" id="month_scroll_by_week">
                     <property name="label" translatable="yes">Sc_roll Month View by a week</property>
                     <property name="visible">True</property>
@@ -1003,7 +989,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">5</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
@@ -1051,12 +1037,9 @@
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkTable" id="table2">
+                  <object class="GtkHBox" id="hbox14">
                     <property name="visible">True</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">6</property>
+                    <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
@@ -1066,57 +1049,59 @@
                         <property name="mnemonic_widget">tasks_due_today_color</property>
                       </object>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label22">
+                      <object class="GtkColorButton" id="tasks_due_today_color">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Overdue tasks:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">tasks_overdue_color</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="title" translatable="yes">Pick a color</property>
+                        <property name="color">#000000000000</property>
                       </object>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkColorButton" id="tasks_due_today_color">
+                      <object class="GtkLabel" id="label22">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="title" translatable="yes">Pick a color</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Overdue tasks:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">tasks_overdue_color</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkColorButton" id="tasks_overdue_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="receives_default">True</property>
                         <property name="title" translatable="yes">Pick a color</property>
+                        <property name="color">#000000000000</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -1441,8 +1426,8 @@
   </object>
   <object class="GtkSizeGroup" id="day_begins_ends_sizegroup">
     <widgets>
-      <widget name="day_end_label"/>
       <widget name="day_start_label"/>
+      <widget name="day_end_label"/>
     </widgets>
   </object>
 </interface>
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 45c08d3ae7..9856bd7c96 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -294,7 +294,9 @@ free_slist_strs (gpointer data)
  * @note The list is just string of emails separated by ';'
  **/
 void
-comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gboolean add)
+comp_editor_manage_new_attendees (ECalComponent *comp,
+                                  EMeetingAttendee *ma,
+                                  gboolean add)
 {
 	const gchar *eml;
 
@@ -306,7 +308,11 @@ comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gbo
 		eml = itip_strip_mailto (eml);
 	g_return_if_fail (eml != NULL);
 
-	g_object_set_data_full (G_OBJECT (comp), "new-attendees", manage_new_attendees (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml, add), free_slist_strs);
+	g_object_set_data_full (
+		G_OBJECT (comp), "new-attendees",
+		manage_new_attendees (
+			g_object_get_data (G_OBJECT (comp), "new-attendees"),
+			eml, add), free_slist_strs);
 }
 
 /**
@@ -349,15 +355,19 @@ comp_editor_have_in_new_attendees (ECalComponent *comp, EMeetingAttendee *ma)
 		eml = itip_strip_mailto (eml);
 	g_return_val_if_fail (eml != NULL, FALSE);
 
-	return comp_editor_have_in_new_attendees_lst (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml);
+	return comp_editor_have_in_new_attendees_lst (
+		g_object_get_data (G_OBJECT (comp), "new-attendees"), eml);
 }
 
 /**
  * comp_editor_have_in_new_attendees_lst:
- * Same as @ref comp_editor_have_in_new_attendees only parameters are direct GSList and string.
+ *
+ * Same as comp_editor_have_in_new_attendees() only parameters are
+ * direct GSList and string.
  **/
 gboolean
-comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, const gchar *eml)
+comp_editor_have_in_new_attendees_lst (const GSList *new_attendees,
+                                       const gchar *eml)
 {
 	const GSList *l;
 
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index d3230051e3..6eeb8c5410 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -32,6 +32,8 @@
 void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp);
 void comp_editor_free_dates (CompEditorPageDates *dates);
 
+void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label);
+
 GtkWidget *	comp_editor_new_date_edit	(gboolean show_date,
 						 gboolean show_time,
 						 gboolean make_time_insensitive);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 1ff43d34f1..010dd1cbf6 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -65,8 +65,6 @@
 
 #define d(x)
 
-static gboolean comp_lite = FALSE;
-
 /* Private part of the CompEditor structure */
 struct _CompEditorPrivate {
 
@@ -163,10 +161,16 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='save'/>"
-"    <toolitem action='print'/>"
-"    <toolitem action='close'/>"
+"    <toolitem action='save'/>\n"
+"#if !EXPRESS\n"
+"    <toolitem action='print'/>\n"
+"#endif\n"
 "    <separator/>"
+"    <placeholder name='content'/>\n"
+"#if EXPRESS\n"
+"    <separator expand='true'/>\n"
+"    <toolitem action='close'/>\n"
+"#endif\n"
 "  </toolbar>"
 "</ui>";
 
@@ -411,7 +415,7 @@ save_comp (CompEditor *editor)
 	clone = e_cal_component_clone (priv->comp);
 	comp_editor_copy_new_attendees (clone, priv->comp);
 	for (l = priv->pages; l != NULL; l = l->next) {
-		if (!comp_editor_page_fill_component (l->data, clone)) {
+		if (IS_COMP_EDITOR_PAGE(l->data) && !comp_editor_page_fill_component (l->data, clone)) {
 			g_object_unref (clone);
 			g_hash_table_destroy (timezones);
 			comp_editor_show_page (editor, COMP_EDITOR_PAGE (l->data));
@@ -419,7 +423,8 @@ save_comp (CompEditor *editor)
 		}
 
 		/* retrieve all timezones */
-		comp_editor_page_fill_timezones (l->data, timezones);
+		if (IS_COMP_EDITOR_PAGE(l->data))
+			comp_editor_page_fill_timezones (l->data, timezones);
 	}
 
 	/* If we are not the organizer, we don't update the sequence number */
@@ -1588,6 +1593,9 @@ comp_editor_init (CompEditor *editor)
 	gint n_targets;
 	GError *error = NULL;
 
+	/* FIXME Shell should be passed in. */
+	shell = e_shell_get_default ();
+
 	editor->priv = priv = COMP_EDITOR_GET_PRIVATE (editor);
 
 	g_object_weak_ref (
@@ -1611,9 +1619,9 @@ comp_editor_init (CompEditor *editor)
 	priv->is_group_item = FALSE;
 
 	priv->ui_manager = e_ui_manager_new ();
+	e_ui_manager_set_express_mode (E_UI_MANAGER (priv->ui_manager),
+				       e_shell_get_express_mode (shell));
 
-	if (comp_lite)
-		gtk_window_set_default_size ((GtkWindow *) editor, 800, 450);
 	gtk_window_add_accel_group (
 		GTK_WINDOW (editor),
 		gtk_ui_manager_get_accel_group (priv->ui_manager));
@@ -1695,7 +1703,7 @@ comp_editor_init (CompEditor *editor)
 	action = comp_editor_get_action (editor, "save");
 	gtk_action_set_sensitive (action, FALSE);
 
-	gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error);
+	e_ui_manager_add_ui_from_string (E_UI_MANAGER (priv->ui_manager), ui, &error);
 	if (error != NULL) {
 		g_warning ("%s: %s", G_STRFUNC, error->message);
 		g_error_free (error);
@@ -1711,24 +1719,25 @@ comp_editor_init (CompEditor *editor)
 
 	container = widget;
 
-	widget = comp_editor_get_managed_widget (editor, "/main-menu");
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	gtk_widget_show (widget);
-
-	if (!comp_lite) {
-		widget = comp_editor_get_managed_widget (editor, "/main-toolbar");
+	if (!e_shell_get_express_mode (shell)) {
+		widget = comp_editor_get_managed_widget (editor, "/main-menu");
 		gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-		gtk_widget_show (widget);
+		gtk_widget_set_visible (widget, !e_shell_get_meego_mode (shell));
 	}
 
+	widget = comp_editor_get_managed_widget (editor, "/main-toolbar");
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
 	widget = e_attachment_paned_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	priv->attachment_view = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	if (comp_lite) {
-		GtkWidget *tmp, *tmp1, *tmp_box, *cont;
+	if (e_shell_get_express_mode (shell)) {
+		/*GtkWidget *tmp, *tmp1, *tmp_box, */
+		GtkWidget *cont;
 		GtkWidget *combo;
 
 		e_attachment_paned_set_expanded (E_ATTACHMENT_PANED (widget), TRUE);
@@ -1739,7 +1748,7 @@ comp_editor_init (CompEditor *editor)
 		gtk_widget_hide (combo);
 		cont = e_attachment_paned_get_controls_container (
 			E_ATTACHMENT_PANED (widget));
-
+		/*
 		tmp_box = gtk_hbox_new (FALSE, 0);
 		tmp = gtk_hbox_new (FALSE, 0);
 		tmp1 = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON);
@@ -1759,12 +1768,12 @@ comp_editor_init (CompEditor *editor)
 
 		gtk_widget_show(tmp_box);
 		gtk_box_pack_end (GTK_BOX (cont), tmp_box, FALSE, FALSE, 4);
-
+		*/
 	}
 	container = e_attachment_paned_get_content_area (
 		E_ATTACHMENT_PANED (priv->attachment_view));
 
-	if (comp_lite) {
+	if (e_shell_get_express_mode (shell)) {
 		scroll = gtk_scrolled_window_new (NULL, NULL);
 		gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 		gtk_widget_show(scroll);
@@ -1772,14 +1781,14 @@ comp_editor_init (CompEditor *editor)
 	}
 
 	widget = gtk_notebook_new ();
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
-	if (!comp_lite)
+	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), e_shell_get_express_mode (shell));
+	if (!e_shell_get_express_mode (shell))
 		gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	else
 		gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) scroll, widget);
 	priv->notebook = GTK_NOTEBOOK (widget);
 	gtk_widget_show (widget);
-	if (comp_lite)
+	if (e_shell_get_express_mode (shell))
 		gtk_widget_set_size_request (scroll, 300, -1);
 	comp_editor_setup_recent_menu (editor);
 
@@ -1821,9 +1830,8 @@ comp_editor_init (CompEditor *editor)
 
 	comp_editor_bind_gconf (editor);
 
-	/* FIXME Shell should be passed in. */
-	shell = e_shell_get_default ();
 	e_shell_watch_window (shell, GTK_WINDOW (editor));
+	e_shell_adapt_window_size (shell, GTK_WINDOW (editor));
 }
 
 static gboolean
@@ -2263,6 +2271,51 @@ page_unmapped_cb (GtkWidget *page_widget,
 }
 
 /**
+ * comp_editor_append_widget:
+ * @editor: A component editor
+ * @page: A component editor page
+ * @label: Label of the page. Should be NULL if add is FALSE.
+ * @add: Add's the page into the notebook if TRUE
+ *
+ * Appends a page to the notebook if add is TRUE else
+ * just adds it to the list of pages.
+ **/
+void
+comp_editor_append_widget (CompEditor *editor,
+			 GtkWidget *page,
+			 const gchar *label,
+			 gboolean add)
+{
+	CompEditorPrivate *priv;
+	GtkWidget *label_widget = NULL;
+
+	g_return_if_fail (IS_COMP_EDITOR (editor));
+
+	priv = editor->priv;
+
+	g_object_ref (page);
+
+	if (label)
+		label_widget = gtk_label_new_with_mnemonic (label);
+
+	priv->pages = g_list_append (priv->pages, page);
+
+	if (add)
+		gtk_notebook_append_page (priv->notebook, page, label_widget);
+
+	/* Listen for when the page is mapped/unmapped so we can
+	   install/uninstall the appropriate GtkAccelGroup.
+	g_signal_connect (
+		page, "map",
+		G_CALLBACK (page_mapped_cb), page);
+	g_signal_connect(
+		page, "unmap",
+		G_CALLBACK (page_unmapped_cb), page);
+		*/
+
+}
+
+/**
  * comp_editor_append_page:
  * @editor: A component editor
  * @page: A component editor page
@@ -2553,8 +2606,10 @@ fill_widgets (CompEditor *editor)
 	g_signal_handlers_block_by_func (
 		action, G_CALLBACK (action_classification_cb), editor);
 
-	for (iter = priv->pages; iter != NULL; iter = iter->next)
-		comp_editor_page_fill_widgets (iter->data, priv->comp);
+	for (iter = priv->pages; iter != NULL; iter = iter->next) {
+		if (IS_COMP_EDITOR_PAGE(iter->data))
+			comp_editor_page_fill_widgets (iter->data, priv->comp);
+	}
 
 	g_signal_handlers_unblock_by_func (
 		action, G_CALLBACK (action_classification_cb), editor);
@@ -2797,8 +2852,10 @@ comp_editor_get_current_comp (CompEditor *editor, gboolean *correct)
 	comp = e_cal_component_clone (priv->comp);
 	comp_editor_copy_new_attendees (comp, priv->comp);
 	if (priv->changed) {
-		for (l = priv->pages; l != NULL; l = l->next)
-			all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok;
+		for (l = priv->pages; l != NULL; l = l->next) {
+			if (IS_COMP_EDITOR_PAGE(l->data))
+				all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok;
+		}
 	}
 
 	if (correct)
@@ -2966,7 +3023,7 @@ page_dates_changed_cb (CompEditor *editor,
 	GList *l;
 
 	for (l = priv->pages; l != NULL; l = l->next)
-		if (page != (CompEditorPage *) l->data)
+		if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE(l->data))
 			comp_editor_page_set_dates (l->data, dates);
 
 	if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) {
@@ -3023,14 +3080,3 @@ obj_removed_cb (ECal *client,
 		close_dialog (editor);
 }
 
-gboolean
-comp_editor_get_lite ()
-{
-	return comp_lite;
-}
-
-void
-comp_editor_set_lite (gboolean status)
-{
-	comp_lite = status;
-}
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 4871beae8f..bd26ce8b66 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -127,6 +127,11 @@ void		comp_editor_append_page		(CompEditor *editor,
 						 CompEditorPage *page,
 						 const gchar *label,
 						 gboolean add);
+void		comp_editor_append_widget	(CompEditor *editor,
+						 GtkWidget  *page,
+						 const gchar *label,
+						 gboolean add);
+
 void		comp_editor_remove_page		(CompEditor *editor,
 						 CompEditorPage *page);
 void		comp_editor_show_page		(CompEditor *editor,
@@ -165,9 +170,6 @@ GtkWidget *	comp_editor_get_managed_widget	(CompEditor *editor,
 						 const gchar *widget_path);
 CompEditor *	comp_editor_find_instance	(const gchar *uid);
 
-void		comp_editor_set_lite		(gboolean status);
-gboolean	comp_editor_get_lite		(void);
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 9b8c8c4fed..f1c568849b 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -32,18 +32,19 @@
 #include "common/authentication.h"
 
 typedef struct {
+	GtkWindow *parent;
 	ESource *orig_source;
 	ECalSourceType obj_type;
 	ESource *selected_source;
 } CopySourceDialogData;
 
 static void
-show_error (GtkWindow *parent, const gchar *msg)
+show_error (CopySourceDialogData *csdd, const gchar *msg)
 {
 	GtkWidget *dialog;
 
 	dialog = gtk_message_dialog_new (
-		parent, 0, GTK_MESSAGE_ERROR,
+		csdd->parent, 0, GTK_MESSAGE_ERROR,
 		GTK_BUTTONS_CLOSE, "%s", msg);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -88,7 +89,7 @@ copy_source (CopySourceDialogData *csdd)
 	/* open the source */
 	source_client = e_auth_new_cal_from_source (csdd->orig_source, csdd->obj_type);
 	if (!e_cal_open (source_client, TRUE, NULL)) {
-		show_error (NULL, _("Could not open source"));
+		show_error (csdd, _("Could not open source"));
 		g_object_unref (source_client);
 		return FALSE;
 	}
@@ -96,7 +97,7 @@ copy_source (CopySourceDialogData *csdd)
 	/* open the destination */
 	dest_client = e_auth_new_cal_from_source (csdd->selected_source, csdd->obj_type);
 	if (!e_cal_open (dest_client, FALSE, NULL)) {
-		show_error (NULL, _("Could not open destination"));
+		show_error (csdd, _("Could not open destination"));
 		g_object_unref (dest_client);
 		g_object_unref (source_client);
 		return FALSE;
@@ -105,7 +106,7 @@ copy_source (CopySourceDialogData *csdd)
 	/* check if the destination is read only */
 	e_cal_is_read_only (dest_client, &read_only, NULL);
 	if (read_only) {
-		show_error (NULL, _("Destination is read only"));
+		show_error (csdd, _("Destination is read only"));
 	} else {
 		if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) {
 			GList *l;
@@ -135,7 +136,7 @@ copy_source (CopySourceDialogData *csdd)
 						g_free (uid);
 					} else {
 						if (error) {
-							show_error (NULL, error->message);
+							show_error (csdd, error->message);
 							g_error_free (error);
 						}
 						break;
@@ -168,6 +169,7 @@ copy_source_dialog (GtkWindow *parent, ESource *source, ECalSourceType obj_type)
 
 	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
 
+	csdd.parent = parent;
 	csdd.orig_source = source;
 	csdd.selected_source = NULL;
 	csdd.obj_type = obj_type;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 90fc910708..262751fa86 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -36,6 +36,7 @@
 #include <e-util/e-binding.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
+#include <e-util/e-ui-manager.h>
 
 #include "event-page.h"
 #include "recurrence-page.h"
@@ -89,11 +90,19 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='alarms'/>"
-"    <toolitem action='show-time-busy'/>"
-"    <toolitem action='recurrence'/>"
-"    <toolitem action='all-day-event'/>"
-"    <toolitem action='free-busy'/>"
+"    <placeholder name='content'>\n"
+"#if !EXPRESS\n"
+"      <toolitem action='alarms'/>\n"
+"#endif\n"
+"      <toolitem action='show-time-busy'/>\n"
+"#if !EXPRESS\n"
+"      <toolitem action='recurrence'/>\n"
+"#endif\n"
+"      <toolitem action='all-day-event'/>\n"
+"#if !EXPRESS\n"
+"      <toolitem action='free-busy'/>\n"
+"#endif\n"
+"    </placeholder>"
 "  </toolbar>"
 "</ui>";
 
@@ -280,6 +289,8 @@ event_editor_constructor (GType type,
 	GtkWidget *content_area;
 	ECal *client;
 	gboolean is_meeting;
+	GtkWidget *alarm_page;
+	GtkWidget *attendee_page;
 
 	/* Chain up to parent's constructor() method. */
 	object = G_OBJECT_CLASS (event_editor_parent_class)->constructor (
@@ -316,11 +327,34 @@ event_editor_constructor (GType type,
 
 	priv->recur_page = recurrence_page_new (editor);
 	page = COMP_EDITOR_PAGE (priv->recur_page);
-	gtk_container_add (
-		GTK_CONTAINER (content_area),
-		comp_editor_page_get_widget (page));
-	gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window)));
-	comp_editor_append_page (editor, page, NULL, FALSE);
+	if (!e_shell_get_express_mode(e_shell_get_default())) {
+		gtk_container_add (
+			GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)),
+			comp_editor_page_get_widget (page));
+		gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window)));
+		comp_editor_append_page (editor, page, NULL, FALSE);
+	} else {
+		comp_editor_append_page (editor, page, _("_Recurrence"), TRUE);
+	}
+
+	if (e_shell_get_express_mode(e_shell_get_default())) {
+		ENameSelector *name_selector;
+
+		priv->sched_page = schedule_page_new (priv->model, editor);
+		page = COMP_EDITOR_PAGE (priv->sched_page);
+
+		name_selector = event_page_get_name_selector (priv->event_page);
+		schedule_page_set_name_selector (priv->sched_page, name_selector);
+
+		comp_editor_append_page (editor, page, _("_Free/Busy"), TRUE);
+		schedule_page_update_free_busy (priv->sched_page);
+
+		/* Alarm page */
+		alarm_page = event_page_get_alarm_page (priv->event_page);
+		comp_editor_append_widget (editor, alarm_page, _("_Alarm"), TRUE);
+		g_object_unref(alarm_page);
+
+	}
 
 	if (is_meeting) {
 
@@ -337,6 +371,12 @@ event_editor_constructor (GType type,
 
 		event_page_set_meeting (priv->event_page, TRUE);
 		priv->meeting_shown=TRUE;
+
+		if (e_shell_get_express_mode(e_shell_get_default())) {
+			attendee_page = event_page_get_attendee_page (priv->event_page);
+			comp_editor_append_widget (editor, attendee_page, _("Attendee_s"), TRUE);
+			g_object_unref(attendee_page);
+		}
 	}
 
 	return object;
@@ -513,7 +553,7 @@ event_editor_init (EventEditor *ee)
 		G_N_ELEMENTS (meeting_entries), ee);
 
 	ui_manager = comp_editor_get_ui_manager (editor);
-	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+	e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error);
 
 	id = "org.gnome.evolution.event-editor";
 	e_plugin_ui_register_manager (ui_manager, id, ee);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index cf1bc620ea..1dfabb7597 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -828,7 +828,8 @@ sensitize_widgets (EventPage *epage)
 	} else {
 		gtk_widget_show (priv->calendar_label);
 		gtk_widget_show (priv->list_box);
-		gtk_widget_show (priv->attendee_box);
+		if (!e_shell_get_express_mode(e_shell_get_default()))
+			gtk_widget_show (priv->attendee_box);
 		gtk_widget_show (priv->organizer);
 		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:"));
 	}
@@ -2199,7 +2200,7 @@ get_widgets (EventPage *epage)
 
 	priv->invite = GW ("invite");
 	priv->invite_label = GW ("invite-label");
-	if (comp_editor_get_lite ())
+	if (e_shell_get_express_mode (e_shell_get_default ()))
 		gtk_widget_hide (priv->invite);
 	else
 		gtk_widget_hide (priv->invite_label);
@@ -2239,8 +2240,6 @@ get_widgets (EventPage *epage)
 
 	priv->source_selector = GW ("source");
 
-#undef GW
-
 	e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources");
 
 	completion = e_category_completion_new ();
@@ -3255,3 +3254,42 @@ event_page_remove_all_attendees (EventPage *epage)
 	e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view));
 }
 
+GtkWidget *
+event_page_get_alarm_page (EventPage *epage)
+{
+	EventPagePrivate *priv;
+	GtkWidget *alarm_page, *tmp;
+
+	g_return_val_if_fail (epage != NULL, NULL);
+	g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL);
+
+	priv = epage->priv;
+
+	tmp = GW("dialog-vbox1");
+	alarm_page = GW("vbox2");
+	g_object_ref(alarm_page);
+	gtk_container_remove ((GtkContainer *)tmp, alarm_page);
+
+	return alarm_page;
+}
+
+GtkWidget *
+event_page_get_attendee_page (EventPage *epage)
+{
+	EventPagePrivate *priv;
+	GtkWidget *apage;
+
+	g_return_val_if_fail (epage != NULL, NULL);
+	g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL);
+
+	priv = epage->priv;
+
+	apage = priv->list_box;
+	g_object_ref(apage);
+	gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage);
+	gtk_widget_hide (priv->attendee_box);
+
+	return apage;
+}
+
+#undef GW
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index ab43c0f7ba..afa191e9c1 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -109,6 +109,8 @@ ENameSelector *	event_page_get_name_selector	(EventPage *epage);
 void		event_page_add_attendee		(EventPage *epage,
 						 EMeetingAttendee *attendee);
 void		event_page_remove_all_attendees (EventPage *epage);
+GtkWidget *	event_page_get_alarm_page	(EventPage *epage);
+GtkWidget *	event_page_get_attendee_page	(EventPage *epage);
 
 G_END_DECLS
 
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 1733cf3a96..46a2f95d0e 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -81,8 +81,10 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='view-time-zone'/>"
-"    <toolitem action='option-status'/>"
+"    <placeholder name='content'>"
+"      <toolitem action='view-time-zone'/>"
+"      <toolitem action='option-status'/>"
+"    </placeholder>"
 "  </toolbar>"
 "</ui>";
 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index ec91442fec..e745d33810 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -138,6 +138,7 @@ enum {
 	CAL_VIEW_PROGRESS,
 	CAL_VIEW_DONE,
 	STATUS_MESSAGE,
+	TIMEZONE_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -411,6 +412,16 @@ e_cal_model_class_init (ECalModelClass *class)
 		e_marshal_VOID__STRING_DOUBLE,
 		G_TYPE_NONE, 2,
 		G_TYPE_STRING, G_TYPE_DOUBLE);
+	signals[TIMEZONE_CHANGED] = g_signal_new (
+		"timezone-changed",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST,
+		G_STRUCT_OFFSET (ECalModelClass, timezone_changed),
+		NULL, NULL,
+		e_marshal_VOID__POINTER_POINTER,
+		G_TYPE_NONE, 2,
+		G_TYPE_POINTER,
+		G_TYPE_POINTER);
 }
 
 static void
@@ -1365,12 +1376,14 @@ void
 e_cal_model_set_timezone (ECalModel *model,
                           icaltimezone *zone)
 {
+	icaltimezone *old_zone;
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 
 	if (model->priv->zone == zone)
 		return;
 
 	e_table_model_pre_change (E_TABLE_MODEL (model));
+	old_zone = model->priv->zone;
 	model->priv->zone = zone;
 
 	/* the timezone affects the times shown for date fields,
@@ -1378,6 +1391,8 @@ e_cal_model_set_timezone (ECalModel *model,
 	e_table_model_changed (E_TABLE_MODEL (model));
 
 	g_object_notify (G_OBJECT (model), "timezone");
+	g_signal_emit (G_OBJECT (model), signals[TIMEZONE_CHANGED], 0,
+		       old_zone, zone);
 }
 
 void
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index ee914eef67..29c3335310 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -166,6 +166,9 @@ struct _ECalModelClass {
 	void		(*status_message)	(ECalModel *model,
 						 const gchar *message,
 						 gdouble percent);
+	void		(*timezone_changed)	(ECalModel *model,
+						 icaltimezone *old_zone,
+						 icaltimezone *new_zone);
 };
 
 typedef time_t (*ECalModelDefaultTimeFunc) (ECalModel *model, gpointer user_data);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 77d8fd2051..63088350c2 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -895,6 +895,8 @@ e_calendar_view_init (ECalendarView *calendar_view)
 	target_list = gtk_target_list_new (NULL, 0);
 	e_target_list_add_calendar_targets (target_list, 0);
 	calendar_view->priv->paste_target_list = target_list;
+
+	e_extensible_load_extensions (E_EXTENSIBLE (calendar_view));
 }
 
 static void
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index a171d94d94..010f5bdb32 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -951,12 +951,13 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 }
 
 static void
-timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
+timezone_changed_cb (ECalModel *cal_model, icaltimezone *old_zone,
 		     icaltimezone *new_zone, gpointer user_data)
 {
 	struct icaltimetype tt;
 	time_t lower;
-	EDayView *day_view = (EDayView *) cal_view;
+	EDayView *day_view = (EDayView *) user_data;
+	ECalendarView *cal_view = (ECalendarView *) day_view;
 
 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
 
@@ -1307,10 +1308,6 @@ e_day_view_init (EDayView *day_view)
 		GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
 
 	e_drag_dest_add_calendar_targets (day_view->main_canvas);
-
-	/* connect to ECalendarView's signals */
-	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
-			  G_CALLBACK (timezone_changed_cb), NULL);
 }
 
 static void
@@ -1327,6 +1324,8 @@ init_model (EDayView *day_view, ECalModel *model)
 			  G_CALLBACK (model_rows_inserted_cb), day_view);
 	g_signal_connect (G_OBJECT (model), "comps_deleted",
 			  G_CALLBACK (model_comps_deleted_cb), day_view);
+	g_signal_connect (G_OBJECT (model), "timezone_changed",
+			  G_CALLBACK (timezone_changed_cb), day_view);
 }
 
 /* Turn off the background of the canvas windows. This reduces flicker
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 1511482b6b..4c19b5a3aa 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -1471,6 +1471,10 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row,
 	GdkCursor *cursor;
 	GdkWindow *window;
 
+	/* nothing to refresh, lets not leak a busy cursor */
+	if (e_meeting_store_count_actual_attendees (mts->model) <= 0)
+		return;
+
 	start = mts->meeting_start_time;
 	g_date_subtract_days (&start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE);
 	start.hour = 0;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 173b79bbd5..accafd9ac2 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -428,11 +428,12 @@ week_view_time_range_changed_cb (EWeekView *week_view,
 }
 
 static void
-timezone_changed_cb (ECalendarView *cal_view,
+timezone_changed_cb (ECalModel *cal_model,
                      icaltimezone *old_zone,
                      icaltimezone *new_zone,
                      gpointer user_data)
 {
+	ECalendarView *cal_view = (ECalendarView *) user_data;
 	struct icaltimetype tt = icaltime_null_time ();
 	time_t lower;
 	EWeekView *week_view = (EWeekView *) cal_view;
@@ -828,10 +829,6 @@ e_week_view_init (EWeekView *week_view)
 	week_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
 	week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
 	week_view->last_cursor_set = NULL;
-
-		/* connect to ECalendarView's signals */
-	g_signal_connect (G_OBJECT (week_view), "timezone_changed",
-			  G_CALLBACK (timezone_changed_cb), NULL);
 }
 
 /**
@@ -843,9 +840,14 @@ e_week_view_init (EWeekView *week_view)
 ECalendarView *
 e_week_view_new (ECalModel *model)
 {
+	ECalendarView *view;
 	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
 
-	return g_object_new (E_TYPE_WEEK_VIEW, "model", model, NULL);
+	view = g_object_new (E_TYPE_WEEK_VIEW, "model", model, NULL);
+
+	g_signal_connect (G_OBJECT (model), "timezone_changed",
+			  G_CALLBACK (timezone_changed_cb), view);
+	return view;
 }
 
 static void
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f7ab89bec0..a24dfa26ed 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1425,7 +1425,7 @@ gnome_calendar_init (GnomeCalendar *gcal)
 	priv->todo_update_lock = g_mutex_new ();
 	priv->dn_query_lock = g_mutex_new ();
 
-	priv->current_view_type = GNOME_CAL_DAY_VIEW;
+	priv->current_view_type = GNOME_CAL_WORK_WEEK_VIEW;
 	priv->range_selected = FALSE;
 	priv->lview_select_daten_range = TRUE;
 
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 6e2299b308..54401412e2 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -26,14 +26,31 @@
 
 #include <glib/gi18n.h>
 #include "mail-account-view.h"
+#include <libedataserverui/e-passwords.h>
+#include <libedataserver/e-source-group.h>
+#include <libedataserver/e-source-list.h>
 #include <libedataserver/e-account-list.h>
 #include "mail-view.h"
 #include "e-util/e-config.h"
 #include "mail/mail-config.h"
+#include "mail/mail-session.h"
 #include "mail-guess-servers.h"
 
 struct _MailAccountViewPrivate {
 	GtkWidget *tab_str;
+
+	GtkWidget *calendar;
+	GtkWidget *gcontacts;
+	GtkWidget *gmail_info_label;
+
+	gboolean is_gmail;
+	gboolean is_yahoo;
+	gboolean do_gcontacts;
+	gboolean do_calendar;
+
+	gchar *username;
+
+	GtkWidget *yahoo_cal_entry;
 };
 
 G_DEFINE_TYPE (MailAccountView, mail_account_view, GTK_TYPE_VBOX)
@@ -47,6 +64,7 @@ enum {
 	ERROR_NO_FULLNAME = 1,
 	ERROR_NO_EMAIL = 2,
 	ERROR_INVALID_EMAIL = 3,
+	ERROR_NO_PASSWORD = 4,
 };
 
 struct _dialog_errors {
@@ -56,6 +74,7 @@ struct _dialog_errors {
 	{ ERROR_NO_FULLNAME, N_("Please enter your full name.") },
 	{ ERROR_NO_EMAIL, N_("Please enter your email address.") },
 	{ ERROR_INVALID_EMAIL, N_("The email address you have entered is invalid.") },
+	{ ERROR_NO_PASSWORD, N_("Please enter your password.") }
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
@@ -64,12 +83,17 @@ mail_account_view_init (MailAccountView  *shell)
 {
 	shell->priv = g_new0(MailAccountViewPrivate, 1);
 
+	shell->priv->is_gmail = FALSE;
+	shell->priv->is_yahoo = FALSE;
+	shell->priv->username = NULL;
 }
 
 static void
 mail_account_view_finalize (GObject *object)
 {
-	/*MailAccountView *shell = (MailAccountView *)object;*/
+	MailAccountView *shell = (MailAccountView *)object;
+
+	g_free(shell->priv->username);
 
 	G_OBJECT_CLASS (mail_account_view_parent_class)->finalize (object);
 }
@@ -136,11 +160,17 @@ validate_identity (MailAccountView *view)
 	gchar *user = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME);
 	gchar *email = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS);
 	gchar *tmp;
+	const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password);
 
 	if (!user || !*user)
 		return ERROR_NO_FULLNAME;
 	if (!email || !*email)
 		return ERROR_NO_EMAIL;
+	if (view->original) /* We don't query/store pwd on edit. */
+		return 0;
+	if (!pwd || !*pwd)
+		return ERROR_NO_PASSWORD;
+
 	tmp = strchr(email, '@');
 	if (!tmp || tmp[1] == 0)
 		return ERROR_INVALID_EMAIL;
@@ -162,6 +192,258 @@ save_account (MailAccountView *view)
 #define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 12); gtk_widget_show(box);
 #define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box);
 
+#define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events"
+#define GMAIL_CALENDAR_LOCATION "://www.google.com/calendar/feeds/"
+#define CALENDAR_DEFAULT_PATH "/private/full"
+#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars"
+#define YAHOO_CALENDAR_LOCATION "%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s"
+static gboolean
+is_email (const gchar *address)
+{
+	/* This is supposed to check if the address's domain could be
+           an FQDN but alas, it's not worth the pain and suffering. */
+	const gchar *at;
+
+	at = strchr (address, '@');
+	/* make sure we have an '@' and that it's not the first or last gchar */
+	if (!at || at == address || *(at + 1) == '\0')
+		return FALSE;
+
+	return TRUE;
+}
+
+static gchar *
+sanitize_user_mail (const gchar *user)
+{
+	if (!user)
+		return NULL;
+
+	if (strstr (user, "%40") != NULL) {
+		return g_strdup (user);
+	} else if (!is_email (user)) {
+		return g_strconcat (user, "%40gmail.com", NULL);
+	} else {
+		gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2));
+		gchar *at = strchr (user, '@');
+
+		strncpy (tmp, user, at - user);
+		strcat (tmp, "%40");
+		strcat (tmp, at + 1);
+
+		return tmp;
+	}
+}
+
+static void
+setup_yahoo_account (MailAccountView *mav)
+{
+	GConfClient *gconf = gconf_client_get_default ();
+
+	mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts);
+	mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar);
+
+	if (mav->priv->do_calendar) {
+		ESourceList *slist;
+		ESourceGroup *sgrp;
+		ESource *calendar;
+		gchar *sanitize_uname, *abs_uri, *rel_uri;
+		GSList *ids, *temp;
+		const gchar *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS);
+
+		slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
+		sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://");
+		if (!sgrp) {
+			sgrp = e_source_list_ensure_group (slist, _("CalDAV"), "caldav://", TRUE);
+		}
+
+		printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp);
+
+		/* FIXME: Not sure if we should localize 'Calendar' */
+		calendar = e_source_new ("Yahoo", "");
+		e_source_set_property (calendar, "ssl", "1");
+		e_source_set_property (calendar, "refresh", "30");
+		e_source_set_property (calendar, "refresh-type", "0");
+		e_source_set_property (calendar, "auth", "1");
+		e_source_set_property (calendar, "offline_sync", "1");
+		e_source_set_property (calendar, "username", email);
+		e_source_set_property (calendar, "default", "true");
+		e_source_set_property (calendar, "alarm", "true");
+
+		e_source_set_readonly (calendar, FALSE);
+
+		sanitize_uname = sanitize_user_mail (email);
+
+		abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email,  gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry));
+		e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password));
+		e_passwords_remember_password ("Calendar", abs_uri);
+
+		rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry));
+		e_source_set_relative_uri (calendar, rel_uri);
+
+		e_source_group_add_source (sgrp, calendar, -1);
+		e_source_list_sync (slist, NULL);
+
+		ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
+		ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar)));
+		gconf_client_set_list (gconf,  SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL);
+		temp = ids;
+
+		for (; temp != NULL; temp = g_slist_next (temp))
+			g_free (temp->data);
+		g_slist_free (ids);
+
+		g_free(abs_uri);
+		g_free(rel_uri);
+		g_free(sanitize_uname);
+		g_object_unref(slist);
+		g_object_unref(sgrp);
+		g_object_unref(calendar);
+	} else
+		printf("Not setting up Yahoo Calendar\n");
+
+	if (mav->priv->do_gcontacts) {
+		ESourceList *slist;
+		ESourceGroup *sgrp;
+		ESource *abook;
+		gchar *rel_uri;;
+
+		slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" );
+
+		sgrp = e_source_list_peek_group_by_base_uri (slist, "google://");
+
+		/* FIXME: Not sure if we should localize 'Contacts' */
+		abook = e_source_new ("Contacts", "");
+		e_source_set_property (abook, "default", "true");
+		e_source_set_property (abook, "offline_sync", "1");
+		e_source_set_property (abook, "auth", "plain/password");
+		e_source_set_property (abook, "use-ssl", "true");
+		e_source_set_property (abook, "remember_password", "true");
+		e_source_set_property (abook, "refresh-interval", "86400");
+		e_source_set_property (abook, "completion", "true");
+		e_source_set_property (abook, "username", mav->priv->username);
+		e_source_set_relative_uri (abook, mav->priv->username);
+
+		rel_uri = g_strdup_printf("google://%s/", mav->priv->username);
+		e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password));
+		e_passwords_remember_password ("Addressbook", rel_uri);
+		e_source_group_add_source (sgrp, abook, -1);
+		e_source_list_sync (slist, NULL);
+
+		g_free(rel_uri);
+		g_object_unref(slist);
+		g_object_unref(sgrp);
+		g_object_unref(abook);
+
+	}
+
+	g_object_unref (gconf);
+}
+
+static void
+setup_google_accounts (MailAccountView *mav)
+{
+	GConfClient *gconf = gconf_client_get_default ();
+
+	mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts);
+	mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar);
+
+	if (mav->priv->do_calendar) {
+		ESourceList *slist;
+		ESourceGroup *sgrp;
+		ESource *calendar;
+		gchar *sanitize_uname, *abs_uri, *rel_uri;
+		GSList *ids, *temp;
+
+		slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
+		sgrp = e_source_list_peek_group_by_base_uri (slist, "google://");
+		if (!sgrp) {
+			sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE);
+		}
+
+		printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp);
+
+		/* FIXME: Not sure if we should localize 'Calendar' */
+		calendar = e_source_new ("Calendar", "");
+		e_source_set_property (calendar, "ssl", "1");
+		e_source_set_property (calendar, "refresh", "30");
+		e_source_set_property (calendar, "auth", "1");
+		e_source_set_property (calendar, "offline_sync", "1");
+		e_source_set_property (calendar, "username", mav->priv->username);
+		e_source_set_property (calendar, "setup-username", mav->priv->username);
+		e_source_set_property (calendar, "default", "true");
+		e_source_set_readonly (calendar, FALSE);
+
+		sanitize_uname = sanitize_user_mail (mav->priv->username);
+
+		abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username);
+		e_source_set_absolute_uri (calendar, abs_uri);
+
+		e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password));
+		e_passwords_remember_password ("Calendar", abs_uri);
+		rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL);
+		e_source_set_relative_uri (calendar, rel_uri);
+
+		e_source_group_add_source (sgrp, calendar, -1);
+		e_source_list_sync (slist, NULL);
+
+		ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL);
+		ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar)));
+		gconf_client_set_list (gconf,  SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL);
+		temp = ids;
+
+		for (; temp != NULL; temp = g_slist_next (temp))
+			g_free (temp->data);
+		g_slist_free (ids);
+
+		g_free(abs_uri);
+		g_free(rel_uri);
+		g_free(sanitize_uname);
+		g_object_unref(slist);
+		g_object_unref(sgrp);
+		g_object_unref(calendar);
+	} else
+		printf("Not setting up Google Calendar\n");
+
+	if (mav->priv->do_gcontacts) {
+		ESourceList *slist;
+		ESourceGroup *sgrp;
+		ESource *abook;
+		gchar *rel_uri;;
+
+		slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" );
+
+		sgrp = e_source_list_peek_group_by_base_uri (slist, "google://");
+
+		/* FIXME: Not sure if we should localize 'Contacts' */
+		abook = e_source_new ("Contacts", "");
+		e_source_set_property (abook, "default", "true");
+		e_source_set_property (abook, "offline_sync", "1");
+		e_source_set_property (abook, "auth", "plain/password");
+		e_source_set_property (abook, "use-ssl", "true");
+		e_source_set_property (abook, "remember_password", "true");
+		e_source_set_property (abook, "refresh-interval", "86400");
+		e_source_set_property (abook, "completion", "true");
+		e_source_set_property (abook, "username", mav->priv->username);
+		e_source_set_relative_uri (abook, mav->priv->username);
+
+		rel_uri = g_strdup_printf("google://%s/", mav->priv->username);
+		e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password));
+		e_passwords_remember_password ("Addressbook", rel_uri);
+		e_source_group_add_source (sgrp, abook, -1);
+		e_source_list_sync (slist, NULL);
+
+		g_free(rel_uri);
+		g_object_unref(slist);
+		g_object_unref(sgrp);
+		g_object_unref(abook);
+
+	}
+
+	g_object_unref (gconf);
+}
+
+#define INDENTATION 10
+
 static GtkWidget *
 create_review (MailAccountView *view)
 {
@@ -184,128 +466,115 @@ create_review (MailAccountView *view)
 	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF(label)
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Name:"));
 	gtk_widget_show (label);
 	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new(e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME));
 	gtk_widget_show(entry);
 	PACK_BOX(entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Email address:"));
 	gtk_widget_show (label);
 	PACK_BOX(label)
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS));
 	gtk_widget_show(entry);
 	PACK_BOX(entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (NULL);
-	buff = g_strconcat ("<span size=\"large\" weight=\"bold\">", _("Receiving details:"), "</span>", NULL);
-	gtk_label_set_markup ((GtkLabel *)label, buff);
-	g_free (buff);
+	gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Details:</span>"));
+	gtk_widget_show (label);
+	PACK_BOXF(label);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+
+	label = gtk_label_new (NULL);
+	gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Receiving</span>"));
 	gtk_widget_show (label);
 	PACK_BOXF(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Server type:"));
 	gtk_widget_show (label);
 	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->protocol);
 	gtk_widget_show(entry);
 	PACK_BOX(entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Server address:"));
 	gtk_widget_show (label);
 	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->host);
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Username:"));
 	gtk_widget_show (label);
 	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->user);
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Use encryption:"));
 	gtk_widget_show (label);
 	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	enc = (gchar *)camel_url_get_param(url, "use_ssl");
 	entry = gtk_label_new (enc ? enc : _("never"));
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
+	view->priv->username = g_strdup(url->user);
 	camel_url_free(url);
 	uri =(gchar *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL);
 	if (!uri  || (url = camel_url_new(uri, NULL)) == NULL)
 		return NULL;
 
 	label = gtk_label_new (NULL);
-	buff = g_strconcat ("<span size=\"large\" weight=\"bold\">", _("Sending details:"), "</span>", NULL);
-	gtk_label_set_markup ((GtkLabel *)label, buff);
-	g_free (buff);
+	gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Sending</span>"));
 	gtk_widget_show (label);
 	PACK_BOXF(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
-	label = gtk_label_new (_("Server type:"));
-	gtk_widget_show (label);
-	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
 	entry = gtk_label_new (url->protocol);
 	gtk_widget_show(entry);
 	PACK_BOX(entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
-	label = gtk_label_new (_("Server address:"));
-	gtk_widget_show (label);
-	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
 	entry = gtk_label_new (url->host);
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
-	label = gtk_label_new (_("Username:"));
-	gtk_widget_show (label);
-	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
 	entry = gtk_label_new (url->user);
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
-	label = gtk_label_new (_("Use encryption:"));
-	gtk_widget_show (label);
-	PACK_BOX(label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
 	enc = (gchar *)camel_url_get_param(url, "use_ssl");
 	entry = gtk_label_new (enc ? enc : _("never"));
 	gtk_widget_show(entry);
 	PACK_BOX(entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 /*
 	label = gtk_label_new (_("Organization:"));
 	gtk_widget_show (label);
 	entry = gtk_entry_new ();
 	gtk_widget_show(entry);
-	gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, 10, 3);
-	gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+	gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	*/
 
 	gtk_widget_show(table);
@@ -385,6 +654,25 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 			g_free(uri);
 			camel_url_free(url);
 		}
+
+		if (!mav->original) {
+			EAccount *account = em_account_editor_get_modified_account(mav->edit);
+			CamelURL *aurl;
+			gchar *surl;
+			/* Save the password ahead of time */
+			aurl = camel_url_new (account->source->url, NULL);
+			surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL);
+			e_passwords_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password));
+			e_passwords_remember_password ("Mail", surl);
+			camel_url_free(aurl);
+			g_free(surl);
+		}
+
+		if (mav->priv->is_gmail && !mav->original)
+			setup_google_accounts (mav);
+		else if (mav->priv->is_yahoo && !mav->original)
+			setup_yahoo_account (mav);
+
 		em_account_editor_commit (mav->edit);
 		g_signal_emit (mav, signals[VIEW_CLOSE], 0);
 		return;
@@ -400,6 +688,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 	if (mav->current_page == MAV_LAST - 1) {
 		MAVPage *page = mav->pages[mav->current_page];
 		GtkWidget *tmp;
+		EAccount *account = em_account_editor_get_modified_account(mav->edit);
 
 		if (page->main)
 			gtk_widget_destroy (page->main);
@@ -410,6 +699,96 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 		gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0);
 		gtk_widget_show(tmp);
 		gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3);
+
+		if (mav->priv->is_gmail) {
+			gtk_widget_destroy (mav->priv->gcontacts);
+			gtk_widget_destroy (mav->priv->calendar);
+			gtk_widget_destroy (mav->priv->gmail_info_label);
+		} else if (mav->priv->is_yahoo) {
+			gtk_widget_destroy (mav->priv->calendar);
+			gtk_widget_destroy (mav->priv->gmail_info_label);
+			gtk_widget_destroy (mav->priv->yahoo_cal_entry);
+		}
+
+		if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") ||
+				g_strrstr(account->source->url, "googlemail"))) {
+			/* Google accounts*/
+			GtkWidget *tmp;
+			mav->priv->is_gmail = TRUE;
+
+			mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution"));
+			mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution"));
+
+			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE);
+			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE);
+
+			mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access."));
+			gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
+
+			gtk_widget_show (mav->priv->gcontacts);
+			gtk_widget_show (mav->priv->calendar);
+			gtk_widget_show (mav->priv->gmail_info_label);
+
+			tmp = gtk_label_new (NULL);
+			gtk_label_set_markup ((GtkLabel *)tmp, _("<span size=\"large\" weight=\"bold\">Google account settings:</span>"));
+			gtk_widget_show(tmp);
+
+#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+
+			PACK_IN_BOX(page->box,tmp,12);
+			PACK_IN_BOX(page->box,mav->priv->gcontacts,24);
+			PACK_IN_BOX(page->box,mav->priv->calendar,24);
+#undef PACK_IN_BOX
+#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+
+			PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop"), 24, 0);
+#undef PACK_IN_BOX
+		} else if (mav->original == NULL &&
+				(g_strrstr(account->source->url, "yahoo.") ||
+				 g_strrstr(account->source->url, "ymail.") ||
+				 g_strrstr(account->source->url, "rocketmail."))) {
+			/* Yahoo accounts*/
+			GtkWidget *tmp;
+			gchar *cal_name;
+			GtkWidget *tmpbox;
+
+			mav->priv->is_yahoo = TRUE;
+			printf("Google account: %s\n", account->source->url);
+			mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution"));
+
+			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE);
+
+			mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."));
+			gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
+
+			gtk_widget_show (mav->priv->calendar);
+			gtk_widget_show (mav->priv->gmail_info_label);
+
+			tmp = gtk_label_new (NULL);
+			gtk_label_set_markup ((GtkLabel *)tmp, _("<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"));
+			gtk_widget_show(tmp);
+
+#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); }
+#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);}
+
+			PACK_IN_BOX(page->box,tmp,12);
+			PACK_IN_BOX(page->box,mav->priv->calendar,24);
+
+			mav->priv->yahoo_cal_entry = gtk_entry_new ();
+			gtk_widget_show (mav->priv->yahoo_cal_entry);
+			PACK_IN_BOX(page->box,mav->priv->gmail_info_label, 24);
+			PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0);
+			PACK_IN_BOX(page->box, tmpbox, 24);
+			cal_name = g_strdup(e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_NAME));
+			cal_name = g_strdelimit(cal_name, " ", '_');
+			gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name);
+			g_free (cal_name);
+#undef PACK_IN_BOX
+		} else {
+			mav->priv->is_gmail = FALSE;
+			mav->priv->is_yahoo = FALSE;
+		}
+
 	}
 
 	gtk_widget_show (mav->pages[mav->current_page]->box);
@@ -516,6 +895,9 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
 			gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
 		}
 		page->next = gtk_button_new ();
+		gtk_widget_set_can_default (page->next, TRUE);
+		g_signal_connect (page->next, "hierarchy-changed",
+				  G_CALLBACK (gtk_widget_grab_default), NULL);
 		gtk_container_add ((GtkContainer *)page->next, box);
 		gtk_widget_show_all(page->next);
 		g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view);
@@ -593,9 +975,16 @@ emae_check_servers (const gchar *email)
 }
 
 static void
+next_page (GtkWidget *entry, MailAccountView *mav)
+{
+	mav_next_pressed (NULL, mav);
+}
+
+static void
 mail_account_view_construct (MailAccountView *view)
 {
 	gint i;
+	EShell *shell;
 
 	view->scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -623,8 +1012,29 @@ mail_account_view_construct (MailAccountView *view)
 	em_account_editor_check (view->edit, mail_account_pages[0].path);
 	view->pages[0]->done = TRUE;
 
-	if (e_shell_get_express_mode (e_shell_get_default ()))
+	shell = e_shell_get_default ();
+	if (!shell || e_shell_get_express_mode (shell)) {
+		GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table");
+		GtkWidget *label, *pwd;
 		gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame"));
+
+		if (!view->original) {
+			label = gtk_label_new (_("Password:"));
+			pwd = gtk_entry_new ();
+			gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE);
+/*			gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */
+			g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view);
+			gtk_widget_show(label);
+			gtk_widget_show(pwd);
+			gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+			gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0);
+
+			view->password = pwd;
+		}
+	}
+
+	/* assume the full name is known from the system */
+	gtk_widget_grab_focus (em_account_editor_get_widget (view->edit, "identity_address"));
 }
 
 MailAccountView *
diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h
index df0a7a1114..3d01156e5b 100644
--- a/capplet/settings/mail-account-view.h
+++ b/capplet/settings/mail-account-view.h
@@ -74,6 +74,7 @@ typedef struct _MailAccountView {
 	GtkWidget *wpages[6];
 	gint current_page;
 	struct _EMAccountEditor *edit;
+	GtkWidget *password;
 
 	MailAccountViewPrivate *priv;
 } MailAccountView;
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index fe71153655..d6a65e8c53 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -42,6 +42,8 @@
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 
+#include <libedataserver/e-proxy.h>
+
 #include <shell/e-shell.h>
 
 #include "mail-guess-servers.h"
@@ -242,13 +244,15 @@ guess_when_online (EmailProvider *provider)
 {
 	const gchar *cafile = NULL;
 	gchar *url;
-	SoupURI *proxy = NULL, *parsed;
+	EProxy *proxy;
+	SoupURI *parsed;
 	SoupMessage *msg;
 	SoupSession *session;
 
-	url = g_strdup_printf (
-		"https://live.mozillamessaging.com/autoconfig/%s",
-		provider->domain);
+	proxy = e_proxy_new ();
+	e_proxy_setup_proxy (proxy);
+
+	url = g_strdup_printf("%s/%s", "http://api.gnome.org/evolution/autoconfig", provider->domain);
 	parsed = soup_uri_new (url);
 	soup_uri_free (parsed);
 
@@ -257,10 +261,11 @@ guess_when_online (EmailProvider *provider)
 		SOUP_SESSION_USER_AGENT, "get ",
 		NULL);
 
-	if (proxy) {
-		g_object_set (G_OBJECT (session),
-			      SOUP_SESSION_PROXY_URI, proxy,
-			      NULL);
+	if (e_proxy_require_proxy_for_uri (proxy, url)) {
+		SoupURI *proxy_uri = e_proxy_peek_uri_for (proxy, url);
+/*		fprintf (stderr, "URL '%s' requires a proxy: '%s'\n",
+			 url, soup_uri_to_string (proxy_uri, FALSE)); */
+		g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL);
 	}
 
 	msg = get_url (session, url);
@@ -269,6 +274,7 @@ guess_when_online (EmailProvider *provider)
 
 	parse_soup_message (msg, provider);
 
+	g_object_unref (proxy);
 	g_object_unref (msg);
 	g_object_unref(session);
 	g_free(url);
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 98cb9c5e17..e5c9372f59 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -422,14 +422,6 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
-	{ "view-from",
-	  NULL,
-	  N_("_From Field"),
-	  NULL,
-	  N_("Toggles whether the From chooser is displayed"),
-	  NULL,  /* Handled by property bindings */
-	  FALSE },
-
 	{ "view-reply-to",
 	  NULL,
 	  N_("_Reply-To Field"),
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index 18c75eb3be..80147a8f24 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -57,8 +57,6 @@
 	E_COMPOSER_ACTION ((composer), "view-bcc")
 #define E_COMPOSER_ACTION_VIEW_CC(composer) \
 	E_COMPOSER_ACTION ((composer), "view-cc")
-#define E_COMPOSER_ACTION_VIEW_FROM(composer) \
-	E_COMPOSER_ACTION ((composer), "view-from")
 #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \
 	E_COMPOSER_ACTION ((composer), "view-reply-to")
 
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index cade5bfed3..4dadfa7ac7 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -110,16 +110,6 @@ e_composer_from_header_new (const gchar *label)
 		"button", FALSE, NULL);
 }
 
-EComposerHeader *
-e_composer_from_header_new_with_action (const gchar *label,
-                                        const gchar *action)
-{
-	return g_object_new (
-		E_TYPE_COMPOSER_FROM_HEADER, "label", label,
-		"button", FALSE, "addaction_text", action,
-		"addaction", action != NULL, NULL);
-}
-
 EAccountList *
 e_composer_from_header_get_account_list (EComposerFromHeader *header)
 {
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index 9f9a0e0f82..d2603bd664 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -63,9 +63,6 @@ struct _EComposerFromHeaderClass {
 
 GType		e_composer_from_header_get_type	(void);
 EComposerHeader * e_composer_from_header_new	(const gchar *label);
-EComposerHeader * e_composer_from_header_new_with_action
-						(const gchar *label,
-						 const gchar *action);
 EAccountList *	e_composer_from_header_get_account_list
 						(EComposerFromHeader *header);
 void		e_composer_from_header_set_account_list
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 26d9202c37..7a5d485933 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -25,14 +25,13 @@
 #include "e-util/gconf-bridge.h"
 #include "widgets/misc/e-signature-combo-box.h"
 
+#include "e-msg-composer.h"
 #include "e-composer-private.h"
 #include "e-composer-from-header.h"
 #include "e-composer-name-header.h"
 #include "e-composer-post-header.h"
 #include "e-composer-text-header.h"
 
-extern gboolean composer_lite;
-
 #define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate))
@@ -68,7 +67,6 @@ struct _EComposerHeaderTablePrivate {
 	GtkWidget *signature_label;
 	GtkWidget *signature_combo_box;
 	ENameSelector *name_selector;
-	GtkHBox *actions_container;
 };
 
 static gpointer parent_class;
@@ -158,11 +156,7 @@ composer_header_table_notify_header (EComposerHeader *header,
 {
 	GtkWidget *parent;
 
-	if (composer_lite && strcmp (property_name, "destinations-to") == 0)
-		parent = g_object_get_data (
-			G_OBJECT (header->input_widget), "parent");
-	else
-		parent = gtk_widget_get_parent (header->input_widget);
+	parent = gtk_widget_get_parent (header->input_widget);
 	g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (parent));
 	g_object_notify (G_OBJECT (parent), property_name);
 }
@@ -173,7 +167,7 @@ composer_header_table_notify_widget (GtkWidget *widget,
 {
 	GtkWidget *parent;
 
-	if (composer_lite) {
+	if (e_msg_composer_get_lite ()) {
 		parent = gtk_widget_get_parent (widget);
 		parent = g_object_get_data (G_OBJECT (parent), "pdata");
 	} else
@@ -281,6 +275,27 @@ skip_custom:
 	return new_destinations;
 }
 
+static gint
+count_from_accounts (EComposerHeaderTable *table)
+{
+	EComposerHeader *header;
+	EAccountComboBox *combo_box;
+
+	header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_FROM);
+	combo_box = E_ACCOUNT_COMBO_BOX (header->input_widget);
+
+	return e_account_combo_box_count_displayed_accounts (combo_box);
+}
+
+static gboolean
+from_header_should_be_visible (EComposerHeaderTable *table)
+{
+	gint num_accounts;
+
+	num_accounts = count_from_accounts (table);
+	return (num_accounts > 1);
+}
+
 static void
 composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 {
@@ -293,6 +308,8 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 		EComposerHeader *header;
 		const gchar *key;
 		guint binding_id;
+		gboolean sensitive;
+		gboolean visible;
 
 		binding_id = table->priv->gconf_bindings[ii];
 		header = e_composer_header_table_get_header (table, ii);
@@ -309,10 +326,6 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 				key = COMPOSER_GCONF_PREFIX "/show_mail_cc";
 				break;
 
-			case E_COMPOSER_HEADER_FROM:
-				key = COMPOSER_GCONF_PREFIX "/show_mail_from";
-				break;
-
 			case E_COMPOSER_HEADER_REPLY_TO:
 				key = COMPOSER_GCONF_PREFIX "/show_mail_reply_to";
 				break;
@@ -323,22 +336,29 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table)
 		}
 
 		switch (ii) {
+			case E_COMPOSER_HEADER_FROM:
+				sensitive = TRUE;
+				visible = from_header_should_be_visible (table);
+				break;
+
 			case E_COMPOSER_HEADER_BCC:
 			case E_COMPOSER_HEADER_CC:
-			case E_COMPOSER_HEADER_FROM:
 			case E_COMPOSER_HEADER_REPLY_TO:
 			case E_COMPOSER_HEADER_SUBJECT:
 			case E_COMPOSER_HEADER_TO:
-				e_composer_header_set_sensitive (header, TRUE);
-				e_composer_header_set_visible (header, TRUE);
+				sensitive = TRUE;
+				visible = TRUE;
 				break;
 
 			default:
-				e_composer_header_set_sensitive (header, FALSE);
-				e_composer_header_set_visible (header, FALSE);
+				sensitive = FALSE;
+				visible = FALSE;
 				break;
 		}
 
+		e_composer_header_set_sensitive (header, sensitive);
+		e_composer_header_set_visible (header, visible);
+
 		if (key != NULL)
 			binding_id = gconf_bridge_bind_property (
 				bridge, key, G_OBJECT (header), "visible");
@@ -481,6 +501,17 @@ composer_header_table_from_changed_cb (EComposerHeaderTable *table)
 		composer_header_table_setup_mail_headers (table);
 }
 
+static gint
+get_row_padding (void)
+{
+	/* For small screens, make the header-table's rows be packed closely together */
+
+	if (e_msg_composer_get_lite ())
+		return 0;
+	else
+		return 3;
+}
+
 static GObject *
 composer_header_table_constructor (GType type,
                                    guint n_construct_properties,
@@ -489,6 +520,7 @@ composer_header_table_constructor (GType type,
 	GObject *object;
 	EComposerHeaderTablePrivate *priv;
 	guint rows, ii;
+	gint row_padding;
 
 	/* Chain up to parent's constructor() method. */
 	object = G_OBJECT_CLASS (parent_class)->constructor (
@@ -504,45 +536,18 @@ composer_header_table_constructor (GType type,
 	/* Use "ypadding" instead of "row-spacing" because some rows may
 	 * be invisible and we don't want spacing around them. */
 
+	row_padding = get_row_padding ();
+
 	for (ii = 0; ii < rows; ii++) {
 		gtk_table_attach (
 			GTK_TABLE (object), priv->headers[ii]->title_widget,
-			0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, 3);
-		if (composer_lite && ii == E_COMPOSER_HEADER_TO) {
-			GtkWidget *box = gtk_hbox_new (FALSE, 0);
-			g_object_set_data (
-				G_OBJECT (priv->headers[ii]->input_widget),
-				"parent", object);
-			gtk_box_pack_start (
-				GTK_BOX (box), priv->headers[ii]->input_widget,
-				TRUE, TRUE, 3);
-			gtk_box_pack_start (
-				GTK_BOX (box),
-				GTK_WIDGET (priv->actions_container),
-				FALSE, FALSE, 0);
-			gtk_widget_show (box);
-			gtk_table_attach (
-				GTK_TABLE (object), box, 1, 4, ii, ii + 1,
-				GTK_FILL | GTK_EXPAND, 0, 0, 3);
-
-		} else {
-			gtk_table_attach (
-				GTK_TABLE (object),
-				priv->headers[ii]->input_widget, 1, 4,
-				ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3);
-		}
-		if (composer_lite && priv->headers[ii]->action_widget) {
-			/* Pack the widgets to the end. Helps formatting
-			 * when hiding the From field. */
-			gtk_box_pack_end (
-				GTK_BOX (priv->actions_container),
-				priv->headers[ii]->action_widget,
-				FALSE, FALSE, 6);
-		}
+			0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, row_padding);
+		gtk_table_attach (
+			GTK_TABLE (object),
+			priv->headers[ii]->input_widget, 1, 4,
+			ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, row_padding);
 	}
 
-	if (composer_lite)
-		gtk_widget_show_all ((GtkWidget *)priv->actions_container);
 	ii = E_COMPOSER_HEADER_FROM;
 
 	/* Leave room in the "From" row for signature stuff. */
@@ -560,13 +565,13 @@ composer_header_table_constructor (GType type,
 		priv->signature_combo_box, "visible");
 
 	/* Now add the signature stuff. */
-	if (!composer_lite) {
+	if (!e_msg_composer_get_lite ()) {
 		gtk_table_attach (
 			GTK_TABLE (object), priv->signature_label,
-			2, 3, ii, ii + 1, 0, 0, 0, 3);
+			2, 3, ii, ii + 1, 0, 0, 0, row_padding);
 		gtk_table_attach (
 			GTK_TABLE (object), priv->signature_combo_box,
-			3, 4, ii, ii + 1, composer_lite ? GTK_FILL: 0, 0, 0, 3);
+			3, 4, ii, ii + 1, e_msg_composer_get_lite () ? GTK_FILL: 0, 0, 0, row_padding);
 	} else {
 		GtkWidget *box = gtk_hbox_new (FALSE, 0);
 
@@ -579,7 +584,7 @@ composer_header_table_constructor (GType type,
 		g_object_set_data (G_OBJECT (box), "pdata", object);
 		gtk_table_attach (
 			GTK_TABLE (object), box,
-			3, 4, ii, ii + 1, GTK_FILL, 0, 0, 3);
+			3, 4, ii, ii + 1, GTK_FILL, 0, 0, row_padding);
 		gtk_widget_hide (box);
 	}
 
@@ -953,9 +958,7 @@ composer_header_table_init (EComposerHeaderTable *table)
 	name_selector = e_name_selector_new ();
 	table->priv->name_selector = name_selector;
 
-	table->priv->actions_container = (GtkHBox *)gtk_hbox_new (FALSE, 6);
-
-	header = e_composer_from_header_new_with_action (_("Fr_om:"), _("From"));
+	header = e_composer_from_header_new (_("Fr_om:"));
 	composer_header_table_bind_header ("account", "changed", header);
 	composer_header_table_bind_header ("account-list", "refreshed", header);
 	composer_header_table_bind_header ("account-name", "changed", header);
@@ -964,24 +967,21 @@ composer_header_table_init (EComposerHeaderTable *table)
 		composer_header_table_from_changed_cb), table);
 	table->priv->headers[E_COMPOSER_HEADER_FROM] = header;
 
-	header = e_composer_text_header_new_label (_("_Reply-To:"), "");
+	header = e_composer_text_header_new_label (_("_Reply-To:"));
 	composer_header_table_bind_header ("reply-to", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header;
 
-	header = e_composer_name_header_new_with_label (
-		_("_To:"), name_selector);
+	header = e_composer_name_header_new (_("_To:"), name_selector);
 	e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_TO);
 	composer_header_table_bind_header ("destinations-to", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_TO] = header;
 
-	header = e_composer_name_header_new_with_action (
-		_("_Cc:"), _("CC"), name_selector);
+	header = e_composer_name_header_new (_("_Cc:"), name_selector);
 	e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_CC);
 	composer_header_table_bind_header ("destinations-cc", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_CC] = header;
 
-	header = e_composer_name_header_new_with_action (
-		_("_Bcc:"), _("BCC"), name_selector);
+	header = e_composer_name_header_new (_("_Bcc:"), name_selector);
 	e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_BCC);
 	composer_header_table_bind_header ("destinations-bcc", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_BCC] = header;
@@ -990,7 +990,7 @@ composer_header_table_init (EComposerHeaderTable *table)
 	composer_header_table_bind_header ("post-to", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_POST_TO] = header;
 
-	header = e_composer_text_header_new_label (_("S_ubject:"), NULL);
+	header = e_composer_text_header_new_label (_("S_ubject:"));
 	composer_header_table_bind_header ("subject", "changed", header);
 	table->priv->headers[E_COMPOSER_HEADER_SUBJECT] = header;
 
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 0d32667bca..0c634175de 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -32,8 +32,6 @@ enum {
 	PROP_0,
 	PROP_BUTTON,
 	PROP_LABEL,
-	PROP_ADDACTION,
-	PROP_ADDACTION_TEXT,
 	PROP_SENSITIVE,
 	PROP_VISIBLE
 };
@@ -47,8 +45,6 @@ enum {
 struct _EComposerHeaderPrivate {
 	gchar *label;
 	gboolean button;
-	gchar *addaction_text;
-	gboolean addaction; /*For Add button.*/
 	GtkWidget *action_label;
 
 	GtkWidget *add_icon;
@@ -71,15 +67,6 @@ composer_header_button_clicked_cb (GtkButton *button,
 	g_signal_emit (header, signal_ids[CLICKED], 0);
 }
 
-static void
-composer_header_addaction_clicked_cb (GtkButton *button,
-				      EComposerHeader *header)
-{
-	gboolean show = !e_composer_header_get_visible(header);
-
-	e_composer_header_set_visible (header, show);
-}
-
 static GObject *
 composer_header_constructor (GType type,
                              guint n_construct_properties,
@@ -88,6 +75,7 @@ composer_header_constructor (GType type,
 	GObject *object;
 	GtkWidget *widget;
 	EComposerHeader *header;
+	GtkWidget *label;
 
 	/* Chain up to parent's constructor() method. */
 	object = G_OBJECT_CLASS (parent_class)->constructor (
@@ -102,51 +90,16 @@ composer_header_constructor (GType type,
 			widget, "clicked",
 			G_CALLBACK (composer_header_button_clicked_cb),
 			header);
+		label = gtk_bin_get_child (GTK_BIN (widget));
 	} else {
 		widget = gtk_label_new_with_mnemonic (header->priv->label);
-		gtk_label_set_mnemonic_widget (
-			GTK_LABEL (widget), header->input_widget);
+		gtk_label_set_mnemonic_widget (GTK_LABEL (widget), header->input_widget);
+		label = widget;
 	}
 
+	gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+
 	header->priv->action_label = NULL;
-	if (header->priv->addaction) {
-		GtkWidget *box, *tmp;
-		gchar *str;
-
-		header->priv->action_label = gtk_label_new (NULL);
-		header->action_widget = gtk_button_new ();
-		box = gtk_hbox_new (FALSE, 0);
-		tmp = gtk_image_new_from_stock (
-			GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
-		header->priv->add_icon = tmp;
-		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
-		tmp = gtk_image_new_from_stock (
-			GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON);
-		header->priv->remove_icon = tmp;
-		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
-		tmp = gtk_label_new (NULL);
-		str = g_strdup_printf (
-			"<span>%s %s</span>", _("Show"),
-			header->priv->addaction_text);
-		gtk_label_set_markup((GtkLabel *)tmp, str);
-		g_free (str);
-		header->priv->show_label = tmp;
-		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
-		tmp = gtk_label_new (NULL);
-		str = g_strdup_printf (
-			"<span>%s %s</span>", _("Hide"),
-			header->priv->addaction_text);
-		gtk_label_set_markup((GtkLabel *)tmp, str);
-		header->priv->hide_label = tmp;
-		gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
-
-		gtk_container_add((GtkContainer *)header->action_widget, box);
-		gtk_widget_show_all(header->action_widget);
-		g_signal_connect (
-			header->action_widget, "clicked",
-			G_CALLBACK (composer_header_addaction_clicked_cb),
-			header);
-	}
 
 	header->title_widget = g_object_ref_sink (widget);
 
@@ -171,14 +124,6 @@ composer_header_set_property (GObject *object,
 			priv->button = g_value_get_boolean (value);
 			return;
 
-		case PROP_ADDACTION:	/* construct only */
-			priv->addaction = g_value_get_boolean (value);
-			return;
-
-		case PROP_ADDACTION_TEXT:/* construct only */
-			priv->addaction_text = g_value_dup_string (value);
-			return;
-
 		case PROP_LABEL:	/* construct only */
 			priv->label = g_value_dup_string (value);
 			return;
@@ -199,15 +144,6 @@ composer_header_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-void
-e_composer_header_set_property (GObject *object,
-                              guint property_id,
-                              const GValue *value,
-                              GParamSpec *pspec)
-{
-	composer_header_set_property (object, property_id, value, pspec);
-}
-
 static void
 composer_header_get_property (GObject *object,
                               guint property_id,
@@ -223,15 +159,6 @@ composer_header_get_property (GObject *object,
 			g_value_set_boolean (value, priv->button);
 			return;
 
-		case PROP_ADDACTION:	/* construct only */
-			g_value_set_boolean (value, priv->button);
-			return;
-
-		case PROP_ADDACTION_TEXT:	/* construct only */
-			g_value_take_string (
-				value, priv->addaction_text);
-			return;
-
 		case PROP_LABEL:	/* construct only */
 			g_value_take_string (
 				value, e_composer_header_get_label (
@@ -300,28 +227,6 @@ composer_header_class_init (EComposerHeaderClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_ADDACTION,
-		g_param_spec_boolean (
-			"addaction",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_ADDACTION_TEXT,
-		g_param_spec_string (
-			"addaction_text",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
 		PROP_LABEL,
 		g_param_spec_string (
 			"label",
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 33600900e9..971b55968c 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -49,7 +49,6 @@ struct _EComposerHeader {
 	GObject parent;
 	GtkWidget *title_widget;
 	GtkWidget *input_widget;
-        GtkWidget *action_widget;
 	EComposerHeaderPrivate *priv;
 };
 
@@ -69,8 +68,6 @@ void		e_composer_header_set_sensitive	(EComposerHeader *header,
 gboolean	e_composer_header_get_visible	(EComposerHeader *header);
 void		e_composer_header_set_visible	(EComposerHeader *header,
 						 gboolean visible);
-void		e_composer_header_set_property	(GObject *object, guint property_id,
-						const GValue *value, GParamSpec *pspec);
 void		e_composer_header_set_title_tooltip
 						(EComposerHeader *header,
 						 const gchar *tooltip);
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index eadef10910..46121eb7ba 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -295,33 +295,11 @@ e_composer_name_header_new (const gchar *label,
 {
 	g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL);
 
-	return g_object_new (
-		E_TYPE_COMPOSER_NAME_HEADER, "label", label,
-		"button", !e_msg_composer_get_lite(), "name-selector", name_selector, NULL);
-}
-
-EComposerHeader *
-e_composer_name_header_new_with_label (const gchar *label,
-                                       ENameSelector *name_selector)
-{
-	return g_object_new (
-		E_TYPE_COMPOSER_NAME_HEADER, "label", label,
-		"button", !e_msg_composer_get_lite(),  "name-selector", name_selector,
-		"addaction", FALSE, "visible", TRUE, NULL);
-}
-
-EComposerHeader *
-e_composer_name_header_new_with_action (const gchar *label,
-                                        const gchar *action_label,
-                                        ENameSelector *name_selector)
-{
-	g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL);
-
-	return g_object_new (
-		E_TYPE_COMPOSER_NAME_HEADER, "label", label,
-		"button", !e_msg_composer_get_lite(), "name-selector", name_selector,
-		"addaction_text", action_label,
-		"addaction", action_label != NULL, NULL);
+	return g_object_new (E_TYPE_COMPOSER_NAME_HEADER,
+			     "label", label,
+			     "button", TRUE,
+			     "name-selector", name_selector,
+			     NULL);
 }
 
 ENameSelector *
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index 100d6c8980..785f7d11e8 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -62,14 +62,6 @@ struct _EComposerNameHeaderClass {
 GType		e_composer_name_header_get_type	(void);
 EComposerHeader * e_composer_name_header_new	(const gchar *label,
 						 ENameSelector *name_selector);
-/*No button. Just a label.*/
-EComposerHeader * e_composer_name_header_new_with_label	(const gchar *label,
-							 ENameSelector *name_selector);
-
-/*No button. Label with a Link button for show/hide.*/
-EComposerHeader * e_composer_name_header_new_with_action (const gchar *label,
-							  const gchar *action,
-							  ENameSelector *name_selector);
 
 ENameSelector *	e_composer_name_header_get_name_selector
 						(EComposerNameHeader *header);
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index a3d43dcf88..22b4565f4b 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -145,9 +145,18 @@ e_composer_private_constructed (EMsgComposer *composer)
 	html = gtkhtml_editor_get_html (editor);
 	ui_manager = gtkhtml_editor_get_ui_manager (editor);
 
-	if (composer->lite) {
+	if (e_msg_composer_get_lite ()) {
+#if 0
+		/* In the lite composer, for small screens, we are not ready yet
+		 * to hide the menubar.  It still has useful items like the ones
+		 * to show/hide the various header fields, plus the security options.
+		 *
+		 * When we move those options out of the menu and into the composer's
+		 * toplevel, we can probably get rid of the menu.
+		 */
 		widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu");
 		gtk_widget_hide (widget);
+#endif
 		widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar");
 		gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ);
 		gtk_widget_hide (widget);
@@ -243,8 +252,8 @@ e_composer_private_constructed (EMsgComposer *composer)
 	widget = e_composer_header_table_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0);
-	if (composer->lite)
-		gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 0);
+	if (e_msg_composer_get_lite ())
+		gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 1);
 	else
 		gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 2);
 
@@ -253,7 +262,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 
 	/* Construct the attachment paned. */
 
-	if (composer->lite) {
+	if (e_msg_composer_get_lite ()) {
 		e_attachment_paned_set_default_height (75); /* short attachment bar for Anjal */
 		e_attachment_icon_view_set_default_icon_size (GTK_ICON_SIZE_BUTTON);
 	}
@@ -262,7 +271,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 	priv->attachment_paned = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	if (composer->lite) {
+	if (e_msg_composer_get_lite ()) {
 		GtkWidget *tmp, *tmp1, *tmp_box, *container;
 		GtkWidget *combo;
 
@@ -351,10 +360,6 @@ e_composer_private_constructed (EMsgComposer *composer)
 				action = ACTION (VIEW_CC);
 				break;
 
-			case E_COMPOSER_HEADER_FROM:
-				action = ACTION (VIEW_FROM);
-				break;
-
 			case E_COMPOSER_HEADER_REPLY_TO:
 				action = ACTION (VIEW_REPLY_TO);
 				break;
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index e765237a2d..efbf141cea 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -108,23 +108,21 @@ e_composer_text_header_get_type (void)
 }
 
 EComposerHeader *
-e_composer_text_header_new_label (const gchar *label, const gchar *action_label)
+e_composer_text_header_new_label (const gchar *label)
 {
-	return g_object_new (
-		E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
-		"button", FALSE, "addaction", action_label && *action_label,
-		"addaction_text", action_label,
-		"visible", action_label == NULL, NULL);
+	return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER,
+			     "label", label,
+			     "button", FALSE,
+			     NULL);
 }
 
 EComposerHeader *
-e_composer_text_header_new_button (const gchar *label, const gchar *action_label)
+e_composer_text_header_new_button (const gchar *label)
 {
-	return g_object_new (
-		E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
-		"button", TRUE, "addaction", action_label != NULL,
-		"addaction_text", action_label,
-		"visible", action_label == NULL, NULL);
+	return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER,
+			     "label", label,
+			     "button", TRUE,
+			     NULL);
 }
 
 const gchar *
diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h
index 74fb86f9b0..278b2b1116 100644
--- a/composer/e-composer-text-header.h
+++ b/composer/e-composer-text-header.h
@@ -59,10 +59,10 @@ struct _EComposerTextHeaderClass {
 GType		e_composer_text_header_get_type	(void);
 
 EComposerHeader *
-e_composer_text_header_new_label (const gchar *label, const gchar *action_label);
+e_composer_text_header_new_label (const gchar *label);
 
 EComposerHeader *
-e_composer_text_header_new_button (const gchar *label, const gchar *action_label);
+e_composer_text_header_new_button (const gchar *label);
 
 const gchar *	e_composer_text_header_get_text	(EComposerTextHeader *header);
 void		e_composer_text_header_set_text (EComposerTextHeader *header,
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 36100621fe..67a9781395 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -85,8 +85,6 @@ enum {
 	LAST_SIGNAL
 };
 
-gboolean composer_lite = FALSE;
-
 static gpointer parent_class;
 static guint signals[LAST_SIGNAL];
 
@@ -1681,6 +1679,7 @@ msg_composer_constructed (GObject *object)
 	g_signal_connect (object, "delete-event",
 		G_CALLBACK (msg_composer_delete_event_cb), NULL);
 
+	e_shell_adapt_window_size (shell, GTK_WINDOW (composer));
 	e_shell_watch_window (shell, GTK_WINDOW (object));
 
 	/* Restore Persistent State */
@@ -2170,8 +2169,14 @@ msg_composer_class_init (EMsgComposerClass *class)
 static void
 msg_composer_init (EMsgComposer *composer)
 {
-	composer->lite = composer_lite;
+	EShell *shell = e_shell_get_default ();
+
 	composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
+
+	if (e_shell_get_express_mode (shell)) {
+		GtkWindow *window = e_shell_get_active_window(shell);
+		gtk_window_set_transient_for (GTK_WINDOW(composer), window);
+	}
 }
 
 GType
@@ -2217,29 +2222,21 @@ e_msg_composer_new (void)
 		"html", e_web_view_new (), NULL);
 }
 
-void
-e_msg_composer_set_lite (void)
-{
-	composer_lite = TRUE;
-}
-
+/**
+ * e_msg_composer_get_lite:
+ *
+ * Used within the composer to see if it should be made suitable for small
+ * screens.
+ *
+ * Return value: whether the surrounding #EShell is in small screen mode.
+ */
 gboolean
 e_msg_composer_get_lite (void)
 {
-	return composer_lite;
-}
-
-EMsgComposer *
-e_msg_composer_lite_new (void)
-{
-	EMsgComposer *composer;
-
-	/* Init lite-composer for ever for the session */
-	composer_lite = TRUE;
-
-	composer = e_msg_composer_new ();
+	EShell *shell;
 
-	return composer;
+	shell = e_shell_get_default ();
+	return e_shell_get_small_screen_mode (shell);
 }
 
 EFocusTracker *
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index e2ef459eee..25c78ced03 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -61,7 +61,6 @@ typedef struct _EMsgComposerPrivate EMsgComposerPrivate;
 struct _EMsgComposer {
 	GtkhtmlEditor parent;
 	EMsgComposerPrivate *priv;
-	gboolean lite;
 };
 
 struct _EMsgComposerClass {
@@ -70,9 +69,7 @@ struct _EMsgComposerClass {
 
 GType		e_msg_composer_get_type		(void);
 EMsgComposer *	e_msg_composer_new		(void);
-void		e_msg_composer_set_lite		(void);
 gboolean	e_msg_composer_get_lite		(void);
-EMsgComposer *	e_msg_composer_lite_new		(void);
 EMsgComposer *	e_msg_composer_new_with_message	(CamelMimeMessage *msg);
 EMsgComposer *	e_msg_composer_new_from_url	(const gchar *url);
 EMsgComposer *	e_msg_composer_new_redirect	(CamelMimeMessage *message,
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 3b1fee7a72..f283d35dcb 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -22,7 +22,6 @@
     </placeholder>
     <placeholder name='pre-insert-menu'>
       <menu action='view-menu'>
-        <menuitem action='view-from'/>
         <menuitem action='view-reply-to'/>
         <menuitem action='view-cc'/>
         <menuitem action='view-bcc'/>
diff --git a/configure.ac b/configure.ac
index b3d6e4c3e8..f9938df788 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1175,7 +1175,25 @@ if test "$enable_sens" = yes; then
 	AC_SUBST(HAVE_SENS)
 	AC_SUBST(SENS_LIBS)
 fi
-
+AC_MSG_CHECKING([if Windows SENS support is enabled])
+AC_MSG_RESULT([$enable_sens])
+if test "$enable_sens" = yes; then
+	SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4"
+	AC_CHECK_HEADER([eventsys.h],
+		[AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have <eventsys.h>])],,
+		[[	#if HAVE_EVENTSYS_H
+			#include <eventsys.h>
+			#endif
+		]])
+	AC_CHECK_HEADER([sensevts.h],
+		[AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have <sensevts.h>])],,
+		[[	#if HAVE_SENSEVTS_H
+			#include <sensevts.h>
+			#endif
+		]])
+	AC_SUBST(HAVE_SENS)
+	AC_SUBST(SENS_LIBS)
+fi
 AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes])
 
 dnl ******************************
@@ -1835,6 +1853,7 @@ echo "
 	LDAP support:		$msg_ldap
 	NetworkManager:		$enable_nm
 	Windows SENS:           $enable_sens
+	ConnMan:		$enable_connman
 	Pilot conduits:		$msg_pilot
 	Libnotify:		$HAVE_LIBNOTIFY
 	Kerberos 5:		$msg_krb5
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 668ba80164..2287392fee 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -107,6 +107,11 @@ EShell
 
 </para>
 
+<!-- ##### ARG EShell:meego-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EShell:module-directory ##### -->
 <para>
 
@@ -127,6 +132,11 @@ EShell
 
 </para>
 
+<!-- ##### ARG EShell:small-screen-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION e_shell_get_default ##### -->
 <para>
 
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index a44f86e8bf..6f96116c61 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -270,7 +270,8 @@ e_alert_dialog_class_init (EAlertDialogClass *klass)
 }
 
 GtkWidget*
-e_alert_dialog_new (GtkWindow *parent, EAlert *alert)
+e_alert_dialog_new (GtkWindow *parent,
+                    EAlert *alert)
 {
 	return g_object_new (
 		E_TYPE_ALERT_DIALOG,
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 613971fba5..e8eedffef8 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -41,6 +41,8 @@
 
 #define d(x)
 
+typedef GtkWidget * (*EConfigItemSectionFactoryFunc)(EConfig *ec, EConfigItem *, GtkWidget *parent, GtkWidget *old, gpointer data, GtkWidget **real_frame);
+
 struct _EConfigFactory {
 	gchar *id;
 	EConfigFactoryFunc func;
@@ -62,6 +64,7 @@ struct _widget_node {
 	EConfigItem *item;
 	GtkWidget *widget; /* widget created by the factory, if any */
 	GtkWidget *frame; /* if created by us */
+	GtkWidget *real_frame; /* used for sections and section tables, this is the real GtkFrame (whereas "frame" above is the internal vbox/table) */
 
 	guint empty:1;		/* set if empty (i.e. hidden) */
 };
@@ -87,6 +90,8 @@ struct _EConfigPrivate {
 
 static gpointer parent_class;
 
+static GtkWidget *ech_config_section_factory (EConfig *config, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data, GtkWidget **real_frame);
+
 static void
 config_finalize (GObject *object)
 {
@@ -94,7 +99,7 @@ config_finalize (GObject *object)
 	EConfigPrivate *p = emp->priv;
 	GList *link;
 
-	d(printf("finalising EConfig %p\n", o));
+	d(printf("finalising EConfig %p\n", object));
 
 	g_free(emp->id);
 
@@ -519,6 +524,7 @@ ec_rebuild (EConfig *emp)
 	struct _widget_node *sectionnode = NULL, *pagenode = NULL;
 	GtkWidget *book = NULL, *page = NULL, *section = NULL, *root = NULL, *assistant = NULL;
 	gint pageno = 0, sectionno = 0, itemno = 0;
+	gint n_visible_widgets = 0;
 	struct _widget_node *last_active_page = NULL;
 	gboolean is_assistant;
 	GList *link;
@@ -550,7 +556,7 @@ ec_rebuild (EConfig *emp)
 		if (item->label != NULL)
 			translated_label = gettext (item->label);
 
-		/* If the last section doesn't contain anything, hide it */
+		/* If the last section doesn't contain any visible widgets, hide it */
 		if (sectionnode != NULL
 		    && sectionnode->frame != NULL
 		    && (item->type == E_CONFIG_PAGE_START
@@ -558,11 +564,22 @@ ec_rebuild (EConfig *emp)
 			|| item->type == E_CONFIG_PAGE
 			|| item->type == E_CONFIG_SECTION
 			|| item->type == E_CONFIG_SECTION_TABLE)) {
-			if ((sectionnode->empty = itemno == 0)) {
-				gtk_widget_hide(sectionnode->frame);
+			if ((sectionnode->empty = (itemno == 0 || n_visible_widgets == 0))) {
+				if (sectionnode->real_frame)
+					gtk_widget_hide(sectionnode->real_frame);
+
+				if (sectionnode->frame)
+					gtk_widget_hide(sectionnode->frame);
+
 				sectionno--;
-			} else
-				gtk_widget_show(sectionnode->frame);
+			} else {
+				if (sectionnode->real_frame)
+					gtk_widget_show(sectionnode->real_frame);
+
+				if (sectionnode->frame)
+					gtk_widget_show(sectionnode->frame);
+			}
+
 			d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
 		}
 
@@ -791,12 +808,35 @@ ec_rebuild (EConfig *emp)
 			}
 
 			itemno = 0;
+			n_visible_widgets = 0;
+
+			d(printf("Building section %s - '%s' - %s factory\n", item->path, item->label, item->factory ? "with" : "without"));
+
 			if (item->factory) {
-				section = item->factory(emp, item, page, wn->widget, wn->context->data);
+				/* For sections, we pass an extra argument to the usual EConfigItemFactoryFunc.
+				 * If this is an automatically-generated section, that extra argument (real_frame from
+				 * EConfigItemSectionFactoryFunc) will contain the actual GtkFrame upon returning.
+				 */
+				EConfigItemSectionFactoryFunc factory = (EConfigItemSectionFactoryFunc) item->factory;
+
+				section = factory(emp, item, page, wn->widget, wn->context->data, &wn->real_frame);
 				wn->frame = section;
 				if (section)
 					itemno = 1;
 
+				if (factory != ech_config_section_factory) {
+					/* This means there is a section that came from a user-specified factory,
+					 * so we don't know what is inside the section.  In that case, we increment
+					 * n_visible_widgets so that the section will not get hidden later (we don't know
+					 * if the section is empty or not, so we cannot decide to hide it).
+					 *
+					 * For automatically-generated sections, we use a special ech_config_section_factory() -
+					 * see emph_construct_item().
+					 */
+					n_visible_widgets++;
+					d(printf ("  n_visible_widgets++ because there is a section factory -> frame=%p\n", section));
+				}
+
 				if (section
 				    && ((item->type == E_CONFIG_SECTION && !GTK_IS_BOX(section))
 					|| (item->type == E_CONFIG_SECTION_TABLE && !GTK_IS_TABLE(section))))
@@ -878,6 +918,11 @@ ec_rebuild (EConfig *emp)
 
 			d(printf("item %d:%s widget %p\n", itemno, item->path, w));
 
+			d(printf ("  item %s: (%s - %s)\n",
+				  item->path,
+				  g_type_name_from_instance ((GTypeInstance *) w),
+				  gtk_widget_get_visible (w) ? "visible" : "invisible"));
+
 			if (wn->widget && wn->widget != w) {
 				d(printf("destroy old widget for item '%s'\n", item->path));
 				gtk_widget_destroy(wn->widget);
@@ -887,18 +932,32 @@ ec_rebuild (EConfig *emp)
 			if (w) {
 				g_signal_connect(w, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
 				itemno++;
+
+				if (gtk_widget_get_visible (w))
+					n_visible_widgets++;
 			}
 			break;
 		}
 	}
 
-	/* If the last section doesn't contain anything, hide it */
+	/* If the last section doesn't contain any visible widgets, hide it */
 	if (sectionnode != NULL && sectionnode->frame != NULL) {
-		if ((sectionnode->empty = itemno == 0)) {
-			gtk_widget_hide(sectionnode->frame);
+		d(printf ("Section %s - %d visible widgets (frame=%p)\n", sectionnode->item->path, n_visible_widgets, sectionnode->frame));
+		if ((sectionnode->empty = (itemno == 0 || n_visible_widgets == 0))) {
+			if (sectionnode->real_frame)
+				gtk_widget_hide(sectionnode->real_frame);
+
+			if (sectionnode->frame)
+				gtk_widget_hide(sectionnode->frame);
+
 			sectionno--;
-		} else
-			gtk_widget_show(sectionnode->frame);
+		} else {
+			if (sectionnode->real_frame)
+				gtk_widget_show(sectionnode->real_frame);
+
+			if (sectionnode->frame)
+				gtk_widget_show(sectionnode->frame);
+		}
 		d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno));
 	}
 
@@ -1585,7 +1644,8 @@ ech_config_section_factory (EConfig *config,
                             EConfigItem *item,
                             GtkWidget *parent,
                             GtkWidget *old,
-                            gpointer data)
+                            gpointer data,
+			    GtkWidget **real_frame)
 {
 	struct _EConfigHookGroup *group = data;
 	GtkWidget *label = NULL;
@@ -1612,6 +1672,8 @@ ech_config_section_factory (EConfig *config,
 	gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_NONE);
 	gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0);
 
+	*real_frame = widget;
+
 	/* This is why we have a custom factory for sections.
 	 * When the plugin is disabled the frame is invisible. */
 	plugin = group->hook->hook.plugin;
@@ -1667,9 +1729,9 @@ emph_construct_item(EPluginHook *eph, EConfigHookGroup *menu, xmlNodePtr root, E
 	if (item->user_data)
 		item->factory = ech_config_widget_factory;
 	else if (item->type == E_CONFIG_SECTION)
-		item->factory = ech_config_section_factory;
+		item->factory = (EConfigItemFactoryFunc) ech_config_section_factory;
 	else if (item->type == E_CONFIG_SECTION_TABLE)
-		item->factory = ech_config_section_factory;
+		item->factory = (EConfigItemFactoryFunc) ech_config_section_factory;
 
 	d(printf("   path=%s label=%s factory=%s\n", item->path, item->label, (gchar *)item->user_data));
 
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 19d9030d30..620719665b 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -46,6 +46,7 @@ e_notice (gpointer parent, GtkMessageType type, const gchar *format, ...)
 
 	va_start (args, format);
 	str = g_strdup_vprintf (format, args);
+
 	dialog = gtk_message_dialog_new (NULL,
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 type,
@@ -55,8 +56,11 @@ e_notice (gpointer parent, GtkMessageType type, const gchar *format, ...)
 	va_end (args);
 	g_free (str);
 
+	if (parent && !gtk_widget_is_toplevel (parent))
+		parent = gtk_widget_get_toplevel (parent);
 	if (parent)
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 1764e5ec72..c048a592b3 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
  <!ENTITY appname "Evolution" >
- <!ENTITY appversion "2.28" >
+ <!ENTITY appversion "2.30" >
  <!ENTITY z-3rdParty "*" >
  <!ENTITY z-SM "(SM)" >
  <!ENTITY z-CM "(CM)" >
@@ -7036,7 +7036,7 @@
      <para>Select this option to display weekends in one box instead of two in the month view.</para>
     </formalpara>
     <formalpara id="bsbhw7p">
-     <title>Show week numbers in date navigator:</title>
+     <title>Show week numbers:</title>
      <para>Shows the week numbers next to the respective weeks in the calendar.</para>
     </formalpara>
     <formalpara id="bsbhwdz">
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 67c732d352..7f62c466ad 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <string.h>
 #include "e-mail-backend.h"
 
 #include "e-util/e-account-utils.h"
@@ -271,6 +272,11 @@ mail_backend_quit_requested_cb (EShell *shell,
 	if (!e_shell_get_online (shell))
 		return;
 
+	/* In express mode, don't raise mail request in non mail window. */
+	if (e_shell_get_express_mode(shell) &&
+		strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0)
+		return;
+
 	/* Check Outbox for any unsent messages. */
 
 	folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 6f7aec337d..3282af34af 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -699,9 +699,9 @@ headers_changed_cb (GConfClient *client,
 		gchar *xml = (gchar *)p->data;
 
 		h = e_mail_reader_header_from_xml (xml);
-		if (h && h->enabled) {
-			em_format_add_header (emf, h->name, EM_FORMAT_HEADER_BOLD);
-		}
+		if (h && h->enabled)
+			em_format_add_header (
+				emf, h->name, EM_FORMAT_HEADER_BOLD);
 
 		e_mail_reader_header_free (h);
 	}
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index ac36600725..4b02d69623 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1288,8 +1288,8 @@ static GtkActionEntry mail_reader_entries[] = {
 	  N_("Mark the selected messages as junk"),
 	  G_CALLBACK (action_mail_mark_junk_cb) },
 
-	{ "mail-mark-notjunk",
-	  "mail-mark-notjunk",
+	{ "mail-mark-not-junk",
+	  "mail-mark-not-junk",
 	  N_("_Not Junk"),
 	  "<Shift><Control>j",
 	  N_("Mark the selected messages as not being junk"),
@@ -1598,9 +1598,9 @@ static EPopupActionEntry mail_reader_popup_entries[] = {
 	  N_("Mark as _Junk"),
 	  "mail-mark-junk" },
 
-	{ "mail-popup-mark-notjunk",
+	{ "mail-popup-mark-not-junk",
 	  N_("Mark as _Not Junk"),
-	  "mail-mark-notjunk" },
+	  "mail-mark-not-junk" },
 
 	{ "mail-popup-mark-read",
 	  N_("Mar_k as Read"),
@@ -2303,11 +2303,13 @@ mail_reader_update_actions (EMailReader *reader)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-mark-junk";
-	sensitive = selection_has_not_junk_messages;
+	sensitive =
+		selection_has_not_junk_messages &&
+		!(state & E_MAIL_READER_FOLDER_IS_JUNK);
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK));
 
-	action_name = "mail-mark-notjunk";
+	action_name = "mail-mark-not-junk";
 	sensitive = selection_has_junk_messages;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 55b7399e7f..49f4356a5b 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2190,7 +2190,9 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity")));
 	}
 
-	emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", "identity_optional_table", "identity_optional_frame", NULL);
+	emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table",
+			    "identity_optional_table", "identity_optional_frame",
+			    "identity_address", NULL);
 
 	g_object_unref (builder);
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 82984d698e..514885c28b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -710,16 +710,14 @@ em_utils_composer_print_cb (EMsgComposer *composer,
 /* Composing messages... */
 
 static EMsgComposer *
-create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite)
+create_new_composer (const gchar *subject, const gchar *fromuri)
 {
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 
-	if (lite)
-		composer = e_msg_composer_lite_new ();
-	else
-		composer = e_msg_composer_new ();
+	composer = e_msg_composer_new ();
+
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
@@ -749,7 +747,7 @@ em_utils_compose_new_message (const gchar *fromuri)
 {
 	GtkWidget *composer;
 
-	composer = (GtkWidget *) create_new_composer ("", fromuri, FALSE);
+	composer = (GtkWidget *) create_new_composer ("", fromuri);
 	if (composer == NULL)
 		return;
 
@@ -759,26 +757,6 @@ em_utils_compose_new_message (const gchar *fromuri)
 }
 
 /**
- * em_utils_compose_lite_new_message:
- *
- * Opens a new composer window as a child window of @parent's toplevel
- * window.
- **/
-EMsgComposer *
-em_utils_compose_lite_new_message (const gchar *fromuri)
-{
-	GtkWidget *composer;
-
-	composer = (GtkWidget *) create_new_composer ("", fromuri, TRUE);
-	if (composer == NULL)
-		return NULL;
-
-	composer_set_no_change (E_MSG_COMPOSER (composer), TRUE, TRUE);
-
-	return E_MSG_COMPOSER (composer);
-}
-
-/**
  * em_utils_compose_new_message_with_mailto:
  * @url: mailto url
  *
@@ -806,8 +784,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 	composer_set_no_change (composer, TRUE, url == NULL);
 
-	if (!e_msg_composer_get_lite ())
-		gtk_window_present (GTK_WINDOW (composer));
+	gtk_window_present (GTK_WINDOW (composer));
 
 	return composer;
 }
@@ -986,8 +963,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return (GtkWidget *)composer;
 }
@@ -1136,7 +1112,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 {
 	EMsgComposer *composer;
 
-	composer = create_new_composer (subject, fromuri, FALSE);
+	composer = create_new_composer (subject, fromuri);
 	if (composer == NULL)
 		return NULL;
 
@@ -1147,8 +1123,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }
@@ -1218,7 +1193,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 		text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found);
 
 		if (text) {
-			composer = create_new_composer (subject, fromuri, FALSE);
+			composer = create_new_composer (subject, fromuri);
 
 			if (composer) {
 				if (CAMEL_IS_MULTIPART(camel_medium_get_content ((CamelMedium *)message)))
@@ -1235,8 +1210,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 
 				emu_update_composers_security (composer, validity_found);
 				composer_set_no_change (composer, TRUE, TRUE);
-				if (!e_msg_composer_get_lite())
-					gtk_widget_show (GTK_WIDGET (composer));
+				gtk_widget_show (GTK_WIDGET (composer));
 			}
 			g_free (text);
 		}
@@ -2283,8 +2257,7 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index a3c6f1185c..1eb0d1bd30 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -30,7 +30,6 @@
 G_BEGIN_DECLS
 
 void em_utils_compose_new_message (const gchar *fromuri);
-EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
 
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e7262db9d0..37552bb555 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -39,6 +39,7 @@
 #include "mail-session.h"
 #include "mail-tools.h"
 #include "mail-mt.h"
+#include "mail-ops.h"
 
 /* sigh, these 2 only needed for outbox total count checking - a mess */
 #include "mail-folder-cache.h"
@@ -48,6 +49,7 @@
 #include "em-event.h"
 
 #include "e-mail-local.h"
+#include "e-mail-store.h"
 #include "shell/e-shell.h"
 
 #define d(x)
@@ -75,6 +77,7 @@ struct _EMFolderTreeModelPrivate {
 
 	gulong account_changed_id;
 	gulong account_removed_id;
+	gulong account_added_id;
 };
 
 enum {
@@ -251,6 +254,29 @@ account_removed_cb (EAccountList *accounts,
 	em_folder_tree_model_remove_store (model, si->store);
 }
 
+/* HACK: FIXME: the component should listen to the account object directly */
+static void
+add_new_store (gchar *uri, CamelStore *store, gpointer user_data)
+{
+	EAccount *account = user_data;
+
+	if (store == NULL)
+		return;
+
+	e_mail_store_add (store, account->name);
+}
+
+static void
+account_added_cb (EAccountList *accounts,
+                  EAccount *account,
+                  EMFolderTreeModel *model)
+{
+	const gchar *uri;
+
+	uri = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+	mail_get_store (uri, NULL, add_new_store, account);
+}
+
 static void
 folder_tree_model_selection_finalized_cb (EMFolderTreeModel *model)
 {
@@ -327,6 +353,8 @@ folder_tree_model_finalize (GObject *object)
 		priv->accounts, priv->account_changed_id);
 	g_signal_handler_disconnect (
 		priv->accounts, priv->account_removed_id);
+	g_signal_handler_disconnect (
+		priv->accounts, priv->account_added_id);
 
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -507,6 +535,9 @@ folder_tree_model_init (EMFolderTreeModel *model)
 	model->priv->account_removed_id = g_signal_connect (
 		model->priv->accounts, "account-removed",
 		G_CALLBACK (account_removed_cb), model);
+	model->priv->account_added_id = g_signal_connect (
+		model->priv->accounts, "account-added",
+		G_CALLBACK (account_added_cb), model);
 
 	g_signal_connect (mail_folder_cache_get_default (),
 			  "folder-unread-updated",
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index cb1e61b2c1..219e355cd5 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1157,6 +1157,8 @@ folder_tree_new (EMFolderTree *folder_tree)
 
 	folder_tree->priv->selectable = NULL;
 
+	folder_tree->priv->selectable = NULL;
+
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_append_column ((GtkTreeView *) tree, column);
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 86d9c88910..c142ca28b1 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -169,7 +169,7 @@ inline_filter_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		}
 
 		rest_len = inend - start;
-		if (inptr < inend) 
+		if (inptr < inend)
 			*inptr++ = 0;
 
 		#define restore_inptr() G_STMT_START { if (inptr < inend) inptr[-1] = '\n'; } G_STMT_END
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 64b44ffcde..ad1dfdc27a 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -160,21 +160,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_mail_from</key>
-      <applyto>/apps/evolution/mail/composer/show_mail_from</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show "From" field when sending a mail message</short>
-         <long>
-           Show the "From" field when sending a mail message.  This is
-           controlled from the View menu when a mail account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key>
       <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto>
       <owner>evolution-mail</owner>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index d1489becf8..4afa6019b3 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -3029,7 +3029,7 @@ For example: "Work" or "Personal"</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox234">
+                          <object class="GtkHBox" id="hboxMailSizeLimit">
                             <property name="visible">True</property>
                             <property name="spacing">4</property>
                             <child>
@@ -3078,7 +3078,7 @@ For example: "Work" or "Personal"</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox233">
+                          <object class="GtkHBox" id="hboxShrinkAddresses">
                             <property name="visible">True</property>
                             <child>
                               <object class="GtkCheckButton" id="address_checkbox">
@@ -4587,7 +4587,7 @@ For example: "Work" or "Personal"</property>
                             <property name="visible">True</property>
                             <property name="spacing">2</property>
                             <child>
-                              <object class="GtkVBox" id="vbox207">
+                              <object class="GtkVBox" id="vboxTopPosting">
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">8</property>
@@ -4672,7 +4672,7 @@ For example: "Work" or "Personal"</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label506">
+              <object class="GtkLabel" id="labelAlerts">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Alerts</property>
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 3920b51189..f42e3000a7 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,14 +10,14 @@ if ENABLE_NETWORK_MANAGER
 NETWORK_MANAGER_DIR = network-manager
 endif
 
-if ENABLE_WINDOWS_SENS
-WINDOWS_SENS_DIR = windows-sens
-endif
-
 if ENABLE_CONNMAN
 CONNMAN_DIR = connman
 endif
 
+if ENABLE_WINDOWS_SENS
+WINDOWS_SENS_DIR = windows-sens
+endif
+
 SUBDIRS = \
 	addressbook \
 	calendar \
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index 9783723a4e..e543bf6c56 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -43,7 +43,7 @@ cal_config_view_constructed (GObject *object)
 	if (E_IS_DAY_VIEW (extensible)) {
 
 		e_binding_new (
-			shell_settings, "cal-day-view-show-week-numbers",
+			shell_settings, "cal-show-week-numbers",
 			E_DAY_VIEW (extensible)->week_number_label, "visible");
 
 		e_binding_new (
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 56f692dd6b..a51a072f66 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -348,7 +348,7 @@ cal_shell_content_constructed (GObject *object)
 
 	/* We borrow the memopad and taskpad models from the memo
 	 * and task views, loading the views if necessary. */
-	if (!e_shell_get_express_mode(e_shell_get_default())) {
+	if (!e_shell_get_express_mode (shell)) {
 		foreign_view = e_shell_window_get_shell_view (shell_window, "memos");
 		foreign_content = e_shell_view_get_shell_content (foreign_view);
 		g_object_get (foreign_content, "model", &memo_model, NULL);
@@ -361,7 +361,7 @@ cal_shell_content_constructed (GObject *object)
 
 	container = GTK_WIDGET (object);
 
-	if (!e_shell_get_express_mode(e_shell_get_default())) {
+	if (!e_shell_get_express_mode (shell)) {
 		widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL);
 		gtk_container_add (GTK_CONTAINER (container), widget);
 		priv->hpaned = g_object_ref (widget);
@@ -373,14 +373,14 @@ cal_shell_content_constructed (GObject *object)
 	widget = gtk_notebook_new ();
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE);
-	if (!e_shell_get_express_mode(e_shell_get_default()))
+	if (!e_shell_get_express_mode (shell))
 		gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE);
 	else
 		gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->notebook = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	if (!e_shell_get_express_mode(e_shell_get_default())) {
+	if (!e_shell_get_express_mode (shell)) {
 		/* FIXME Need to deal with saving and restoring the position.
 		 *       Month view has its own position. */
 		widget = e_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -412,88 +412,92 @@ cal_shell_content_constructed (GObject *object)
 		priv->notebook, "page");
 
 	container = priv->vpaned;
-if (!e_shell_get_express_mode(e_shell_get_default())) {
-	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
-	gtk_widget_show (widget);
 
-	container = widget;
+	if (!e_shell_get_express_mode (shell)) {
+		widget = gtk_vbox_new (FALSE, 0);
+		gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+		gtk_widget_show (widget);
 
-	widget = gtk_hseparator_new ();
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
+		container = widget;
 
-	widget = gtk_label_new (NULL);
-	markup = g_strdup_printf ("<b>%s</b>", _("Tasks"));
-	gtk_label_set_markup (GTK_LABEL (widget), markup);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-	g_free (markup);
-
-	widget = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (
-		GTK_SCROLLED_WINDOW (widget),
-		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (
-		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	gtk_widget_show (widget);
+		widget = gtk_hseparator_new ();
+		gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+		gtk_widget_show (widget);
 
-	container = widget;
+		widget = gtk_label_new (NULL);
+		markup = g_strdup_printf ("<b>%s</b>", _("Tasks"));
+		gtk_label_set_markup (GTK_LABEL (widget), markup);
+		gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+		gtk_widget_show (widget);
+		g_free (markup);
+
+		widget = gtk_scrolled_window_new (NULL, NULL);
+		gtk_scrolled_window_set_policy (
+			GTK_SCROLLED_WINDOW (widget),
+			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+		gtk_scrolled_window_set_shadow_type (
+			GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+		gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+		gtk_widget_show (widget);
 
-	widget = e_task_table_new (shell_view, task_model);
-	gtk_container_add (GTK_CONTAINER (container), widget);
-	priv->task_table = g_object_ref (widget);
-	gtk_widget_show (widget);
+		container = widget;
 
-	cal_shell_content_load_table_state (shell_content, E_TABLE (widget));
+		widget = e_task_table_new (shell_view, task_model);
+		gtk_container_add (GTK_CONTAINER (container), widget);
+		priv->task_table = g_object_ref (widget);
+		gtk_widget_show (widget);
 
-	g_signal_connect_swapped (
-		widget, "open-component",
-		G_CALLBACK (e_cal_shell_view_taskpad_open_task),
-		shell_view);
+		cal_shell_content_load_table_state (
+			shell_content, E_TABLE (widget));
 
-	container = priv->vpaned;
+		g_signal_connect_swapped (
+			widget, "open-component",
+			G_CALLBACK (e_cal_shell_view_taskpad_open_task),
+			shell_view);
 
-	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
-	gtk_widget_show (widget);
+		container = priv->vpaned;
 
-	container = widget;
+		widget = gtk_vbox_new (FALSE, 0);
+		gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
+		gtk_widget_show (widget);
 
-	widget = gtk_label_new (NULL);
-	markup = g_strdup_printf ("<b>%s</b>", _("Memos"));
-	gtk_label_set_markup (GTK_LABEL (widget), markup);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
-	gtk_widget_show (widget);
-	g_free (markup);
-
-	widget = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (
-		GTK_SCROLLED_WINDOW (widget),
-		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (
-		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
-	gtk_widget_show (widget);
+		container = widget;
 
-	container = widget;
+		widget = gtk_label_new (NULL);
+		markup = g_strdup_printf ("<b>%s</b>", _("Memos"));
+		gtk_label_set_markup (GTK_LABEL (widget), markup);
+		gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+		gtk_widget_show (widget);
+		g_free (markup);
+
+		widget = gtk_scrolled_window_new (NULL, NULL);
+		gtk_scrolled_window_set_policy (
+			GTK_SCROLLED_WINDOW (widget),
+			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+		gtk_scrolled_window_set_shadow_type (
+			GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+		gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+		gtk_widget_show (widget);
 
-	widget = e_memo_table_new (shell_view, memo_model);
-	gtk_container_add (GTK_CONTAINER (container), widget);
-	priv->memo_table = g_object_ref (widget);
-	gtk_widget_show (widget);
+		container = widget;
+
+		widget = e_memo_table_new (shell_view, memo_model);
+		gtk_container_add (GTK_CONTAINER (container), widget);
+		priv->memo_table = g_object_ref (widget);
+		gtk_widget_show (widget);
 
-	cal_shell_content_load_table_state (shell_content, E_TABLE (widget));
+		cal_shell_content_load_table_state (
+			shell_content, E_TABLE (widget));
 
-	e_cal_model_set_default_time_func (
-		memo_model, gc_get_default_time, calendar);
+		e_cal_model_set_default_time_func (
+			memo_model, gc_get_default_time, calendar);
+
+		g_signal_connect_swapped (
+			widget, "open-component",
+			G_CALLBACK (e_cal_shell_view_memopad_open_memo),
+			shell_view);
+	}
 
-	g_signal_connect_swapped (
-		widget, "open-component",
-		G_CALLBACK (e_cal_shell_view_memopad_open_memo),
-		shell_view);
-}
 	/* Load the view instance. */
 
 	view_instance = e_shell_view_new_view_instance (shell_view, NULL);
@@ -505,7 +509,7 @@ if (!e_shell_get_express_mode(e_shell_get_default())) {
 	 *     The GtkWidget::map() callback below explains why. */
 	priv->view_instance = view_instance;
 
-	if (!e_shell_get_express_mode(e_shell_get_default())) {
+	if (!e_shell_get_express_mode (shell)) {
 		g_signal_connect_swapped (
 			shell_view, "notify::view-id",
 			G_CALLBACK (cal_shell_content_notify_view_id_cb),
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 3852de0a52..4613f280bb 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -491,8 +491,8 @@ e_cal_shell_backend_init_settings (EShell *shell)
 		"/apps/evolution/calendar/prompts/confirm_purge");
 
 	e_shell_settings_install_property_for_key (
-		"cal-day-view-show-week-numbers",
-		"/apps/evolution/calendar/display/day_view_show_week_number");
+		"cal-show-week-numbers",
+		"/apps/evolution/calendar/display/show_week_numbers");
 
 	e_shell_settings_install_property_for_key (
 		"cal-free-busy-template",
@@ -539,10 +539,6 @@ e_cal_shell_backend_init_settings (EShell *shell)
 		"/apps/evolution/calendar/display/show_event_end");
 
 	e_shell_settings_install_property_for_key (
-		"cal-show-week-numbers",
-		"/apps/evolution/calendar/date_navigator/show_week_numbers");
-
-	e_shell_settings_install_property_for_key (
 		"cal-tasks-color-due-today",
 		"/apps/evolution/calendar/tasks/colors/due_today");
 
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 20e0a96a67..9491d3fee2 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -33,6 +33,7 @@
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/e-calendar-selector.h"
 #include "calendar/gui/misc.h"
+#include "calendar/gui/dialogs/calendar-setup.h"
 
 #include "e-cal-shell-view.h"
 #include "e-cal-shell-backend.h"
@@ -492,7 +493,7 @@ cal_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
 	bridge = gconf_bridge_get ();
 
 	object = G_OBJECT (priv->paned);
-	key = "/apps/evolution/calendar/display/date_navigator_vpane_position";
+	key = "/apps/evolution/calendar/display/date_navigator_pane_position";
 	gconf_bridge_bind_property_delayed (bridge, key, object, "vposition");
 }
 
@@ -575,6 +576,21 @@ cal_shell_sidebar_finalize (GObject *object)
 }
 
 static void
+new_calendar_clicked (GtkButton *button,
+		      EShellSidebar *shell_sidebar)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	EShellBackend *shell_backend;
+
+	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	calendar_setup_new_calendar (GTK_WINDOW (shell_window));
+}
+
+static void
 cal_shell_sidebar_constructed (GObject *object)
 {
 	ECalShellSidebarPrivate *priv;
@@ -621,7 +637,21 @@ cal_shell_sidebar_constructed (GObject *object)
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+	if (!e_shell_get_express_mode(e_shell_get_default())) {
+		gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+	} else {
+		GtkWidget *button;
+
+		container = gtk_vbox_new (FALSE, 6);
+		gtk_box_pack_start (GTK_BOX(container), widget, TRUE, TRUE, 0);
+
+		button = gtk_button_new_with_label (_("New Calendar..."));
+		gtk_box_pack_start (GTK_BOX(container), button, FALSE, FALSE, 0);
+		g_signal_connect (button, "clicked", G_CALLBACK(new_calendar_clicked), shell_sidebar);
+
+		gtk_paned_pack1 (GTK_PANED (priv->paned), container, TRUE, TRUE);
+		gtk_widget_show_all (container);
+	}
 	gtk_widget_show (widget);
 
 	container = widget;
@@ -640,7 +670,8 @@ cal_shell_sidebar_constructed (GObject *object)
 	calitem = E_CALENDAR (widget)->calitem;
 	e_calendar_item_set_days_start_week_sel (calitem, 9);
 	e_calendar_item_set_max_days_sel (calitem, 42);
-	gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE);
+	gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE);
+	gtk_widget_set_size_request (widget, -1, 200);
 	priv->date_navigator = g_object_ref (widget);
 	gtk_widget_show (widget);
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index d56107ac7a..19812751d8 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1228,6 +1228,25 @@ action_event_schedule_cb (GtkAction *action,
 	edit_event_as (cal_shell_view, TRUE);
 }
 
+ static void
+quit_calendar_cb (GtkAction *action,
+                          ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GdkEvent *event;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	/* Synthesize a delete_event on this window. */
+	event = gdk_event_new (GDK_DELETE);
+	event->any.window = g_object_ref (((GtkWidget *) shell_window)->window);
+	event->any.send_event = TRUE;
+	gtk_main_do_event (event);
+	gdk_event_free (event);
+}
+
 static void
 quit_calendar_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
diff --git a/modules/calendar/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h
index a69b82f645..b79bc6baaf 100644
--- a/modules/calendar/e-cal-shell-view-actions.h
+++ b/modules/calendar/e-cal-shell-view-actions.h
@@ -89,6 +89,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "event-reply-all")
 #define E_SHELL_WINDOW_ACTION_EVENT_OCCURRENCE_MOVABLE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-occurrence-movable")
+#define E_SHELL_WINDOW_ACTION_EVENT_MEETING_NEW(window) \
+	E_SHELL_WINDOW_ACTION ((window), "event-meeting-new")
 
 /* Memo Pad Actions */
 #define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_FORWARD(window) \
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index a112c171b8..11b6ec243d 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -26,6 +26,26 @@
 #include "calendar/gui/calendar-view-factory.h"
 #include "widgets/menus/gal-view-factory-etable.h"
 
+#define CHECK_NB	5
+
+/* be compatible with older e-d-s for MeeGo */
+#ifndef ETC_TIMEZONE
+#  define ETC_TIMEZONE        "/etc/timezone"
+#  define ETC_TIMEZONE_MAJ    "/etc/TIMEZONE"
+#  define ETC_RC_CONF         "/etc/rc.conf"
+#  define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock"
+#  define ETC_CONF_D_CLOCK    "/etc/conf.d/clock"
+#  define ETC_LOCALTIME       "/etc/localtime"
+#endif
+
+static const gchar * files_to_check [CHECK_NB] = {
+        ETC_TIMEZONE,
+        ETC_TIMEZONE_MAJ,
+        ETC_SYSCONFIG_CLOCK,
+        ETC_CONF_D_CLOCK,
+        ETC_LOCALTIME
+};
+
 static void
 cal_shell_view_process_completed_tasks (ECalShellView *cal_shell_view,
                                         gboolean config_changed)
@@ -416,6 +436,71 @@ e_cal_shell_view_private_init (ECalShellView *cal_shell_view,
 		G_CALLBACK (cal_shell_view_notify_view_id_cb), NULL);
 }
 
+static void
+system_timezone_monitor_changed (GFileMonitor *handle,
+                                 GFile *file,
+                                 GFile *other_file,
+                                 GFileMonitorEvent event,
+                                 gpointer user_data)
+{
+        ECalShellView  *view = E_CAL_SHELL_VIEW (user_data);
+	ECalShellViewPrivate *priv = view->priv;
+	ECalShellContent *cal_shell_content;
+	icaltimezone *timezone = NULL, *current_zone = NULL;
+	EShellSettings *settings;
+	EShellBackend *shell_backend;
+	EShell *shell;
+	ECalModel *model;
+	const gchar *location;
+
+	if (event != G_FILE_MONITOR_EVENT_CHANGED &&
+	    event != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT &&
+	    event != G_FILE_MONITOR_EVENT_DELETED &&
+	    event != G_FILE_MONITOR_EVENT_CREATED)
+		return;
+
+	cal_shell_content = priv->cal_shell_content;
+	model = e_cal_shell_content_get_model (cal_shell_content);
+	current_zone = e_cal_model_get_timezone (model);
+	timezone = e_cal_util_get_system_timezone ();
+
+	if (!g_strcmp0 (icaltimezone_get_tzid (timezone), icaltimezone_get_tzid (current_zone)))
+		return;
+
+	shell_backend = e_shell_view_get_shell_backend ((EShellView *) view);
+	shell = e_shell_backend_get_shell (shell_backend);
+	settings = e_shell_get_shell_settings (shell);
+	location = icaltimezone_get_location (timezone);
+	if (location == NULL)
+		location = "UTC";
+
+	g_object_set (settings, "cal-timezone-string", location, NULL);
+	g_object_set (settings, "cal-timezone", timezone, NULL);
+}
+
+static void
+init_timezone_monitors (ECalShellView *view)
+{
+	ECalShellViewPrivate *priv = view->priv;
+	gint i;
+
+	for (i = 0; i < CHECK_NB; i++) {
+		GFile *file;
+
+		file = g_file_new_for_path (files_to_check[i]);
+		priv->monitors[i] = g_file_monitor_file (file,
+				G_FILE_MONITOR_NONE,
+				NULL, NULL);
+		g_object_unref (file);
+
+		if (priv->monitors[i])
+			g_signal_connect (G_OBJECT (priv->monitors[i]),
+					"changed",
+					G_CALLBACK (system_timezone_monitor_changed),
+					view);
+	}
+}
+
 void
 e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 {
@@ -575,6 +660,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 		(GHookFunc) e_cal_shell_view_update_search_filter,
 		cal_shell_view);
 
+	init_timezone_monitors (cal_shell_view);
 	e_cal_shell_view_actions_init (cal_shell_view);
 	e_cal_shell_view_update_sidebar (cal_shell_view);
         e_cal_shell_view_update_search_filter (cal_shell_view);
@@ -598,6 +684,11 @@ void
 e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 {
 	ECalShellViewPrivate *priv = cal_shell_view->priv;
+	gint i;
+
+	/* Calling calendar's save state from here, because it is too late in its dispose */
+	if (priv->cal_shell_content)
+		e_cal_shell_content_save_state (priv->cal_shell_content);
 
 	/* Calling calendar's save state from here, because it is too late in its dispose */
 	if (priv->cal_shell_content)
@@ -627,6 +718,11 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 		g_object_unref (priv->taskpad_activity);
 		priv->taskpad_activity = NULL;
 	}
+
+	for (i = 0; i < CHECK_NB; i++) {
+		g_object_unref (priv->monitors[i]);
+		priv->monitors[i] = NULL;
+	}
 }
 
 void
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index c69ffc7605..71a191f332 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <libecal/e-cal-time-util.h>
+#include <libecal/e-cal-system-timezone.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-sexp.h>
@@ -81,6 +82,7 @@
 
 /* ETable Specifications */
 #define ETSPEC_FILENAME		"e-calendar-table.etspec"
+#define CHECK_NB	5
 
 G_BEGIN_DECLS
 
@@ -114,6 +116,8 @@ struct _ECalShellViewPrivate {
 	EActivity *calendar_activity;
 	EActivity *memopad_activity;
 	EActivity *taskpad_activity;
+
+        GFileMonitor *monitors[CHECK_NB];
 };
 
 void		e_cal_shell_view_private_init
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 36ee86354d..218bd7d4da 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -283,6 +283,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	GtkAction *action;
 	GList *list, *iter;
 	gboolean sensitive;
+	gboolean visible;
 	guint32 state;
 	gint n_selected;
 
@@ -305,9 +306,6 @@ cal_shell_view_update_actions (EShellView *shell_view)
 
 	if (e_shell_get_express_mode(e_shell_get_default())) {
 		GtkWidget *widget, *item;
-		GdkScreen *scr;
-		gint monitor;
-		GdkRectangle rect;
 
 		/* Hack: Get rid of New and Send/Receive in toolbar
 		 * while in express mode */
@@ -323,18 +321,8 @@ cal_shell_view_update_actions (EShellView *shell_view)
 
 		item = e_shell_window_get_managed_widget (
 			shell_window, "/main-toolbar/send-receive");
-		gtk_widget_hide(item);
-
-		scr = gdk_screen_get_default ();
-		monitor = gdk_screen_get_monitor_at_window (
-			scr, gtk_widget_get_window (GTK_WIDGET (shell_window)));
-		gdk_screen_get_monitor_geometry (scr, monitor, &rect);
-
-		gtk_window_set_default_size (
-			GTK_WINDOW (shell_window), rect.width, rect.height);
-		gtk_window_set_decorated (
-			GTK_WINDOW (shell_window), FALSE);
-
+		if (item)
+			gtk_widget_hide(item);
 	}
 	cal_shell_content = priv->cal_shell_content;
 	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
@@ -477,6 +465,10 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	action = ACTION (EVENT_REPLY_ALL);
 	sensitive = (n_selected == 1) && is_meeting;
 	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_MEETING_NEW);
+	visible = itip_addresses_get_default() != NULL;
+	gtk_action_set_visible (action, visible);
 }
 
 static void
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index 03be9f74ab..6a302889a4 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -71,6 +71,11 @@ connman_monitor (DBusConnection *connection G_GNUC_UNUSED,
 	DBusError error = DBUS_ERROR_INIT;
 	DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
+	if (!dbus_message_has_path (message, CM_DBUS_PATH) ||
+	    !dbus_message_has_interface (message, CM_DBUS_INTERFACE) ||
+	    !dbus_message_has_member (message, "StateChanged"))
+		goto err_exit;
+
 	if (!dbus_message_get_args (message, &error,
 				    DBUS_TYPE_STRING, &value,
 				    DBUS_TYPE_INVALID))
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index eb2cbf679e..ecd592f32b 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -616,7 +616,7 @@ mail_shell_content_set_folder (EMailReader *reader,
 	key = STATE_KEY_GROUP_BY_THREADS;
 	value = g_key_file_get_boolean (key_file, group_name, key, &error);
 	if (error != NULL) {
-		value = FALSE;
+		value = TRUE;
 		g_clear_error (&error);
 	}
 
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 491d5068d7..ac736a0a67 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -201,8 +201,8 @@ guess_screen_width (EMailShellSidebar *sidebar)
 				screen, gtk_widget_get_window (toplevel));
 		else {
 			/* We don't know in which monitor the window manager
-			 * will put us.  So we will just use the geometry of the
-			 * first monitor.
+			 * will put us.  So we will just use the geometry of
+			 * the first monitor.
 			 */
 			monitor = 0;
 		}
@@ -218,18 +218,21 @@ guess_screen_width (EMailShellSidebar *sidebar)
 }
 
 static void
-mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
+mail_shell_sidebar_size_request (GtkWidget *widget,
+                                 GtkRequisition *requisition)
 {
 	/* We override the normal size-request handler so that we can
-	 * spit out a treeview with a suitable width.  We measure the length
-	 * of a typical string and use that as the requisition's width.
+	 * spit out a treeview with a suitable width.  We measure the
+	 * length of a typical string and use that as the requisition's
+	 * width.
 	 *
-	 * EMFolderTreeClass, our parent class, is based on GtkTreeView, which
-	 * doesn't really have a good way of figuring out a minimum width for
-	 * the tree.  This is really GTK+'s fault at large, as it only has
-	 * "minimum size / allocated size", instead of "minimum size / preferred
-	 * size / allocated size".  Hopefully the extended-layout branch of GTK+
-	 * will get merged soon and then we can remove this crap.
+	 * EMFolderTreeClass, our parent class, is based on GtkTreeView,
+	 * which doesn't really have a good way of figuring out a minimum
+	 * width for the tree.  This is really GTK+'s fault at large, as
+	 * it only has "minimum size / allocated size", instead of
+	 * "minimum size / preferred size / allocated size".  Hopefully
+	 * the extended-layout branch of GTK+ will get merged soon and
+	 * then we can remove this crap.
 	 */
 
 	EMailShellSidebar *sidebar;
@@ -256,7 +259,6 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
 
 	/* Thickness of frame shadow plus some slack for padding. */
 	border = 2 * style->xthickness + 4;
-
 	sidebar_width = ink_rect.width + border;
 	sidebar_width = MIN (sidebar_width, screen_width / 4);
 	requisition->width = MAX (requisition->width, sidebar_width);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 9bac5dfb4a..3ba34e68c0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1160,7 +1160,7 @@ static GtkRadioActionEntry mail_filter_entries[] = {
 	  MAIL_FILTER_LAST_5_DAYS_MESSAGES },
 
 	{ "mail-filter-messages-not-junk",
-	  "mail-mark-notjunk",
+	  "mail-mark-not-junk",
 	  N_("Messages Not Junk"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index 34f6e6c8f9..cc7552e27c 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -109,8 +109,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "mail-mark-important")
 #define E_SHELL_WINDOW_ACTION_MAIL_MARK_JUNK(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-mark-junk")
-#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOTJUNK(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk")
+#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOT_JUNK(window) \
+	E_SHELL_WINDOW_ACTION ((window), "mail-mark-not-junk")
 #define E_SHELL_WINDOW_ACTION_MAIL_MARK_READ(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-mark-read")
 #define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index c817653d20..7c0f39ea31 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -36,6 +36,7 @@
 
 #include "em-composer-prefs.h"
 #include "composer/e-msg-composer.h"
+#include "shell/e-shell-utils.h"
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -550,6 +551,14 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		signature_tree_view, "selected",
 		widget, "signature");
 
+	/* Sanitize the dialog for Express mode */
+	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+					       "chkOutlookFilenames",
+					       "vboxTopPosting",
+					       "labelAlerts",
+					       "chkPromptEmptySubject",
+					       NULL);
+
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs (ec, client);
 	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 4fb910a396..11795a92d8 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -42,6 +42,7 @@
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-util-private.h"
 #include "widgets/misc/e-charset-combo-box.h"
+#include "shell/e-shell-utils.h"
 
 #include "e-mail-label-manager.h"
 #include "e-mail-reader-utils.h"
@@ -1214,6 +1215,15 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs);
 	g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs);
 
+	/* Sanitize the dialog for Express mode */
+	e_shell_hide_widgets_for_express_mode (shell, prefs->builder,
+					       "hboxReadTimeout",
+					       "hboxMailSizeLimit",
+					       "hboxShrinkAddresses",
+					       "magic_spacebar_checkbox",
+					       "hboxEnableSearchFolders",
+					       NULL);
+
 	/* get our toplevel widget */
 	target = em_config_target_new_prefs(ec, prefs->gconf);
 	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index fa917e7e79..6cc2e80d4d 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -46,6 +46,7 @@
 #include "mail/em-config.h"
 #include <mail/em-junk.h>
 #include <gconf/gconf-client.h>
+#include "shell/e-shell.h"
 
 #ifndef BOGOFILTER_BINARY
 #define BOGOFILTER_BINARY "/usr/bin/bogofilter"
@@ -383,6 +384,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
 GtkWidget *
 org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
+	EShell *shell;
 	GtkWidget *check;
 	guint n_rows;
 
@@ -398,7 +400,13 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 	gtk_table_attach (
 		GTK_TABLE (data->parent), check,
 		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
-	gtk_widget_show (check);
-	return (GtkWidget *)check;
+
+	shell = e_shell_get_default ();
+	if (e_shell_get_express_mode (shell))
+		gtk_widget_hide (check);
+	else
+		gtk_widget_show (check);
+
+	return check;
 }
 
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index f52cd8c4ae..537831a07e 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -41,6 +41,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "mail/em-config.h"
+#include "shell/e-shell.h"
 
 #include <gconf/gconf-client.h>
 
@@ -920,6 +921,7 @@ use_remote_tests_cb (GtkWidget *widget, gpointer data)
 GtkWidget *
 org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
+	EShell *shell;
 	GtkWidget *check, *vbox, *label;
 	gchar *text = g_strdup_printf ("    <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
 	guint n_rows;
@@ -942,7 +944,13 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 	gtk_table_attach (
 		GTK_TABLE (data->parent), vbox,
 		0, 1, n_rows, n_rows+1, 0, 0, 0, 0);
-	gtk_widget_show_all (vbox);
-	return (GtkWidget *)vbox;
+
+	shell = e_shell_get_default ();
+	if (e_shell_get_express_mode (shell))
+		gtk_widget_hide (vbox);
+	else
+		gtk_widget_show_all (vbox);
+
+	return vbox;
 }
 
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index e232df4dea..904e630487 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -67,12 +67,21 @@ startup_wizard_close (void) {
 void
 startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
 {
+	EShell *shell;
 	GtkWidget *start_page;
 	GtkLabel  *start_page_label;
 	GConfClient *client;
 	GSList *accounts;
 	EConfig *config;
 	EMAccountEditor *emae;
+	const gchar *req_view;
+
+	shell = e_shell_get_default ();
+	req_view = e_shell_get_startup_view (shell);
+
+	if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) {
+		return;
+	}
 
 	client = gconf_client_get_default ();
 	accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL);
@@ -85,7 +94,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
 		return;
 	}
 
-	if (e_shell_get_express_mode (e_shell_get_default ())) {
+	if (e_shell_get_express_mode (shell)) {
 		start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE);
 		gtk_widget_show (start_page);
 
diff --git a/po/bn.po b/po/bn.po
index a784c09cf5..2240cebcf4 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -549,12 +549,12 @@ msgstr "জ�যাবার"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
-msgstr "Yahoo"
+msgstr "ইয়াহ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+msgstr "গাদ�-গাদ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
@@ -14898,7 +14898,7 @@ msgstr "সমর�থিত অন�সন�ধানের স�থান"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using distinguished name (DN)"
-msgstr "Distinguished name"
+msgstr "বিশেষ নাম ব�যবহার করে (DN)"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
 msgid "Using email address"
@@ -15167,7 +15167,7 @@ msgstr "আজকের তারিখ নির�বাচন কর�ন"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select _Date"
-msgstr "তারিখ নির�বাচন কর�ন(_D)"
+msgstr "তারিখ নির�বাচন কর�ন (_D)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "Select a specific date"
@@ -16329,7 +16329,7 @@ msgstr "মূল মাপ প�রদর�শন করা হবে (_O)"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
-msgstr "Hello Python"
+msgstr "হ�যালো পাইথন"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
@@ -18119,79 +18119,79 @@ msgstr "%A"
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
-msgstr "%1$A %2$H:%3$M"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
-msgstr "%1$A %2$H:%3$M:%4$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:274
 msgid "%A %l:%M %p"
-msgstr "%1$A %2$l:%3$M %4$p"
+msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
-msgstr "%1$A %2$l:%3$M:%4$S %5$p"
+msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
-msgstr "1$%A, %2$B %3$e"
+msgstr "%A, %B %e"
 
 #. 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:293
 msgid "%A, %B %e %H:%M"
-msgstr "%1$A, %2$B %3$e %4$H:%5$M"
+msgstr "%A, %B %e %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:297
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%1$A, %2$B %3$e %4$H:%5$M:%6$S"
+msgstr "%A, %B %e %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:302
 msgid "%A, %B %e %l:%M %p"
-msgstr "%1$A, %2$B %3$e %4$l:%5$M %6$p"
+msgstr "%A, %B %e %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:306
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%1$A, %2$B %3$e %4$l:%5$M:%6$S %7$p"
+msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
-msgstr "%1$A, %2$B %3$e, %4$Y"
+msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%1$A, %2$B %3$e, %4$Y %5$H:%6$M"
+msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%1$A, %2$B %3$e, %4$Y %5$H:%6$M:%7$S"
+msgstr "%A, %B %e, %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:326
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%1$A, %2$B %3$e, %4$Y %5$l:%6$M %7$p"
+msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
@@ -19158,12 +19158,12 @@ msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
+"যদি অন�রোধ করা হয় তবে সবসময় অন�য অংশ হতে সংয�ক�তি কর�ন �বং প�লেইন টেক�সট "
+"পার�ট দেখান।"
 
 #: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr "Show s_uppressed HTML parts as attachments"
+msgstr "সংয�ক�তি হিসেবে HTML পার�ট দেখান (_u)"
 
 #: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
@@ -19171,7 +19171,7 @@ msgstr "HTML মোড (_M)"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
-msgstr "Evolution Profiler"
+msgstr "Evolution প�রোফাইলার"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Profile data events in Evolution (for developers only)."
@@ -19302,7 +19302,7 @@ msgstr "পোর�ট (_o):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Public FTP"
-msgstr "Public FTP"
+msgstr "পাবলিক FTP"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
@@ -19314,15 +19314,15 @@ msgstr "প�রকাশনার হার (_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
-msgstr "Secure FTP (SSH)"
+msgstr "সিকিউর FTP (SSH)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
-msgstr "Secure WebDAV (HTTPS)"
+msgstr "সিকিউর WebDAV (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
-msgstr "সার�ভারের ধরন (_t): "
+msgstr "সার�ভিসের ধরন (_t):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Sources"
@@ -20121,7 +20121,7 @@ msgstr "অফলাইন অবস�থায় ব�যবহারের জ
 
 #: ../shell/e-shell-view.c:724
 msgid "The EShellBackend for this shell view"
-msgstr "The EShellBackend for this shell view"
+msgstr "শেল ভিউয়ের জন�য EShellBackend"
 
 #: ../shell/e-shell-view.c:739
 msgid "Shell Content Widget"
@@ -20129,7 +20129,7 @@ msgstr "বিষয়বস�ত�/কন�টেন�ট"
 
 #: ../shell/e-shell-view.c:740
 msgid "The content widget appears in a shell window's right pane"
-msgstr "The content widget appears in a shell window's right pane"
+msgstr "বিষয়বস�ত� উইজেড শেল উইন�ডোর ডান প�যানে দেখায় যায়"
 
 #: ../shell/e-shell-view.c:756
 msgid "Shell Sidebar Widget"
@@ -20141,7 +20141,7 @@ msgstr "অফলাইন অবস�থায় ব�যবহারের জ
 
 #: ../shell/e-shell-view.c:772
 msgid "Shell Taskbar Widget"
-msgstr "Shell Taskbar Widget"
+msgstr "শেল টাস�কবার উইজেড"
 
 #: ../shell/e-shell-view.c:773
 msgid "The taskbar widget appears at the bottom of a shell window"
@@ -20867,7 +20867,7 @@ msgstr "FILE"
 
 #: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
-msgstr "Specify session management ID"
+msgstr "সেশন ম�যানেজমেন�ট ID স�নির�দিষ�টভাবে উল�লেখ কর�ন"
 
 #: ../smclient/eggsmclient.c:233
 msgid "ID"
@@ -20875,7 +20875,7 @@ msgstr "ID"
 
 #: ../smclient/eggsmclient.c:254
 msgid "Session management options:"
-msgstr "Session management options:"
+msgstr "সেশন ম�যানেজমেন�ট অপশন:"
 
 #: ../smclient/eggsmclient.c:255
 msgid "Show session management options"
@@ -21191,7 +21191,7 @@ msgstr "à¦�ই সারà§�টিফিকেটটি ইতিমধà§�যেà
 
 #: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
-msgstr "%1$d/%2$m/%3$Y"
+msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:414
@@ -21331,7 +21331,7 @@ msgstr "�ক�সটেনশন"
 #: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
-msgstr "%1$s = %2$s"
+msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
@@ -21551,7 +21551,7 @@ msgstr "কাজ"
 
 #: ../widgets/misc/e-action-combo-box.c:389
 msgid "A GtkRadioAction"
-msgstr "A GtkRadioAction"
+msgstr "�কটি GtkRadioAction"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21718,7 +21718,7 @@ msgstr "%s খোলার জন�য ক�লিক কর�ন"
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
-msgstr "%1$B %2$Y"
+msgstr "%B %Y"
 
 #: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
@@ -21895,7 +21895,7 @@ msgstr ""
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
 msgid "Evolution Import Assistant"
-msgstr "Evolution Import Assistant"
+msgstr "Evolution ইম�পোর�ট অ�যাসিস�টেন�ট"
 
 #: ../widgets/misc/e-import-assistant.c:1196
 #: ../widgets/misc/e-import-assistant.c:1248
diff --git a/po/es.po b/po/es.po
index cc813daaeb..71cc7d4a5b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,8 +17,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: 2010-05-26 13:29+0000\n"
-"PO-Revision-Date: 2010-05-26 17:52+0200\n"
+"POT-Creation-Date: 2010-05-25 07:44+0000\n"
+"PO-Revision-Date: 2010-05-25 18:07+0200\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"
@@ -3996,6 +3996,7 @@ msgid "Appoint_ment"
 msgstr "_Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:528
+#| msgid "Print this message"
 msgid "Print this event"
 msgstr "Imprime este acontecimiento"
 
@@ -4190,6 +4191,7 @@ msgid "Memo"
 msgstr "Nota"
 
 #: ../calendar/gui/dialogs/memo-editor.c:156
+#| msgid "Print the list of memos"
 msgid "Print this memo"
 msgstr "Imprimir esta nota"
 
@@ -4577,6 +4579,7 @@ msgid "Task Details"
 msgstr "Detalles"
 
 #: ../calendar/gui/dialogs/task-editor.c:368
+#| msgid "Print the list of tasks"
 msgid "Print this task"
 msgstr "Imprimir esta tarea"
 
@@ -4785,12 +4788,14 @@ msgstr "Ninguna"
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:829
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
@@ -6376,68 +6381,81 @@ msgstr "Importador inteligente del calendario de Evolution"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1237
+#| msgctxt "New"
+#| msgid "M_eeting"
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunión"
 
 #: ../calendar/importers/icalendar-importer.c:926
 #: ../calendar/importers/icalendar-importer.c:1237
+#| msgid "Events"
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Acontecimiento"
 
 #: ../calendar/importers/icalendar-importer.c:929
 #: ../calendar/importers/icalendar-importer.c:1238
+#| msgid "Task"
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarea"
 
 #: ../calendar/importers/icalendar-importer.c:932
 #: ../calendar/importers/icalendar-importer.c:1239
+#| msgid "Memo"
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Nota"
 
 #: ../calendar/importers/icalendar-importer.c:941
+#| msgid "It has recurrences."
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "tiene repeticiones"
 
 #: ../calendar/importers/icalendar-importer.c:946
+#| msgid "This and Prior Instances"
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "es una instancia"
 
 #: ../calendar/importers/icalendar-importer.c:951
+#| msgid "It has alarms."
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "tiene alertas"
 
 #: ../calendar/importers/icalendar-importer.c:956
+#| msgid "%s attachment"
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "tiene adjuntos"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:969
+#| msgid "Public"
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Pública"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:972
+#| msgid "Private"
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
 #: ../calendar/importers/icalendar-importer.c:975
+#| msgid "Confidential"
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
 #: ../calendar/importers/icalendar-importer.c:979
+#| msgid "Classification"
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Clasificación"
@@ -6446,12 +6464,14 @@ msgstr "Clasificación"
 #. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:984
 #: ../calendar/importers/icalendar-importer.c:1278
+#| msgid "Summary"
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumen"
 
 #. Translators: Appointment's location
 #: ../calendar/importers/icalendar-importer.c:990
+#| msgid "Location"
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Lugar"
@@ -6460,36 +6480,42 @@ msgstr "Lugar"
 #. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:998
 #: ../calendar/importers/icalendar-importer.c:1274
+#| msgid "Start"
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Empieza"
 
 #. Translators: 'Due' like the time due a task should be finished
 #: ../calendar/importers/icalendar-importer.c:1009
+#| msgid "Due"
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Vence"
 
 #. Translators: Appointment's end time
 #: ../calendar/importers/icalendar-importer.c:1021
+#| msgid "End"
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Termina"
 
 #. Translators: Appointment's categories
 #: ../calendar/importers/icalendar-importer.c:1031
+#| msgid "Categories"
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
 #: ../calendar/importers/icalendar-importer.c:1055
+#| msgid "Completed"
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
 #: ../calendar/importers/icalendar-importer.c:1063
+#| msgid "URL"
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
@@ -6497,6 +6523,7 @@ msgstr "URL"
 #. Translators: Appointment's organizer
 #: ../calendar/importers/icalendar-importer.c:1074
 #: ../calendar/importers/icalendar-importer.c:1077
+#| msgid "Organizer"
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
@@ -6504,17 +6531,20 @@ msgstr "Organizador"
 #. Translators: Appointment's attendees
 #: ../calendar/importers/icalendar-importer.c:1097
 #: ../calendar/importers/icalendar-importer.c:1100
+#| msgid "Attendees"
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
 #: ../calendar/importers/icalendar-importer.c:1114
+#| msgid "Description"
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Descripción"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
 #: ../calendar/importers/icalendar-importer.c:1270
+#| msgid "Type"
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -9080,7 +9110,7 @@ msgstr "Asunto"
 msgid "Mailer"
 msgstr "Transporte"
 
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1218
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
@@ -10343,25 +10373,25 @@ msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1568
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Su mensaje para %s acerca de «%s» se ha leído el «%s»"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1616
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de entrega para: «%s»"
 
-#: ../mail/em-composer-utils.c:1945
+#: ../mail/em-composer-utils.c:1947
 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:1992
+#: ../mail/em-composer-utils.c:1994
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10369,15 +10399,15 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2136
+#: ../mail/em-composer-utils.c:2138
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-composer-utils.c:2317
+#: ../mail/em-composer-utils.c:2319
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../mail/em-composer-utils.c:2318
+#: ../mail/em-composer-utils.c:2320
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
@@ -12173,12 +12203,14 @@ msgstr "Seleccione la carpeta en la que importar"
 
 #. Translators: Column header for a message subject
 #: ../mail/importers/evolution-mbox-importer.c:372
+#| msgid "Subject"
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Asunto"
 
 #. Translators: Column header for a message From address
 #: ../mail/importers/evolution-mbox-importer.c:376
+#| msgid "From"
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
@@ -12682,6 +12714,7 @@ msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
 #: ../mail/mail-config.ui.h:120
+#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de _firma:"
 
@@ -12702,6 +12735,7 @@ msgid "Signatures"
 msgstr "Firmas"
 
 #: ../mail/mail-config.ui.h:125
+#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo de firma:"
 
@@ -13845,6 +13879,9 @@ msgstr ""
 "subcarpetas."
 
 #: ../mail/mail.error.xml.h:110
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada."
@@ -15953,6 +15990,7 @@ msgstr ""
 "predeterminado."
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#| msgid "Do you want to make Evolution your default e-mail client?"
 msgid "Do you want to make Evolution your default email client?"
 msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
 
@@ -18110,17 +18148,16 @@ msgid "Itip Formatter"
 msgstr "Formateador iTip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#| msgid ""
-#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
-#| "delegate &quot;{1}&quot;?"
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
 msgstr "«{0}» ha delegado la reunión. ¿Quiere añadir al delegado «{1}»?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Esta reunión se ha delegado"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
@@ -20569,14 +20606,17 @@ msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
 #: ../smime/lib/e-cert.c:639
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 con cifrado RSA"
 
 #: ../smime/lib/e-cert.c:642
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 con cifrado RSA"
 
 #: ../smime/lib/e-cert.c:645
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 con cifrado RSA"
 
@@ -21158,6 +21198,7 @@ msgstr ""
 "botón «Atrás»."
 
 #: ../widgets/misc/e-import-assistant.c:874
+#| msgid "Preview the message to be printed"
 msgid "Preview data to be imported"
 msgstr "Vista previa de los datos para importar"
 
diff --git a/po/ko.po b/po/ko.po
index d36473aecf..1ebf1d7a2f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -30,14 +30,15 @@
 #   - task -> ìž‘ì—…
 # - 기타 용어
 #   - online/offline -> 연결 �태/연결 중지 �태
+#   - Anjal -> 앤제�
 #
-#: ../shell/main.c:508
+#: ../shell/main.c:479
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
 "POT-Creation-Date: 2010-03-13 19:03+0900\n"
-"PO-Revision-Date: 2010-03-13 19:05+0900\n"
+"PO-Revision-Date: 2010-03-20 16:52+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -288,7 +289,8 @@ msgstr "기��"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
+#: ../shell/main.c:112
 msgid "Birthday"
 msgstr "��"
 
@@ -1159,7 +1161,7 @@ msgid "Telex"
 msgstr "텔렉스"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:818
+#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "�위"
 
@@ -1440,13 +1442,14 @@ msgstr "홈페�지"
 msgid "Web Log"
 msgstr "웹로그"
 
+#. Create the default Person addressbook
 #. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1518,7 +1521,7 @@ msgstr "연�처를 찾� 수 없습니다"
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
-msgstr "연�처 ID가 �미 있습니다"
+msgstr "연�처 아�디가 �미 있습니다"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
@@ -2336,11 +2339,11 @@ msgid "_Dismiss"
 msgstr "해제(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
+#: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
@@ -3780,236 +3783,236 @@ msgstr " (기한 "
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:247
 msgid "Could not save attachments"
 msgstr "첨부를 저장할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:509
+#: ../calendar/gui/dialogs/comp-editor.c:510
 msgid "Could not update object"
 msgstr "오브�트를 업��트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:605
 msgid "Edit Appointment"
 msgstr "약� 편집"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:612
 #, c-format
 msgid "Meeting - %s"
 msgstr "모임 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Appointment - %s"
 msgstr "약� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:619
+#: ../calendar/gui/dialogs/comp-editor.c:620
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "할당한 작업 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:622
 #, c-format
 msgid "Task - %s"
 msgstr "ìž‘ì—… - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Memo - %s"
 msgstr "메모 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "No Summary"
 msgstr "요약 없�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:751
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "본래 항목� 유지하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 msgid "Click here to close the current window"
 msgstr "현재 창� 닫으려면 여기를 누르십시오"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
 msgid "Copy the selection"
 msgstr "선�한 사항� 복사합니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1451
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:959
 msgid "Cut the selection"
 msgstr "선�한 사항� 잘�냅니다"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "선�한 사항� 삭제합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:967
 msgid "Click here to view help available"
 msgstr "해당 �움�� 보려면 여기를 누르십시오"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:971
 msgid "Paste the clipboard"
 msgstr "�립보드�서 붙여 넣습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to save the current window"
 msgstr "현재 창� 저장하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1563
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1579
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "모든 �스트 선�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "_Classification"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1612
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "파�(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1619
+#: ../calendar/gui/dialogs/comp-editor.c:1030
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "�움�(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1037
 msgid "_Insert"
 msgstr "넣기(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 #: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "옵션(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1654
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 #: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "첨부(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1063
 msgid "Click here to attach a file"
 msgstr "파�� 첨부하려면 여기를 누르십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1071
 msgid "_Categories"
 msgstr "분류(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 msgid "Toggles whether to display categories"
 msgstr "분류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 msgid "Time _Zone"
 msgstr "표준 시간대(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "Toggles whether the time zone is displayed"
 msgstr "표준 시간대 항목� 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Pu_blic"
 msgstr "공개(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Classify as public"
 msgstr "공개로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 msgid "_Private"
 msgstr "개� 정보(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1099
 msgid "Classify as private"
 msgstr "개� 정보로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "_Confidential"
 msgstr "비밀(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "Classify as confidential"
 msgstr "비밀로 분류"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "R_ole Field"
 msgstr "역할 항목(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "Toggles whether the Role field is displayed"
 msgstr "역할 항목� 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "_RSVP"
 msgstr "�답바람(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1124
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "�답요청 항목� 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "_Status Field"
 msgstr "�태 항목(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1132
 msgid "Toggles whether the Status field is displayed"
 msgstr "�태 항목� 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "_Type Field"
 msgstr "종류 항목(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1140
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "참�� 종류를 표시할지 토글합니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "최근 문서(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../calendar/gui/dialogs/comp-editor.c:1684
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
+#: ../calendar/gui/dialogs/comp-editor.c:1739
 msgid "Save"
 msgstr "저장"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2015
-#: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2955
+#: ../calendar/gui/dialogs/comp-editor.c:2016
+#: ../calendar/gui/dialogs/comp-editor.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:2956
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업��트가 �착하면 � 항목� 대해 바� 사항� 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2986
 msgid "Unable to use current version!"
 msgstr "현재 버전� 사용할 수 없습니다!"
 
@@ -4968,12 +4971,12 @@ msgid "Default Client"
 msgstr "기본 프로그램"
 
 #: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:825
+#: ../shell/e-shell.c:867
 msgid "Shell Settings"
 msgstr "셸 설정"
 
 #: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:826
+#: ../shell/e-shell.c:868
 msgid "Application-wide settings"
 msgstr "프로그램 전체 설정"
 
@@ -4984,7 +4987,7 @@ msgstr "프로그램 전체 설정"
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
 #: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
@@ -5840,7 +5843,7 @@ msgid "Member"
 msgstr "구성�"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-cal-shell-content.c:397
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5932,7 +5935,7 @@ msgstr "100%"
 #: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-cal-shell-content.c:357
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -6129,7 +6132,7 @@ msgstr "한 달 단위로 달력 보기"
 msgid "calendar view for one or more weeks"
 msgstr "주 단위로 달력 보기"
 
-#: ../calendar/gui/gnome-cal.c:2148
+#: ../calendar/gui/gnome-cal.c:2167
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -8135,7 +8138,7 @@ msgid "Save as..."
 msgstr "다른 �름으로 저장..."
 
 #: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "파�� 첨부합니다"
 
@@ -8383,7 +8386,7 @@ msgid "Save draft"
 msgstr "임시 저장"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "� 메시지를 다시 보지 않기(_D)."
@@ -8539,6 +8542,256 @@ msgstr "복구(_R)"
 msgid "_Save Draft"
 msgstr "임시 저장(_S)"
 
+#: ../capplet/anjal-settings-main.c:202
+msgid "Run Anjal in a window"
+msgstr "앤제�� 창� 실행"
+
+# 옵션 설명
+#: ../capplet/anjal-settings-main.c:203
+msgid "Make Anjal the default email client"
+msgstr "앤제�� 기본 메� ���언트로 사용합니다"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:210
+msgid "ID of the socket to embed in"
+msgstr "�함할 소켓� ID"
+
+# option argument
+#: ../capplet/anjal-settings-main.c:211
+msgid "socket"
+msgstr "<소켓>"
+
+#: ../capplet/anjal-settings-main.c:225
+msgid "Anjal email client"
+msgstr "앤제� 메� 프로그램"
+
+#: ../capplet/settings/mail-view.c:244
+msgid "New Tab"
+msgstr "새 탭"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "전체 �름� 입력하십시오."
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "전�메� 주소를 입력하십시오."
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr "입력한 전�메� 주소가 올바르지 않습니다."
+
+#: ../capplet/settings/mail-account-view.c:224
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">개� �세 정보:</span>"
+
+#: ../capplet/settings/mail-account-view.c:229
+msgid "Name:"
+msgstr "�름:"
+
+#: ../capplet/settings/mail-account-view.c:238
+msgid "Email address:"
+msgstr "전�메� 주소:"
+
+#: ../capplet/settings/mail-account-view.c:248
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">받기 정보:</span>"
+
+#: ../capplet/settings/mail-account-view.c:253
+#: ../capplet/settings/mail-account-view.c:303
+msgid "Server type:"
+msgstr "서버 종류:"
+
+#: ../capplet/settings/mail-account-view.c:262
+#: ../capplet/settings/mail-account-view.c:312
+msgid "Server address:"
+msgstr "서버 주소:"
+
+#: ../capplet/settings/mail-account-view.c:272
+#: ../capplet/settings/mail-account-view.c:322
+msgid "Username:"
+msgstr "사용��름:"
+
+#: ../capplet/settings/mail-account-view.c:281
+#: ../capplet/settings/mail-account-view.c:331
+msgid "Use encryption:"
+msgstr "암호화 사용:"
+
+#: ../capplet/settings/mail-account-view.c:286
+#: ../capplet/settings/mail-account-view.c:336
+msgid "never"
+msgstr "사용 안 함"
+
+#: ../capplet/settings/mail-account-view.c:298
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">보내기 정보:</span>"
+
+#: ../capplet/settings/mail-account-view.c:355
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr "전�메� 프로그램� 사용하려면 계정� 준비해야 합니다. 아래� 전�메� 주소와 암호를 입력하면 ��으로 필요한 설정� 만듭니다. ��으로 할 수 없는 경우�는 서버 정보를 �접 입력해야 할 수� 있습니다."
+
+#: ../capplet/settings/mail-account-view.c:357
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr "전�메� 설정� ��으로 만들 수 없습니다. 아래� 설정� �접 입력하십시오. 앞�서 입력한 내용� 따� �부 설정� 채워져 있지만 설정� 바꿔야 �작합니다."
+
+#: ../capplet/settings/mail-account-view.c:359
+msgid "You can specify more options to configure the account."
+msgstr "계정� 설정하려면 다른 옵션� � 지정할 수 있습니다."
+
+#: ../capplet/settings/mail-account-view.c:361
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr "�제 메� 보내기 설정� 필요합니다. ��으로 �부 설정� 채워져 있지만, 올바른지 확�하십시오."
+
+#: ../capplet/settings/mail-account-view.c:362
+msgid "You can specify your default settings for your account."
+msgstr "계정� 설정 기본값� 지정할 수 있습니다."
+
+# assistant�서 현재 �태
+#: ../capplet/settings/mail-account-view.c:363
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr "�제 설정� 확�하십시오. 확�� �나면 서버� 연결해서 메�� 가져옵니다."
+
+#: ../capplet/settings/mail-account-view.c:378
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../mail/mail-config.ui.h:58
+msgid "Identity"
+msgstr "신� 정보"
+
+#: ../capplet/settings/mail-account-view.c:378
+msgid "Next - Receiving mail"
+msgstr "다� - 메� 받기"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Receiving mail"
+msgstr "메� 받기"
+
+#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:380
+msgid "Next - Sending mail"
+msgstr "다� - 메� 보내기"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Back - Identity"
+msgstr "뒤로 - 신�"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Next - Receiving options"
+msgstr "다� - 받기 옵션"
+
+#: ../capplet/settings/mail-account-view.c:380
+msgid "Receiving options"
+msgstr "받기 옵션"
+
+#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Back - Receiving mail"
+msgstr "뒤로 - 메� 받기"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Sending mail"
+msgstr "메� 보내기"
+
+#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:383
+msgid "Next - Review account"
+msgstr "다� - 계정 정보 검토"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Next - Defaults"
+msgstr "뒤로 - 기본값"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Back - Receiving options"
+msgstr "뒤로 - 받기 옵션"
+
+#: ../capplet/settings/mail-account-view.c:383
+#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "기본값"
+
+#: ../capplet/settings/mail-account-view.c:383
+msgid "Back - Sending mail"
+msgstr "뒤로 - 메� 보내기"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Review account"
+msgstr "계정 정보 검토"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Finish"
+msgstr "마치기"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Back - Sending"
+msgstr "뒤로 - 보내기"
+
+#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-settings-view.c:266
+msgid "Close Tab"
+msgstr "탭 닫기"
+
+#: ../capplet/settings/mail-account-view.c:729
+msgid "Account Wizard"
+msgstr "계정 마법사"
+
+#: ../capplet/settings/mail-capplet-shell.c:284
+msgid "Evolution account assistant"
+msgstr "�볼루션 계정 �우미"
+
+#: ../capplet/settings/mail-capplet-shell.c:320
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "전�메� 설정"
+
+#: ../capplet/settings/mail-capplet-shell.c:334
+msgid "Quit"
+msgstr "�내기"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
+#: ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "� 컴퓨터"
+
+#: ../capplet/settings/mail-settings-view.c:148
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "수정"
+
+#: ../capplet/settings/mail-settings-view.c:150
+msgid "Add a new account"
+msgstr "새 계정 추가"
+
+#: ../capplet/settings/mail-settings-view.c:185
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span size=\"large\" weight=\"bold\">계정 관리</span>"
+
+#: ../capplet/settings/mail-settings-view.c:276
+msgid "Settings"
+msgstr "설정"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
 msgstr "달력 행사 알림"
@@ -8547,8 +8800,8 @@ msgstr "달력 행사 알림"
 msgid "Evolution Alarm Notify"
 msgstr "�볼루션 알림"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
-#: ../shell/e-shell-window-private.c:258
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "�볼루션"
 
@@ -8556,7 +8809,7 @@ msgstr "�볼루션"
 msgid "Evolution Mail and Calendar"
 msgstr "�볼루션 메� � 달력"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "그룹웨어 모�"
 
@@ -8564,6 +8817,10 @@ msgstr "그룹웨어 모�"
 msgid "Manage your email, contacts and schedule"
 msgstr "전�메�, 연�처, �정� 관리합니다"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "전�메� 계정 설정"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "주소 카드"
@@ -8775,8 +9032,8 @@ msgstr "기� 단계"
 msgid "Messages"
 msgstr "메시지"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1430
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "� 창� 닫습니다"
 
@@ -9122,11 +9379,11 @@ msgid "I_nclude threads"
 msgstr "글타래 �함(_N)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "받는 메�"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "보내는 메�"
 
@@ -9269,23 +9526,23 @@ msgstr "아�콘 보기"
 msgid "List View"
 msgstr "목� 보기"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
+#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
 msgstr "�커스 추�"
 
-#: ../mail/e-mail-browser.c:739
+#: ../mail/e-mail-browser.c:742
 msgid "Shell Module"
 msgstr "셸 모드"
 
-#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
 msgid "The mail shell backend"
 msgstr "메� 셸 백엔드"
 
-#: ../mail/e-mail-browser.c:750
+#: ../mail/e-mail-browser.c:753
 msgid "Show Deleted"
 msgstr "삭제한 메시지 보기"
 
-#: ../mail/e-mail-browser.c:751
+#: ../mail/e-mail-browser.c:754
 msgid "Show deleted messages"
 msgstr "삭제한 메시지 보기"
 
@@ -9355,24 +9612,24 @@ msgid "Color"
 msgstr "색"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2582
+#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
 #: ../modules/mail/e-mail-shell-view-private.c:963
 msgid "Inbox"
 msgstr "받� 편지함"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
 msgid "Outbox"
 msgstr "보낼 편지함"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:574
 msgid "Templates"
@@ -9474,23 +9731,6 @@ msgstr ""
 "\n"
 "��를 옮기는 �안 잠시 기다리십시오..."
 
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-migrate.c:2949 ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
-#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
-msgid "On This Computer"
-msgstr "� 컴퓨터"
-
 #: ../mail/e-mail-migrate.c:3031
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
@@ -10137,7 +10377,7 @@ msgstr "추가 작업 메시지 플래그"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "암호화 없�"
@@ -10145,7 +10385,7 @@ msgstr "암호화 없�"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS 암호화"
@@ -10153,17 +10393,17 @@ msgstr "TLS 암호화"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
-#: ../mail/em-account-editor.c:595
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 사용 약관"
 
-#: ../mail/em-account-editor.c:602
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -10176,25 +10416,25 @@ msgstr ""
 "��하실 경우 체� 단추� 체�하십시오.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "없�"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "사용 안 함"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "항�"
 
-#: ../mail/em-account-editor.c:968
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "메시지마다 물어보기"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1705 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "없�"
@@ -10213,11 +10453,6 @@ msgstr ""
 "\n"
 "시작하려면 \"앞으로\"를 누르십시오."
 
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2200
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "신� 정보"
-
 #: ../mail/em-account-editor.c:2065
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10227,7 +10462,7 @@ msgstr ""
 "아래� �름과 메� 주소를 입력하십시오. 그 아래� 있는 \"추가\" 필드는 메�"
 "� 보낼 때 정보를 추가하지 않고 싶으면 채우지 않아� �니다."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2237
+#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "메� 받기"
@@ -10236,7 +10471,7 @@ msgstr "메� 받기"
 msgid "Please configure the following account settings."
 msgstr "다� 계정 설정� 하십시오."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2714
+#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
 msgid "Sending Email"
 msgstr "메� 보내기"
 
@@ -10279,37 +10514,33 @@ msgstr ""
 "설정� 저장하려면 \"�용\"� 누르십시오."
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2524
+#: ../mail/em-account-editor.c:2520
 msgid "Check for _new messages every"
 msgstr "새 메� 확�(_N), 매"
 
-#: ../mail/em-account-editor.c:2532
+#: ../mail/em-account-editor.c:2528
 msgid "minu_tes"
 msgstr "분(_T)"
 
-#: ../mail/em-account-editor.c:2778 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "기본값"
-
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
+#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
 msgstr "새 메� 확�"
 
-#: ../mail/em-account-editor.c:3414
+#: ../mail/em-account-editor.c:3418
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:3414
+#: ../mail/em-account-editor.c:3418
 msgid "Evolution Account Assistant"
 msgstr "�볼루션 계정 �우미"
 
@@ -10658,18 +10889,20 @@ msgid "Folder _name:"
 msgstr "�� �름(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
+#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
 #: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "검색 ��"
 
 # VFolder�서 맞는 게 아무것� 없� 경우 마지막 fallback
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "해당 없�"
 
-#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
+#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "�어들�는 중..."
 
@@ -10995,12 +11228,12 @@ msgstr "서버를 선�하십시오."
 msgid "No server has been selected"
 msgstr "서버를 선�하지 않았습니다"
 
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "메시지 필터"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "%s�서 온 메�"
@@ -12080,7 +12313,7 @@ msgid "Select folder to import into"
 msgstr "어� ��로 가져올 지 선�하십시오"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:243
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버�리 메�박스 (mbox)"
 
@@ -13872,7 +14105,7 @@ msgstr "%Y년 %b %e�"
 msgid "Select all visible messages"
 msgstr "모든 보�는 메시지 선�"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:722
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
 msgid "Shell Backend"
 msgstr "셸 백엔드"
 
@@ -17413,10 +17646,6 @@ msgstr "사용� 지정 알림"
 msgid "Add   "
 msgstr "추가   "
 
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "수정"
-
 #: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "메시지 �태"
@@ -19222,15 +19451,15 @@ msgstr "최초� 계정 설정� 할 때 안내합니다."
 msgid "Setup Assistant"
 msgstr "설정 �우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "�볼루션 설정 �우미"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "환�합니다"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
@@ -19243,26 +19472,26 @@ msgstr ""
 "\n"
 "계�하시려면 \"앞으로\" 단추를 누르십시오. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../widgets/misc/e-import-assistant.c:385
 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:168
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "%s�서:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:185
 msgid "Importing files"
 msgstr "파� 가져오기"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:248
 msgid "Importing data."
 msgstr "��터를 가져오는 중입니다."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:250
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -19401,31 +19630,39 @@ msgid "Default window width"
 msgstr "기본 창 너비"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "고� 모드 사용"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "�터넷� 통해 HTTP � 보안 HTTP를 사용할 때 프�시 설정� 사용합니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "아주 간략한 사용� �터페�스를 사용하는 플래그."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP 프�시 암호"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP 프�시 사용� �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "맨 처� 시작할 때 기본으로 보여줄 컴�넌트 ID 혹� 별명."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19437,63 +19674,63 @@ msgstr ""
 "고, 암호는 gnome-keyring�나 .gnome2_private/Evolution 암호 파��서 가져옵니"
 "다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "최초 첨부 보기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "최초 파� 선� ��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 대화 ��� 최초 ��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
 "첨부 모� 위젯� 최초 보기 모드. \"0\"� 아�콘 보기, \"1\"� 목� 보기."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "최근 업그레�드한 설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "연결 중지 �태�서 사용할 때 �기화할 ��� 경로 목�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "프�시 없� 호스트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP 프�시� ��할 때 넘길 암호."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "프�시 설정 모드"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "SOCKS 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "보안 HTTP 프�시 호스트 �름"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "보안 HTTP 프�시 �트"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19504,50 +19741,50 @@ msgstr ""
 "\"시스템 설정 사용\", \"프�시 없�\", \"수� 프�시 설정 사용\", \"�� 설"
 "정 URL� 들어 있는 프�시 설정 사용\"입니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "보조 모�� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "개발 버전 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "연결 중지 �태�서 시작"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "�태 표시줄� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "�볼루션� 설정 버전, major/minor/configuration 단계. (예를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr "메� 창� 기본 가로 좌표."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
 msgstr "메� 창� 기본 세로 좌표."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "메� 창� 기본 높�, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "메� 창� 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "보조 모�� 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19555,19 +19792,19 @@ msgstr ""
 "최근 업그레�드한 �볼루션� 설정 버전, major/minor/configuration 단계. (예"
 "를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "보안 HTTP 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "SOCKS 프�시로 사용할 컴퓨터 �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19575,7 +19812,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/http_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19583,7 +19820,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/secure_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19591,7 +19828,7 @@ msgstr ""
 "프�시로 �용할 \"/apps/evolution/shell/network_config/socks_host\"�서 지정"
 "한 컴퓨터� �트."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19600,7 +19837,7 @@ msgstr ""
 "창 단추� 모양새. \"text\", \"icons\", \"both\", \"toolbar\" 사용 가능. "
 "\"toolbar\"� 경우 그놈 �구 모� 설정� 따�서 단추� 모양새가 결정�니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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 "
@@ -19612,56 +19849,56 @@ msgstr ""
 "드카드 사용), IP 주소(IPv4와 IPv6 모� 가능), 네트마스�를 사용한 네트워� 주"
 "소(192.168.0.0/24와 같�) 모� 사용할 수 있습니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "�구 모�� 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "프�시 설정 값� 들어 있는 URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "HTTP 프�시 사용"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP 프�시� ��할 때 넘길 사용� �름."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "�볼루션� 처�� 연결 �태가 아니� 연결 중지 �태로 시작하는지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "창� 최대화할지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "보조 모�� 표시할지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "�태 표시줄� 표시할지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "�구 모�� 표시할지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "�볼루션 개발 버전� 경고 대화 ��를 건너 뛸지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "창 단추를 표시해야 하는지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "창 단추 모양새"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "창 단추 표시할지 여부"
 
@@ -19715,421 +19952,421 @@ msgstr "�구 모� 표시"
 msgid "Whether the switcher is visible"
 msgstr "전환 단추를 표시할지 여부"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:245
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:222
+#: ../shell/e-shell-utils.c:247
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:268
 msgid "All Files (*)"
 msgstr "모든 파� (*)"
 
-#: ../shell/e-shell-view.c:674
+#: ../shell/e-shell-view.c:675
 msgid "Switcher Action"
 msgstr "전환 단추 �작"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:676
 msgid "The switcher action for this shell view"
 msgstr "� 셸 뷰� 전환 단추 �작"
 
-#: ../shell/e-shell-view.c:690
+#: ../shell/e-shell-view.c:691
 msgid "Page Number"
 msgstr "페�지 번호"
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:692
 msgid "The notebook page number of the shell view"
 msgstr "셸 뷰� 노트� 페�지 번호"
 
-#: ../shell/e-shell-view.c:707
+#: ../shell/e-shell-view.c:708
 msgid "Search Rule"
 msgstr "검색 규칙"
 
-#: ../shell/e-shell-view.c:708
+#: ../shell/e-shell-view.c:709
 msgid "Criteria for the current search results"
 msgstr "현재 검색 결과� 검색 기준"
 
-#: ../shell/e-shell-view.c:723
+#: ../shell/e-shell-view.c:724
 msgid "The EShellBackend for this shell view"
 msgstr "� 셸 뷰� EShellBackend"
 
-#: ../shell/e-shell-view.c:738
+#: ../shell/e-shell-view.c:739
 msgid "Shell Content Widget"
 msgstr "셸 내용 위젯"
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:740
 msgid "The content widget appears in a shell window's right pane"
 msgstr "셸 창� 오른쪽 창� 나타나는 내용 위젯"
 
-#: ../shell/e-shell-view.c:755
+#: ../shell/e-shell-view.c:756
 msgid "Shell Sidebar Widget"
 msgstr "셸 보조 모� 위젯"
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:757
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr "셸 창� 왼쪽 창� 나타나는 보조 모� 위젯"
 
-#: ../shell/e-shell-view.c:771
+#: ../shell/e-shell-view.c:772
 msgid "Shell Taskbar Widget"
 msgstr "셸 �구 모� 위젯"
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:773
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr "셸 창� 아래� 나타나는 �구 모� 위젯"
 
-#: ../shell/e-shell-view.c:787
+#: ../shell/e-shell-view.c:788
 msgid "Shell Window"
 msgstr "ì…¸ ì°½"
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:789
 msgid "The window to which the shell view belongs"
 msgstr "셸 뷰가 들어 있는 창"
 
-#: ../shell/e-shell-view.c:804
+#: ../shell/e-shell-view.c:805
 msgid "The key file holding widget state data"
 msgstr "위젯 �태 ��터가 들어 있는 키 파�"
 
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:820
 msgid "The title of the shell view"
 msgstr "셸 뷰� 제목"
 
-#: ../shell/e-shell-view.c:833
+#: ../shell/e-shell-view.c:834
 msgid "Current View ID"
 msgstr "현재 뷰 ID"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:835
 msgid "The current GAL view ID"
 msgstr "현재 GAL 뷰 ID"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr@googlegroups.com>"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "�볼루션 웹사�트"
 
-#: ../shell/e-shell-window-actions.c:1223
+#: ../shell/e-shell-window-actions.c:1224
 msgid "Bug Buddy is not installed."
 msgstr "버그버디를 설치하지 않았습니다."
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Bug Buddy could not be run."
 msgstr "버그버디를 실행할 수 없습니다."
 
-#: ../shell/e-shell-window-actions.c:1327
+#: ../shell/e-shell-window-actions.c:1343
 msgid "GNOME Pilot is not installed."
 msgstr "그놈 파�럿� 설치하지 않았습니다."
 
-#: ../shell/e-shell-window-actions.c:1329
+#: ../shell/e-shell-window-actions.c:1345
 msgid "GNOME Pilot could not be run."
 msgstr "그놈 파�럿� 실행할 수 없습니다."
 
-#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "�볼루션� 대한 정보를 보여�니다"
 
-#: ../shell/e-shell-window-actions.c:1428
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Close Window"
 msgstr "창 닫기(_C)"
 
-#: ../shell/e-shell-window-actions.c:1435
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Contents"
 msgstr "차례(_C)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Open the Evolution User Guide"
 msgstr "�볼루션 사용� 안내서를 엽니다"
 
-#: ../shell/e-shell-window-actions.c:1463
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Evolution _FAQ"
 msgstr "�볼루션 �주 하는 질문(_F)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "�주하는 질문 웹페�지를 엽니다"
 
-#: ../shell/e-shell-window-actions.c:1470
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "저장한 암호 초기화(_F)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "저장한 모든 암호를 초기화합니다"
 
-#: ../shell/e-shell-window-actions.c:1477
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "가져오기(_M)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr "다른 프로그램�서 ��터를 가져옵니다"
 
-#: ../shell/e-shell-window-actions.c:1484
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "새 창(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
 msgstr "� 뷰를 새 창� 만듭니다"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Configure Evolution"
 msgstr "�볼루션 설정"
 
-#: ../shell/e-shell-window-actions.c:1505
+#: ../shell/e-shell-window-actions.c:1521
 msgid "_Quick Reference"
 msgstr "짧� 참조 문서(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Show Evolution's shortcut keys"
 msgstr "�볼루션 바로 가기 키를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Exit the program"
 msgstr "프로그램� �냅니다"
 
-#: ../shell/e-shell-window-actions.c:1519
+#: ../shell/e-shell-window-actions.c:1535
 msgid "_Advanced Search..."
 msgstr "고급 검색(_A)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Construct a more advanced search"
 msgstr "� 복잡한 고급 검색� 수행합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Clear the current search parameters"
 msgstr "현재 검색 파�미터를 지�니다"
 
-#: ../shell/e-shell-window-actions.c:1533
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Edit Saved Searches..."
 msgstr "저장한 검색 편집(_E)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Manage your saved searches"
 msgstr "저장한 검색� 관리합니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Click here to change the search type"
 msgstr "검색 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../shell/e-shell-window-actions.c:1547
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
 # tooltip
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Execute the current search parameters"
 msgstr "현재 검색 파�미터를 실행합니다"
 
-#: ../shell/e-shell-window-actions.c:1554
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Save Search..."
 msgstr "검색 저장(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Save the current search parameters"
 msgstr "현재 검색 파�미터를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:1568
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Send / _Receive"
 msgstr "보내고 받기(_R)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Send queued items and retrieve new items"
 msgstr "밀린 메�� 보내고 새 메�� 받습니다"
 
-#: ../shell/e-shell-window-actions.c:1575
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
 msgstr "버그 제보(_B)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "버그버디로 버그제보를 합니다"
 
-#: ../shell/e-shell-window-actions.c:1582
+#: ../shell/e-shell-window-actions.c:1598
 msgid "GNOME Pilot _Synchronization..."
 msgstr "그놈 파�럿 �기화(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Set up GNOME Pilot configuration"
 msgstr "그놈 파�럿� 설정합니다"
 
-#: ../shell/e-shell-window-actions.c:1589
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "연결 중지 �태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into offline mode"
 msgstr "�볼루션� 연결 중지 �태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1596
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Online"
 msgstr "연결 �태 작업(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into online mode"
 msgstr "�볼루션� 연결 �태로 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1642
 msgid "Lay_out"
 msgstr "배치(_O)"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
-#: ../shell/e-shell-window-actions.c:1640
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Search"
 msgstr "검색(_S)"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Switcher Appearance"
 msgstr "전환 단추 모양(_S)"
 
-#: ../shell/e-shell-window-actions.c:1661
+#: ../shell/e-shell-window-actions.c:1677
 msgid "_Window"
 msgstr "ì°½(_W)"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show Side _Bar"
 msgstr "보조 모� 보기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show the side bar"
 msgstr "보조 모�� 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Buttons"
 msgstr "단추 보기(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show the switcher buttons"
 msgstr "전환 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show _Status Bar"
 msgstr "�태 표시줄 보기(_S)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Show the status bar"
 msgstr "�태 표시줄� 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Show _Tool Bar"
 msgstr "�구 모� 보기(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Show the tool bar"
 msgstr "�구 모�� 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1738
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Icons Only"
 msgstr "아�콘만(_I)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons only"
 msgstr "아�콘만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Text Only"
 msgstr "�스트만(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with text only"
 msgstr "�스트만 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Icons _and Text"
 msgstr "아�콘 � �스트(_A)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with icons and text"
 msgstr "아�콘과 �스트를 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Tool_bar Style"
 msgstr "�구 모� 모양(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "�스�톱 �구 모� 설정� 사용해 창 단추를 표시합니다"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Define Views..."
 msgstr "보기 지정..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Create or edit views"
 msgstr "보기를 만들거나 편집합니다"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Save Custom View..."
 msgstr "사용� 보기 저장..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Save current custom view"
 msgstr "현재 사용� 정� 뷰를 저장합니다"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1801
 msgid "C_urrent View"
 msgstr "현재 보기(_U)"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1811
 msgid "Custom View"
 msgstr "사용� 보기"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Current view is a customized view"
 msgstr "현재 뷰는 사용� 정� 뷰입니다"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1823
 msgid "Change the page settings for your current printer"
 msgstr "현재 프린터� 페�지 설정� 바꿉니다"
 
-#: ../shell/e-shell-window-actions.c:2127
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell-window-actions.c:2332
+#: ../shell/e-shell-window-actions.c:2413
 msgid "Execute these search parameters"
 msgstr "� 검색 파�미터를 실행합니다"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:555
+#: ../shell/e-shell-window-private.c:567
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - �볼루션"
@@ -20150,11 +20387,11 @@ msgstr "사용 중� 셸 뷰� �름"
 msgid "The shell window's EFocusTracker"
 msgstr "셸 창� EFocusTracker"
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:761
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
 msgid "Geometry"
 msgstr "�기 � 위치"
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:762
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
 msgid "Initial window geometry string"
 msgstr "창 �기 � 위치 지정 문�열"
 
@@ -20203,46 +20440,46 @@ msgid "The shell window's GtkUIManager"
 msgstr "셸 창� GtkUIManager"
 
 # 주�: 다른 메시지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../shell/e-shell.c:210
+#: ../shell/e-shell.c:212
 msgid "Preparing to go offline..."
 msgstr "연결 중지 �태로 ��하는 준비 중..."
 
 # 주�: 다른 메시지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../shell/e-shell.c:260
+#: ../shell/e-shell.c:262
 msgid "Preparing to go online..."
 msgstr "연결 �태로 ��하는 준비 중..."
 
 # 주�: 다른 메시지� �부로 쓰�다. 문장으로 번역하지 � 것.
-#: ../shell/e-shell.c:328
+#: ../shell/e-shell.c:330
 msgid "Preparing to quit..."
 msgstr "�낼 준비 중..."
 
-#: ../shell/e-shell.c:777
+#: ../shell/e-shell.c:819
 msgid "Module Directory"
 msgstr "모듈 디렉터리"
 
-#: ../shell/e-shell.c:778
+#: ../shell/e-shell.c:820
 msgid "The directory from which to load EModules"
 msgstr "EModule� �어들� 디렉터리"
 
-#: ../shell/e-shell.c:793
+#: ../shell/e-shell.c:835
 msgid "Network Available"
 msgstr "네트워� 사용 가능"
 
-#: ../shell/e-shell.c:794
+#: ../shell/e-shell.c:836
 msgid "Whether the network is available"
 msgstr "네트워�가 사용 가능한지 여부"
 
-#: ../shell/e-shell.c:809 ../widgets/misc/e-online-button.c:134
+#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "연결 중"
 
-#: ../shell/e-shell.c:810
+#: ../shell/e-shell.c:852
 msgid "Whether the shell is online"
 msgstr "셸� 연결 중�지 여부"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:167
+#: ../shell/main.c:168
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20276,7 +20513,7 @@ msgstr ""
 "우리가 열심히 �한 결과물� 잘 � 주시길 바�니다. 그리고 개발�\n"
 "기여해 주시기를 목� 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:191
+#: ../shell/main.c:192
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20284,55 +20521,59 @@ msgstr ""
 "고맙습니다\n"
 "�볼루션 팀\n"
 
-#: ../shell/main.c:198
+#: ../shell/main.c:199
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "�볼루션 시작할 때 특정 컴�넌트를 활성화합니다"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr "해당 �기와 위치를 메� 창� �용합니다"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "연결 �태�서 시작"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:330
+msgid "Start in \"express\" mode"
+msgstr "\"고�\" 모드�서 시작"
+
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
 msgstr "강제로 �볼루션� �냅니다"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:337
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 �볼루션 1.4�서 다시 옮겨 옵니다"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴�넌트� 디버깅 출력� 파�로 보냅니다."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "플러그�� 아무것� �어들�지 않습니다."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전�메�, 연�처, 작업� 미리 보기 창� 사용하지 않습니다."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "뒤� ��� 쓴 URI와 파��름� 가져옵니다."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:350
 msgid "Request a running Evolution process to quit"
 msgstr "실행 중� �볼루션 프로세스� �내는 요청� 합니다"
 
-#: ../shell/main.c:494
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �볼루션 개�정보 관리 � 메� ���언트"
 
-#: ../shell/main.c:520
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21276,28 +21517,28 @@ msgstr[0] "첨부 저장"
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "모� 저장(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:326
 msgid "A_dd Attachment..."
 msgstr "첨부파� 추가(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "내부�서 보기(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:639
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\"�서 열기"
 
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:642
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "� 첨부를 \"%s\"�서 열기"
diff --git a/po/pt.po b/po/pt.po
index 7805e58ac3..9bc1f3306c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 02:54+0000\n"
-"PO-Revision-Date: 2010-03-16 02:30+0000\n"
+"POT-Creation-Date: 2010-03-18 01:08+0000\n"
+"PO-Revision-Date: 2010-03-18 01:10+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -8541,7 +8541,7 @@ msgid "Please enter your email address."
 msgstr "Introduza o seu endereço de email."
 
 #: ../capplet/settings/mail-account-view.c:58
-msgid "The email addres you have entered is invalid."
+msgid "The email address you have entered is invalid."
 msgstr "O endereço de email introduzido é inválido."
 
 #: ../capplet/settings/mail-account-view.c:224
@@ -8603,12 +8603,13 @@ msgstr ""
 #: ../capplet/settings/mail-account-view.c:357
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried  to make a start with the details you just "
+"enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
 "Não é possível inferir as definições necessárias para configurar "
-"automaticamente o seu email. Introduza a informação abaixo. Tentou-se "
-"começar com os detalhes que introduziu mas poderá ter de os alterar."
+"automaticamente o seu email. Introduza a informação abaixo. Foi realizada "
+"uma tentativa de preenchimento com os detalhes que introduziu mas poderá ter "
+"de os alterar."
 
 #: ../capplet/settings/mail-account-view.c:359
 msgid "You can specify more options to configure the account."
@@ -19512,9 +19513,8 @@ msgstr "Bem Vindo"
 
 #: ../plugins/startup-wizard/startup-wizard.c:118
 msgid ""
-"ZZZ ! Welcome to Evolution. The next few screens will allow Evolution to "
-"connect to your email accounts, and to import files from other "
-"applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 1d3c74eb2f..d079f10c62 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@
 # translation of evolution to Russian
 # Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
-#: ../shell/main.c:512
+#: ../shell/main.c:479
 # Valek Filippov <frob@df.ru>, 2000.
 # Dmitry Mastrukov  <dmitry@taurussoft.org>, 2001-2003.
 # Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010.
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 15:51+0200\n"
-"PO-Revision-Date: 2010-02-24 17:25+0200\n"
+"POT-Creation-Date: 2010-03-19 14:50+0200\n"
+"PO-Revision-Date: 2010-03-19 17:14+0200\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,12 +36,12 @@ msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr ""
-"Контакт � таким адре�ом уже �уще�твует. Добавить еще одну карточку � таким "
+"Контакт � таким адре�ом уже �уще�твует. Добавить ещё одну карточку � таким "
 "же адре�ом?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "�дре� '{0}' уже �уще�твует."
+msgstr "�дре� «{0}» уже �уще�твует."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
@@ -112,15 +112,15 @@ msgstr "Ответ Ñ�ервера LDAP не Ñ�одержит поддерживÐ
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
-msgstr "�екоторые функции могут работать некорректно � вашим текущим �ервером"
+msgstr "�екоторые функции могут работать некорректно � текущим �ервером"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
-msgstr "Работа компонента адре�ной книги Evolution неожиданно завершила�ь."
+msgstr "Работа адре�ной книги Evolution неожиданно завершила�ь."
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Выбранное вами изображение �лишком велико. Изменить размер перед �охранением?"
+msgstr "Выбранное изображение �лишком велико. Изменить размер и �охранить его?"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid ""
@@ -199,7 +199,7 @@ msgstr "У ва� недо�таточно прав дл� удалени� ко
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "Вы изменили �тот контакт. Сохранить изменени�?"
+msgstr "Контакт был изменён. Сохранить �ти изменени�?"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
@@ -265,7 +265,8 @@ msgstr "Годовщина"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
+#: ../shell/main.c:112
 msgid "Birthday"
 msgstr "День рождени�"
 
@@ -289,7 +290,7 @@ msgstr "Контакт"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -410,7 +411,7 @@ msgstr "_День рождени�:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 #: ../calendar/gui/dialogs/event-page.c:823
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "_Календарь:"
 
@@ -452,7 +453,7 @@ msgstr "_Офи�:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
-msgstr "�б.�щик:"
+msgstr "_�бонент�кий �щик:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
@@ -513,8 +514,8 @@ msgstr "Им�"
 #: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
-#: ../widgets/text/e-text.c:3430
+#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
+#: ../widgets/text/e-text.c:3442
 msgid "Editable"
 msgstr "Измен�емый"
 
@@ -559,7 +560,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
 msgid "Error adding contact"
 msgstr "Ошибка добавлени� контакта"
 
@@ -596,20 +597,20 @@ msgid "Changed"
 msgstr "Изменено"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор контактов - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "Please select an image for this contact"
 msgstr "Выберите изображение дл� �того контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
 msgid "_No image"
 msgstr "_�ет изображени�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -617,23 +618,23 @@ msgstr ""
 "Данные контакта неверны:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "неверный формат «%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "неверный формат %s«%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» пу�т"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
 msgid "Invalid contact."
 msgstr "�еверный контакт."
 
@@ -665,11 +666,11 @@ msgstr "Оболочка"
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
 #: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
-msgstr ""
+msgstr "Синглетон EShell"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
-msgstr "Др."
+msgstr "Д-р."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
@@ -706,11 +707,11 @@ msgstr "Г-н"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "Mrs."
-msgstr ""
+msgstr "Г-жа"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
-msgstr ""
+msgstr "Г-жа"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
@@ -718,19 +719,19 @@ msgstr "Ст."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
-msgstr "Им�:"
+msgstr "_Им�:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
-msgstr "Фамили�:"
+msgstr "_Фамили�:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
-msgstr "Отче�тво:"
+msgstr "_Отче�тво:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
-msgstr "Суффик�:"
+msgstr "О_кончание:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
@@ -841,9 +842,9 @@ msgstr "Объединить контакты"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
 msgstr "Любое поле �одержит"
 
@@ -886,14 +887,14 @@ msgstr "Пои�к прерван"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
 #: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
 #: ../modules/calendar/e-memo-shell-content.c:607
 #: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3359
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
-#: ../widgets/text/e-text.c:3297
+#: ../widgets/table/e-table.c:3367
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
+#: ../widgets/text/e-text.c:3309
 msgid "Model"
 msgstr "Модель"
 
@@ -923,10 +924,9 @@ msgid "Select all visible contacts"
 msgstr "Выбрать в�е видимые контакты"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
 msgid "Shell View"
-msgstr "Выбор обзора: %s"
+msgstr "Вид оболочки"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
@@ -934,29 +934,29 @@ msgstr "И�точник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1283
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "Вы дей�твительно хотите удалить �ти �пи�ки контактов?"
+msgstr "Дей�твительно удалить �ти �пи�ки контактов?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1287
 msgid "Are you sure you want to delete this contact list?"
-msgstr "Вы дей�твительно хотите удалить �тот �пи�ок контактов?"
+msgstr "Дей�твительно удалить �тот �пи�ок контактов?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1291
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Вы дей�твительно хотите удалить �пи�ок контактов (%s)?"
+msgstr "Дей�твительно удалить �тот �пи�ок контактов (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Are you sure you want to delete these contacts?"
-msgstr "Вы дей�твительно хотите удалить �ти контакты?"
+msgstr "Дей�твительно удалить �ти контакты?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1301
 msgid "Are you sure you want to delete this contact?"
-msgstr "Вы дей�твительно хотите удалить �тот контакт?"
+msgstr "Дей�твительно удалить �тот контакт?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1305
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr "Вы дей�твительно хотите удалить �тот контакт (%s)?"
+msgstr "Дей�твительно удалить �тот контакт (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1460
 #, c-format
@@ -965,7 +965,7 @@ msgid ""
 "Do you really want to display all of these contacts?"
 msgstr ""
 "Открытие %d контакта также откроет %d новых окон.\n"
-"Вы дей�твительно хотите отобразить в�е �ти контакты?"
+"Дей�твительно отобразить в�е �ти контакты?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1465
 msgid "_Don't Display"
@@ -1131,7 +1131,7 @@ msgid "Telex"
 msgstr "Телек�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:748
+#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1152,8 +1152,8 @@ msgstr "Веб-�айт"
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
-#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
+#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Width"
 msgstr "Ширина"
 
@@ -1165,8 +1165,8 @@ msgstr "Ширина"
 #: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
-#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
+#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
+#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
 msgid "Height"
 msgstr "Вы�ота"
 
@@ -1409,13 +1409,14 @@ msgstr "Домашн�� �траница"
 msgid "Web Log"
 msgstr "Веб-журнал"
 
+#. Create the default Person addressbook
 #. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1477,7 +1478,7 @@ msgstr "Свой контакт не определён"
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
-msgstr "Отказ в до�тупе"
+msgstr "В до�тупе отказано"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
@@ -1500,11 +1501,11 @@ msgstr "Протокол не поддерживает��"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
 #: ../calendar/gui/print.c:2651
 msgid "Canceled"
-msgstr "Отменено"
+msgstr "Отменена"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
@@ -1601,7 +1602,7 @@ msgid ""
 msgstr ""
 "С �тим запро�ом �овпало больше карточек, чем \n"
 "на�троено дл� выдачи в �ервере или Evolution.\n"
-"Пожалуй�та, точнее определите у�лови� пои�ка, или\n"
+"Определите у�лови� пои�ка точнее, или\n"
 "поднимите ограничени� дл� выдачи результатов в\n"
 "на�тройках �ервера каталога дл� �той адре�ной книги."
 
@@ -1614,7 +1615,7 @@ msgid ""
 msgstr ""
 "Врем� и�полнени� запро�а превы�ило ограничени� �ервера\n"
 "или ограничени�, определённого дл� �той адре�ной книги.\n"
-"Пожалуй�та, точнее определите у�лови� пои�ка или\n"
+"Определите у�лови� пои�ка точнее или\n"
 "поднимите ограничени� времени в на�тройках �ервера\n"
 "каталога или в на�тройках �той адре�ной книги."
 
@@ -1637,31 +1638,31 @@ msgstr "Этот запро� завершил�� � ошибкой."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:244
+#: ../addressbook/gui/widgets/eab-gui-util.c:247
 msgid "Select Address Book"
 msgstr "Выберите адре�ную книгу"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:310
 msgid "list"
 msgstr "�пи�ок"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contact to"
 msgstr "Переме�тить контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:434
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contact to"
 msgstr "Копировать контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:442
 msgid "Move contacts to"
 msgstr "Переме�тить контакты в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Copy contacts to"
 msgstr "Копировать контакты в"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "Вид карточек"
 
@@ -1832,16 +1833,16 @@ msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"Е�ли добавить �одержательную Сводку к в�трече, получател�м будет проще "
-"пон�ть, чему будет по�в�щена в�треча."
+"Добавление пон�тной �водки к в�трече позволит получател�м пон�ть, чему "
+"по�в�щена в�треча."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Е�ли добавить �одержательную Сводку к задаче, получател�м будет проще "
-"пон�ть, чему по�в�щена �та задача."
+"Добавление пон�тной �водки к задаче позволит получател�м пон�ть, чему "
+"по�в�щена задача."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1849,7 +1850,7 @@ msgstr "В�� информаци� из �тих заметок будет бе
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr "В�� информаци� из �той заметки будет удалена безвозвратно."
+msgstr "В�� информаци� из �той заметки будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
@@ -1859,7 +1860,7 @@ msgstr "В�е �ведени� об �тих в�тречах будут без
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "В�� информаци� о �тих задачах будет безвозвратно удалена."
+msgstr "В�� информаци� об �тих задачах будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
@@ -1879,65 +1880,65 @@ msgstr "В�е �ведени� об �той задаче будут безво
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Вы дей�твительно хотите удалить задачу '{0}'?"
+msgstr "Дей�твительно удалить задачу '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Вы дей�твительно хотите удалить в�тречу � заголовком '{0}'?"
+msgstr "Дей�твительно удалить в�тречу � заголовком '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Вы дей�твительно хотите удалить в�тречу � заголовком '{0}'?"
+msgstr "Дей�твительно удалить в�тречу � заголовком '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Вы дей�твительно хотите удалить заметку '{0}'?"
+msgstr "Дей�твительно удалить заметку '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Вы дей�твительно хотите удалить в�тречи {0}?"
+msgstr "Дей�твительно удалить (в�треч: {0})?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Вы дей�твительно хотите удалить заметки {0}?"
+msgstr "Дей�твительно удалить (заметок: {0})?"
 
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Вы дей�твительно хотите удалить задачи {0}?"
+msgstr "Дей�твительно удалить (задач: {0})?"
 
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
-msgstr "Вы дей�твительно хотите удалить �ту в�тречу?"
+msgstr "Дей�твительно удалить �ту в�тречу?"
 
 #: ../calendar/calendar.error.xml.h:23
 #: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
-msgstr "Вы дей�твительно хотите удалить �то �обрание?"
+msgstr "Дей�твительно удалить �то �обрание?"
 
 #: ../calendar/calendar.error.xml.h:24
 #: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "Вы дей�твительно хотите удалить �ту заметку?"
+msgstr "Дей�твительно удалить �ту заметку?"
 
 #: ../calendar/calendar.error.xml.h:25
 #: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "Вы дей�твительно хотите удалить �ту задачу?"
+msgstr "Дей�твительно удалить �ту задачу?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Вы дей�твительно хотите �охранить заметку без �водки?"
+msgstr "Дей�твительно �охранить заметку без �водки?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Вы дей�твительно хотите отправить в�тречу без �водки?"
+msgstr "Дей�твительно отправить в�тречу без �водки?"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Вы дей�твительно хотите отправить задачу без �водки?"
+msgstr "Дей�твительно отправить задачу без �водки?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
@@ -1969,7 +1970,7 @@ msgstr "_�е отправл�ть"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Идет проце�� загрузки. Вы дей�твительно �охранить �ту в�тречу?"
+msgstr "Идёт загрузка. Дей�твительно �охранить �ту в�тречу?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
@@ -2104,15 +2105,15 @@ msgstr "Этот �пи�ок задач не отмечен дл� автоно
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
-msgstr "Этот календарь будет окончательно удален."
+msgstr "Этот календарь будет окончательно удалён."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
-msgstr "Заметка будет окончательно удалена."
+msgstr "Этот �пи�ок заметок окончательно удалён."
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
-msgstr "Задача будет окончательно удалена."
+msgstr "Эта задача будет окончательно удалена."
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
@@ -2136,7 +2137,7 @@ msgstr "Сохранить изменени� �той задачи?"
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Разо�лать уведомление об отмене �той заметки в журнале?"
+msgstr "Разо�лать уведомление об отмене �той заметки?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
@@ -2144,19 +2145,19 @@ msgstr "Разо�лать в�ем уча�тникам уведомление
 
 #: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "Разо�лать приглашени� на �обрание уча�тникам?"
+msgstr "Разо�лать уча�тникам приглашени� на �обрание?"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
-msgstr "Разо�лать �ту задачу уча�тникам?"
+msgstr "Разо�лать уча�тникам �ту задачу?"
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Разо�лать обновленную информацию о �обрании уча�тникам?"
+msgstr "Разо�лать уча�тникам обновлённую информацию о �обрании?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
-msgstr "Разо�лать обновленные �ведени� о задаче уча�тникам?"
+msgstr "Разо�лать уча�тникам обновлённые �ведени� о задаче?"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid ""
@@ -2170,19 +2171,19 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "Вы �делали изменени� �той в�тречи, но не �охранили их."
+msgstr "Эта в�треча была изменена, но не �охранена."
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "Вы �делали изменени� �того �обрани�, но не �охранили их."
+msgstr "Это �обранение изменено, но не �охранено."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
-msgstr "Вы �делали изменени� �той задачи, но не �охранили их."
+msgstr "Эта задача изменена, но не �охранена."
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Вы �делали изменени� �той заметки, но не �охранили их."
+msgstr "Эта заметка изменена, но не �охранена."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -2297,7 +2298,7 @@ msgstr "_Отменить в�е"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "Location:"
 msgstr "�дре�:"
 
@@ -2310,11 +2311,11 @@ msgid "_Dismiss"
 msgstr "_Отменить"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
+#: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Правка"
@@ -2329,7 +2330,7 @@ msgstr "�апомнить по_зже"
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
-msgstr "ча�ов"
+msgstr "ча�ы"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
@@ -2341,7 +2342,7 @@ msgstr "ме�то проведени� в�тречи"
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
-msgstr "минут"
+msgstr "минуты"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1434
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1556
@@ -2360,7 +2361,7 @@ msgstr "Данные об адре�е недо�тупны."
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
-msgstr "У ва� е�ть %d �игналов"
+msgstr "Имеет�� %d �игналов"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1668
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1696
@@ -2561,10 +2562,14 @@ msgstr "Ча� начала рабочего дн�, в 24-ча�овом фор
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
+"Е�ли у�тановлено, показывать панель предварительного про�мотра заметок в "
+"главном окне."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
+"Е�ли у�тановлено, показывать панель предварительного про�мотра задач в "
+"главном окне."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2617,12 +2622,11 @@ msgstr "Стиль заметок"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (horizontal)"
-msgstr ""
+msgstr "Положение панели предварительного про�мотра заметок (горизонтально)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-#, fuzzy
 msgid "Memo preview pane position (vertical)"
-msgstr "Позици� вертикальной панели в обзоре ме��ца"
+msgstr "Положение панели предварительного про�мотра заметок (вертикально)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
@@ -2740,11 +2744,11 @@ msgstr "Ли�тать обзор ме��ца по недел�м"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Отображать поле \"Про�ьба ответить\" в редакторе �обытий/задач/�обраний"
+msgstr "Отображать поле «Про�ьба ответить» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Отображать поле \"Должно�ть\" в редакторе �обытий/задач/�обраний"
+msgstr "Отображать поле «Должно�ть» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
@@ -2752,7 +2756,7 @@ msgstr "Отображать времÑ� окончаниÑ� вÑ�треч в обÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "Отображать поле категорий в редакторе �обытий/задач/�обраний"
+msgstr "Отображать поле «Категории» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
@@ -2760,7 +2764,7 @@ msgstr "Отображать Ñ�кранные Ñ�игналы в облаÑ�ти Ñ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Отображать поле �о�то�ни� в редакторе �обытий/задач/�обраний"
+msgstr "Отображать поле «Со�то�ние» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the memo preview pane"
@@ -2772,11 +2776,11 @@ msgstr "Показывать панель предварительного прÐ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Показывать поле ча�ового по��а в редакторе �обытий/�обраний"
+msgstr "Показывать поле «Ча�овой по��» в редакторе �обытий/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Показывать поле «тип» в редакторе �обытий/задач/�обраний"
+msgstr "Показывать поле «Тип» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
@@ -2796,17 +2800,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task layout style"
-msgstr ""
+msgstr "Стиль размещени� задач"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-#, fuzzy
 msgid "Task preview pane position (horizontal)"
-msgstr "Позици� вертикальной панели задач"
+msgstr "Положение панели предварительного про�мотра задач (горизонтально)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
-#, fuzzy
 msgid "Task preview pane position (vertical)"
-msgstr "Позици� вертикальной панели задач"
+msgstr "Положение панели предварительного про�мотра задач (вертикально)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
@@ -2836,6 +2838,10 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
+"Стиль ра�положени� определ�ет ме�то дл� панели предварительного про�мотра "
+"отно�ительно �пи�ка заметок. «0» (кла��иче�кий вид) помещает панель "
+"предварительного про�мотра под �пи�ком заметок. «1» (вертикальный вид) "
+"помещает панель р�дом �о �пи�ком заметок."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
@@ -2843,6 +2849,10 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
+"Стиль ра�положени� определ�ет ме�то дл� панели предварительного про�мотра "
+"отно�ительно �пи�ка задач. «0» (кла��иче�кий вид) помещает панель "
+"предварительного про�мотра под �пи�ком задач. «1» (вертикальный вид) помещает "
+"панель р�дом �о �пи�ком задач."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
@@ -2858,7 +2868,7 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
-msgstr "Разделители времени"
+msgstr "Делени� времени"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
@@ -2966,7 +2976,7 @@ msgstr "Отображать ли поле «ПроÑ�ьба ответить» Ð
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Отображать ли поле категорий в редакторе �обытий/�обраний"
+msgstr "Отображать ли поле «Категории» в редакторе �обытий/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
@@ -2974,7 +2984,7 @@ msgstr "Отображать ли поле «ДолжноÑ�ть» в редакÑ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Отображать ли поле �о�то�ни� в редакторе �обытий/задач/�обраний"
+msgstr "Отображать ли поле «Со�то�ние» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
@@ -2982,11 +2992,11 @@ msgstr "Показывать ли врем� в 24-ча�овом формате
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Отображать ли поле ча�ового по��а в редакторе �обытий/задач/�обраний"
+msgstr "Отображать ли поле «Ча�овой по��» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Отображать ли поле \"тип\" в редакторе �обытий/задач/�обраний"
+msgstr "Отображать ли поле «Тип» в редакторе �обытий/задач/�обраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
@@ -3062,7 +3072,7 @@ msgid "Classification"
 msgstr "Кла��ификаци�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3106,14 +3116,14 @@ msgid "Organizer"
 msgstr "Организатор"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Личное"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
 #: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Общее"
 
@@ -3186,9 +3196,8 @@ msgid "Add Alarm"
 msgstr "Добавить �игнал"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#, fuzzy
 msgid "Alarm"
-msgstr "Сигналы"
+msgstr "Сигнал"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
@@ -3203,14 +3212,12 @@ msgid "Mes_sage:"
 msgstr "_Сообщение:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
-#, fuzzy
 msgid "Options"
-msgstr "_Параметры"
+msgstr "Параметры"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-#, fuzzy
 msgid "Repeat"
-msgstr "<b>Повтор</b>"
+msgstr "Повтор"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
@@ -3237,20 +3244,17 @@ msgid "_Sound:"
 msgstr "_Звук:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-#, fuzzy
 msgid "after"
-msgstr "Позже"
+msgstr "по�ле"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-#, fuzzy
 msgid "before"
 msgstr "до"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:7
-#, fuzzy
 msgid "day(s)"
-msgstr "дней"
+msgstr "день(дни)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -3260,31 +3264,27 @@ msgstr "дней"
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
-msgstr "дней"
+msgstr "дни"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-#, fuzzy
 msgid "end of appointment"
-msgstr "�ова� в�треча"
+msgstr "конец в�тречи"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "дополнительное врем� каждые"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-#, fuzzy
 msgid "hour(s)"
-msgstr "ча�"
+msgstr "ча�(ы)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#, fuzzy
 msgid "minute(s)"
-msgstr "минут"
+msgstr "минут(а)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#, fuzzy
 msgid "start of appointment"
-msgstr "ме�то проведени� в�тречи"
+msgstr "начало в�тречи"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
@@ -3304,67 +3304,58 @@ msgstr "Сигналы"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
 #: ../calendar/gui/e-day-view-time-item.c:797
-#, fuzzy
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "�ет"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-timezone-entry.c:343
 msgid "Select..."
 msgstr "Выбрать..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "Календари - и�точники �игналов"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
 msgid "Time and date:"
 msgstr "Дата и врем�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
 msgid "Date only:"
 msgstr "Только дата:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"<i>%u и %d будут заменены на пользовател� и домен из адре�а �лектронной "
-"почты.</i>"
+msgstr "%u и %d будут заменены на пользовател� и домен из адре�а �лектронной почты."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(показывать при про�мотре дн�)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-#, fuzzy
 msgid "05 minutes"
-msgstr "минут"
+msgstr "05 минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-#, fuzzy
 msgid "10 minutes"
-msgstr "минут"
+msgstr "10 минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-#, fuzzy
 msgid "15 minutes"
-msgstr "минут"
+msgstr "15 минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-#, fuzzy
 msgid "30 minutes"
-msgstr "минут"
+msgstr "30 минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-#, fuzzy
 msgid "60 minutes"
-msgstr "минут"
+msgstr "60 минут"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
-#, fuzzy
 msgid "Alerts"
 msgstr "Сигналы"
 
@@ -3372,32 +3363,30 @@ msgstr "Сигналы"
 #: ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
-msgstr "Формат даты/времени"
+msgstr "Формат даты и времени"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
-msgstr "День _заканчивает��:"
+msgstr "_Конец дн�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-#, fuzzy
 msgid "Days"
-msgstr "День"
+msgstr "Дни"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-#, fuzzy
 msgid "Default Free/Busy Server"
-msgstr "<span weight=\"bold\">Сервер \"Свободен/Зан�т\" по умолчанию</span>"
+msgstr "Сервер «�вободен/зан�т» по умолчанию"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
-msgstr "Отображение"
+msgstr "Вид"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "Отображать �игналы только в обла�ти _уведомлени�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "П�тница"
@@ -3415,17 +3404,15 @@ msgid "General"
 msgstr "Общие"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-#, fuzzy
 msgid "Hours"
-msgstr "ча�"
+msgstr "Ча�ы"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-#, fuzzy
 msgid "Minutes"
-msgstr "минут"
+msgstr "Минуты"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Понедельник"
@@ -3441,14 +3428,14 @@ msgstr "�ет"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
 #: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
-msgstr "Выбрать цвет"
+msgstr "Выберите цвет"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
-msgstr "В�к"
+msgstr "В�_к"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Суббота"
@@ -3467,11 +3454,11 @@ msgstr "Выберите календари дл� �игналов"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
-msgstr "Показывать _напоминание"
+msgstr "Показы_вать напоминание"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
-msgstr "Показывать _напоминание"
+msgstr "Показ_ывать напоминание"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
@@ -3482,7 +3469,7 @@ msgid "Show week n_umber in Day and Work Week View"
 msgstr "Показывать _номера недель в навигаторе по датам"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Во�кре�енье"
@@ -3493,7 +3480,7 @@ msgstr "Задачи на _�егодн�шний день:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
-msgstr "Чтв"
+msgstr "_Чт"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 #: ../calendar/gui/dialogs/calendar-setup.c:379
@@ -3505,7 +3492,7 @@ msgid "Template:"
 msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четверг"
@@ -3519,14 +3506,14 @@ msgstr "Врем�"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
-msgstr "Ча�овой _по��:"
+msgstr "_Ча�овой по��:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "Формат времени:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Вторник"
@@ -3536,17 +3523,17 @@ msgid "Use s_ystem time zone"
 msgstr "И�пользовать �_и�темный ча�овой по��"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Среда"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
-msgstr "�едел� начинает�� �:"
+msgstr "�едел� на_чинает�� �:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
 msgid "Work Week"
 msgstr "Рабоча� недел�"
 
@@ -3572,11 +3559,11 @@ msgstr "Ужимать выходные дни в предÑ�тавлении мÐ
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
-msgstr "_День начинает��:"
+msgstr "_�ачало дн�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
-msgstr "П�т"
+msgstr "П_т"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
@@ -3584,7 +3571,7 @@ msgstr "Скрывать выполненные задачи через"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
-msgstr "Пон"
+msgstr "_Пн"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
@@ -3592,7 +3579,7 @@ msgstr "Про�роченные задачи:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
-msgstr "Суб"
+msgstr "_Сб"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
@@ -3600,15 +3587,15 @@ msgstr "_Отображать врем� окончани� в�треч в об
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
-msgstr "Разделители времени:"
+msgstr "_Делени� времени:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
-msgstr "Ð’Ñ‚Ñ€"
+msgstr "_Ð’Ñ‚"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
-msgstr "Срд"
+msgstr "_Ср"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
@@ -3748,235 +3735,232 @@ msgstr " (к дате"
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:247
 msgid "Could not save attachments"
 msgstr "�е удало�ь �охранить вложени�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:509
+#: ../calendar/gui/dialogs/comp-editor.c:510
 msgid "Could not update object"
 msgstr "�е удало�ь обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:605
 msgid "Edit Appointment"
 msgstr "Изменить в�тречу"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:612
 #, c-format
 msgid "Meeting - %s"
-msgstr "Собрание - %s"
+msgstr "Собрание — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Appointment - %s"
-msgstr "В�треча - %s"
+msgstr "В�треча — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:619
+#: ../calendar/gui/dialogs/comp-editor.c:620
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "�азначенна� задача - %s"
+msgstr "�азначенна� задача — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:622
 #, c-format
 msgid "Task - %s"
-msgstr "Задача - %s"
+msgstr "Задача — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Memo - %s"
-msgstr "Заметка - %s"
+msgstr "Заметка — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "No Summary"
 msgstr "�ет �водки"
 
-#: ../calendar/gui/dialogs/comp-editor.c:751
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "О�тавить первоначальное значение?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 msgid "Click here to close the current window"
 msgstr "�ажмите, чтобы закрыть текущее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
 msgid "Copy the selection"
 msgstr "Копировать выделение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1451
+#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:959
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
-#, fuzzy
 msgid "Delete the selection"
-msgstr "Вырезать выделение"
+msgstr "Удалить выделение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:967
 msgid "Click here to view help available"
 msgstr "�ажмите, чтобы про�мотреть �правку"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:971
 msgid "Paste the clipboard"
-msgstr "В�тавить выделение"
+msgstr "В�тавить из буфера обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to save the current window"
 msgstr "�ажмите, чтобы �охранить текущее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1563
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1579
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Выделить ве�ь тек�т"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "_Classification"
 msgstr "_Кла��ификаци�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1612
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1619
+#: ../calendar/gui/dialogs/comp-editor.c:1030
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1037
 msgid "_Insert"
-msgstr "_В�тавить"
+msgstr "_В�тавка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 #: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "_Параметры"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1654
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "_Вид"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 #: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
-msgstr "_Вложение..."
+msgstr "_Прикрепить…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1063
 msgid "Click here to attach a file"
-msgstr "�ажмите, чтобы вложить файл"
+msgstr "�ажмите, чтобы прикрепить файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1071
 msgid "_Categories"
 msgstr "_Категории"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 msgid "Toggles whether to display categories"
 msgstr "Переключает отображение категорий"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 msgid "Time _Zone"
 msgstr "Ча�овой _по��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "Toggles whether the time zone is displayed"
 msgstr "Переключает отображение ча�ового по��а"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Pu_blic"
 msgstr "Пу_бличное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 msgid "Classify as public"
 msgstr "Кла��ифицировать как публичное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 msgid "_Private"
 msgstr "_Личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1099
 msgid "Classify as private"
 msgstr "Кла��ифицировать как личное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "_Confidential"
 msgstr "_Конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "Classify as confidential"
 msgstr "Кла��ифицировать как конфиденциальное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "R_ole Field"
-msgstr "Поле «_Должно�ть»"
+msgstr "Поле _должно�ти"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "Toggles whether the Role field is displayed"
 msgstr "Переключает отображение пол� «Должно�ть»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "_RSVP"
 msgstr "П_ро�ьба ответить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1124
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Переключает отображение пол� «Про�ьба ответить»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "_Status Field"
 msgstr "Поле _�о�то�ни�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1132
 msgid "Toggles whether the Status field is displayed"
 msgstr "Переключает отображение пол� «Со�то�ние»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "_Type Field"
 msgstr "Поле _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1140
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Переключает отображение пол� типа уча�тников"
+msgstr "Переключает отображение пол� «Тип уча�тников»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "�едавние _документы"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../calendar/gui/dialogs/comp-editor.c:1684
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Вложить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
+#: ../calendar/gui/dialogs/comp-editor.c:1739
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2015
-#: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2955
+#: ../calendar/gui/dialogs/comp-editor.c:2016
+#: ../calendar/gui/dialogs/comp-editor.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:2956
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Изменени� �того �лемента будут отвергнуты, е�ли по �лектронной почте придет "
-"обновление."
+msgstr "Изменени� �того �лемента будут отменены, е�ли будет получено обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "вложение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2986
 msgid "Unable to use current version!"
 msgstr "�е удало�ь и�пользовать текущую вер�ию!"
 
@@ -4082,7 +4066,7 @@ msgstr "Параметры отправки"
 #: ../calendar/gui/dialogs/event-editor.c:217
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
-msgstr "В�тавить дополнительные параметры оправки"
+msgstr "В�тавить дополнительные параметры отправки"
 
 #: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
@@ -4123,7 +4107,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Событые нельз� полно�тью изменить, по�кольку вы не �вл�ете�ь организатором"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:2722
 msgid "This event has alarms"
 msgstr "Это �обытие имеет �игналы"
 
@@ -4184,7 +4168,7 @@ msgstr "Требует�� организатор."
 msgid "At least one attendee is required."
 msgstr "Требует�� как минимум один уча�тник"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2595
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "�е удало�ь открыть календарь «%s»."
@@ -4195,14 +4179,14 @@ msgstr "�е удало�ь открыть календарь «%s»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2639
 #: ../calendar/gui/dialogs/memo-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Вы дей�твуете от лица %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2941
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -4210,7 +4194,7 @@ msgstr[0] "%d день до в�тречи"
 msgstr[1] "%d дн� до в�тречи"
 msgstr[2] "%d дней до в�тречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -4218,7 +4202,7 @@ msgstr[0] "%d ча� до в�тречи"
 msgstr[1] "%d ча�а до в�тречи"
 msgstr[2] "%d ча�ов до в�тречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -4226,31 +4210,27 @@ msgstr[0] "%d минута до в�тречи"
 msgstr[1] "%d минуты до в�тречи"
 msgstr[2] "%d минут до в�тречи"
 
-#: ../calendar/gui/dialogs/event-page.c:2962
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgid "Customize"
 msgstr "�а�троить"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2964
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:2968
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "�ет"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:1
-#, fuzzy
 msgid "1 day before appointment"
-msgstr "%d день до в�тречи"
+msgstr "1 день до в�тречи"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-#, fuzzy
 msgid "1 hour before appointment"
-msgstr "%d ча� до в�тречи"
+msgstr "1 ча� до в�тречи"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:3
-#, fuzzy
 msgid "15 minutes before appointment"
-msgstr "%d минута до в�тречи"
+msgstr "15 минут до в�тречи"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
@@ -4273,7 +4253,7 @@ msgstr "Опи�ание �обыти�"
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
 #: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
-msgstr "Коротко:"
+msgstr "Св_одка:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
@@ -4297,17 +4277,13 @@ msgstr "_Врем�:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#, fuzzy
 msgid "for"
-msgstr "четвертый"
+msgstr "на"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:11
-#, fuzzy
 msgid "until"
-msgstr ""
-"до\n"
-"пока"
+msgstr "до"
 
 #: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
@@ -4330,7 +4306,7 @@ msgstr "�е удало�ь открыть заметки в «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Кому"
@@ -4394,13 +4370,13 @@ msgstr "Эта в�треча имеет правила повторени�, н
 msgid "Recurrence date is invalid"
 msgstr "Повтор�юща��� дата некорректна"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:933
 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:958
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "on"
 msgstr "в"
 
@@ -4408,7 +4384,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:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "first"
 msgstr "первый"
 
@@ -4417,7 +4393,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:1021
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "second"
 msgstr "второй"
 
@@ -4425,7 +4401,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "third"
 msgstr "третий"
 
@@ -4433,7 +4409,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "fourth"
 msgstr "четвертый"
 
@@ -4441,7 +4417,7 @@ msgstr "четвертый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "fifth"
 msgstr "п�тый"
 
@@ -4449,21 +4425,21 @@ 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:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 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:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1069
 msgid "Other Date"
-msgstr "Друга� дата"
+msgstr "друга� дата"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * 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:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1075
 msgid "1st to 10th"
 msgstr "� 1-го по 10-е"
 
@@ -4471,7 +4447,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:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
 msgid "11th to 20th"
 msgstr "� 11-го по 20-е"
 
@@ -4479,45 +4455,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:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 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:1237
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
 msgid "on the"
-msgstr " "
+msgstr " в"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1416
 msgid "occurrences"
-msgstr "�лучаи"
+msgstr "раз(а)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2117
+#: ../calendar/gui/dialogs/recurrence-page.c:2121
 msgid "Add exception"
 msgstr "Добавить и�ключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2158
+#: ../calendar/gui/dialogs/recurrence-page.c:2162
 msgid "Could not get a selection to modify."
 msgstr "�е удало�ь получить выделение дл� изменени�."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2168
 msgid "Modify exception"
 msgstr "Изменить и�ключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2212
 msgid "Could not get a selection to delete."
 msgstr "�е удало�ь получить изменение дл� удалени�."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2351
 msgid "Date/Time"
 msgstr "Дата/Врем�"
 
@@ -4526,37 +4502,32 @@ msgid "Every"
 msgstr "Каждый"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#, fuzzy
 msgid "Exceptions"
-msgstr "<b>И�ключени�</b>"
+msgstr "И�ключени�"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
-#, fuzzy
 msgid "Preview"
-msgstr "_Предварительный про�мотр"
+msgstr "Предварительный про�мотр"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "Эта в�треча повтор_�ет��"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:9
-#, fuzzy
 msgid "forever"
-msgstr "�икогда"
+msgstr "в�егда"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#, fuzzy
 msgid "month(s)"
-msgstr "Ме��ц"
+msgstr "ме��ц(ы)"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#, fuzzy
 msgid "week(s)"
-msgstr "недели"
+msgstr "недел�(ли)"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:13
 msgid "year(s)"
-msgstr ""
+msgstr "год(ы)"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -4581,8 +4552,8 @@ msgstr "Веб-�траница"
 #: ../calendar/gui/e-cal-model-tasks.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:737
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
-#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
@@ -4591,7 +4562,7 @@ msgstr "Завершена"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Вы�окий"
@@ -4601,8 +4572,8 @@ msgstr "Вы�окий"
 #: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
 #: ../calendar/gui/print.c:2645
 msgid "In Progress"
 msgstr "Выполн�ет��"
@@ -4610,7 +4581,7 @@ msgstr "Выполн�ет��"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "�изкий"
@@ -4618,7 +4589,7 @@ msgstr "�изкий"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
@@ -4628,8 +4599,8 @@ msgstr "�ормальный"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
 #: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "�е начала�ь"
@@ -4656,7 +4627,7 @@ msgstr "Со�то�ние"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "�е определено"
@@ -4818,9 +4789,8 @@ msgid "Untitled"
 msgstr "�еозаглавленное"
 
 #: ../calendar/gui/e-cal-component-preview.c:198
-#, fuzzy
 msgid "Categories:"
-msgstr "Категории"
+msgstr "Категории:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
@@ -4839,7 +4809,7 @@ msgstr "Дата выполнени�:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "Status:"
 msgstr "Со�то�ние:"
 
@@ -4880,12 +4850,12 @@ msgid "Start Date"
 msgstr "Дата начала"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/e-task-table.c:560
 msgid "Free"
 msgstr "Свободен"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "Зан�т"
 
@@ -4901,7 +4871,6 @@ msgstr ""
 
 #. Translators: "None" for task's status
 #: ../calendar/gui/e-cal-model-tasks.c:731
-#, fuzzy
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "�ет"
@@ -4922,21 +4891,18 @@ msgid "No"
 msgstr "�ет"
 
 #: ../calendar/gui/e-cal-model.c:377
-#, fuzzy
 msgid "Default Client"
-msgstr "Почтовый клиент по умолчанию"
+msgstr "Клиент по умолчанию"
 
 #: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:836
-#, fuzzy
+#: ../shell/e-shell.c:867
 msgid "Shell Settings"
-msgstr "Параметры Exchange"
+msgstr "Параметры оболочки"
 
 #: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:837
-#, fuzzy
+#: ../shell/e-shell.c:868
 msgid "Application-wide settings"
-msgstr "�а�тройка автозавершени�"
+msgstr "Глобальные параметры приложени�"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
@@ -4945,7 +4911,7 @@ msgstr "�а�тройка автозавершени�"
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
 #: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
@@ -4960,7 +4926,7 @@ msgstr "Повторение"
 msgid "Assigned"
 msgstr "�азначено"
 
-#: ../calendar/gui/e-cal-model.c:2203
+#: ../calendar/gui/e-cal-model.c:2210
 #, c-format
 msgid "Opening %s"
 msgstr "Открывает�� %s"
@@ -4968,7 +4934,7 @@ msgstr "Открывает�� %s"
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% Завершено"
+msgstr "Выполнено %"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5005,32 +4971,28 @@ msgid "Type"
 msgstr "Тип"
 
 #: ../calendar/gui/e-calendar-view.c:392
-#, fuzzy
 msgid "Cut selected events to the clipboard"
-msgstr "Вырезать выделенный тек�т в буфер обмена"
+msgstr "Вырезать выделенные �обыти� в буфер обмена"
 
 #: ../calendar/gui/e-calendar-view.c:398
-#, fuzzy
 msgid "Copy selected events to the clipboard"
-msgstr "Копировать выделенный тек�т в буфер обмена"
+msgstr "Копировать выделенные �обыти� в буфер обмена"
 
 #: ../calendar/gui/e-calendar-view.c:404
-#, fuzzy
 msgid "Paste events from the clipboard"
-msgstr "В�тавить тек�т из буфера обмена"
+msgstr "В�тавить �обыти� из буфера обмена"
 
 #: ../calendar/gui/e-calendar-view.c:410
-#, fuzzy
 msgid "Delete selected events"
-msgstr "Удалить выделенные заметки"
+msgstr "Удалить выделенные �обыти�"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
-#: ../calendar/gui/e-task-table.c:264
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
-#: ../calendar/gui/e-task-table.c:1062
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
@@ -5070,16 +5032,16 @@ msgstr "Требует�� дей�твие"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
-#: ../calendar/gui/e-task-table.c:737
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
-#: ../calendar/gui/e-task-table.c:740
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
@@ -5134,8 +5096,8 @@ msgstr "Показывать второй ча�овой по��"
 #. 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:860 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
@@ -5145,10 +5107,10 @@ msgstr "%A, %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:894
+#: ../modules/calendar/e-cal-shell-view-private.c:901
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -5157,10 +5119,10 @@ msgstr "%a, %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:930
+#: ../modules/calendar/e-cal-shell-view-private.c:937
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -5299,7 +5261,6 @@ msgstr ""
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
 #: ../plugins/itip-formatter/itip-formatter.c:2313
-#, fuzzy
 msgctxt "cal-itip"
 msgid "None"
 msgstr "�ет"
@@ -5692,7 +5653,7 @@ 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2284
+#: ../calendar/gui/e-meeting-time-sel.c:2300
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -5701,7 +5662,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2315
+#: ../calendar/gui/e-meeting-time-sel.c:2331
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -5799,8 +5760,8 @@ msgstr "Язык"
 msgid "Member"
 msgstr "Уча�тник"
 
-#: ../calendar/gui/e-memo-table.c:410
-#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:397
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5808,95 +5769,91 @@ msgstr "Уча�тник"
 msgid "Memos"
 msgstr "Заметки"
 
-#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
 msgid "* No Summary *"
 msgstr "* �ет краткого опи�ани� *"
 
-#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
 msgid "Start: "
 msgstr "�ачало: "
 
-#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
 msgid "Due: "
 msgstr "Завершение: "
 
-#: ../calendar/gui/e-memo-table.c:706
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Cut selected memos to the clipboard"
-msgstr "Вырезать выделенный тек�т в буфер обмена"
+msgstr "Вырезать выделенные заметки в буфер обмена"
 
-#: ../calendar/gui/e-memo-table.c:712
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:713
 msgid "Copy selected memos to the clipboard"
-msgstr "Копировать выделенные �ообщени� в буфер обмена"
+msgstr "Копировать выделенные заметки в буфер обмена"
 
-#: ../calendar/gui/e-memo-table.c:718
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:719
 msgid "Paste memos from the clipboard"
 msgstr "В�тавить заметки из буфера обмена"
 
-#: ../calendar/gui/e-memo-table.c:724
-#: ../modules/calendar/e-memo-shell-view-actions.c:569
+#: ../calendar/gui/e-memo-table.c:725
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Удалить выделенные заметки"
 
-#: ../calendar/gui/e-memo-table.c:730
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:731
 msgid "Select all visible memos"
-msgstr "Выделить в�е видимые �ообщени�"
+msgstr "Выделить в�е видимые заметки"
 
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�ажмите, чтобы добавить заметку"
 
-#: ../calendar/gui/e-task-table.c:529
+#: ../calendar/gui/e-task-table.c:530
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-task-table.c:530
+#: ../calendar/gui/e-task-table.c:531
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-task-table.c:531
+#: ../calendar/gui/e-task-table.c:532
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-task-table.c:532
+#: ../calendar/gui/e-task-table.c:533
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-task-table.c:533
+#: ../calendar/gui/e-task-table.c:534
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-task-table.c:534
+#: ../calendar/gui/e-task-table.c:535
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-task-table.c:535
+#: ../calendar/gui/e-task-table.c:536
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-task-table.c:536
+#: ../calendar/gui/e-task-table.c:537
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-task-table.c:537
+#: ../calendar/gui/e-task-table.c:538
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-task-table.c:538
+#: ../calendar/gui/e-task-table.c:539
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:540
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-cal-shell-content.c:357
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5907,38 +5864,35 @@ msgstr "100%"
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../calendar/gui/e-task-table.c:927
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:928
 msgid "Cut selected tasks to the clipboard"
-msgstr "Вырезать выделенный тек�т в буфер обмена"
+msgstr "Вырезать выделенные задани� в буфер обмена"
 
-#: ../calendar/gui/e-task-table.c:933
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:934
 msgid "Copy selected tasks to the clipboard"
-msgstr "Копировать выделенный тек�т в буфер обмена"
+msgstr "Копировать выделенные задани� в буфер обмена"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:940
 msgid "Paste tasks from the clipboard"
 msgstr "В�тавить задачи из буфера обмена"
 
-#: ../calendar/gui/e-task-table.c:945
-#: ../modules/calendar/e-task-shell-view-actions.c:693
+#: ../calendar/gui/e-task-table.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:680
 msgid "Delete selected tasks"
 msgstr "Удалить выбранные задачи"
 
-#: ../calendar/gui/e-task-table.c:951
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:952
 msgid "Select all visible tasks"
-msgstr "Выделить в�е видимые �ообщени�"
+msgstr "Выделить в�е видимые задани�"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:354
 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:235 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5996,7 +5950,7 @@ msgstr "Перейти к дате"
 msgid "a table to view and select the current time range"
 msgstr "таблица дл� про�мотра и выбора текущего диапазона времени"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6006,14 +5960,14 @@ msgstr[2] "Имеет %d �обытий."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
 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."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Обзор рабочей недели: %s. %s"
@@ -6021,16 +5975,16 @@ 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."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Вид дн�: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:201
 msgid "calendar view for a work week"
 msgstr "окно календар� дл� про�мотра рабочей недели"
 
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for one or more days"
 msgstr "окно календар� дл� про�мотра одного или более дней"
 
@@ -6041,16 +5995,16 @@ msgid "Gnome Calendar"
 msgstr "Календарь Gnome"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:890
+#: ../modules/calendar/e-cal-shell-view-private.c:897
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:897
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../modules/calendar/e-cal-shell-view-private.c:904
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -6058,10 +6012,10 @@ msgstr "%a, %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:923
-#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:930
 #: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:944
+#: ../modules/calendar/e-cal-shell-view-private.c:948
+#: ../modules/calendar/e-cal-shell-view-private.c:951
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6073,90 +6027,83 @@ msgstr "Кнопка перехода"
 msgid "Click here, you can find more events."
 msgstr "�ажмите зде�ь, вы можете найти больше �обытий."
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Обзор ме��ца: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Обзор недели: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "окно календар� дл� обзора ме��ца"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "окно календар� дл� про�мотра одной или более недель"
 
-#: ../calendar/gui/gnome-cal.c:2144
+#: ../calendar/gui/gnome-cal.c:2167
 msgid "Purging"
 msgstr "Очи�тка"
 
 #: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
-msgstr ""
+msgstr "�прель"
 
 #: ../calendar/gui/goto-dialog.ui.h:2
 msgid "August"
-msgstr ""
+msgstr "�вгу�т"
 
 #: ../calendar/gui/goto-dialog.ui.h:3
-#, fuzzy
 msgid "December"
-msgstr "Уча�тник"
+msgstr "Декабрь"
 
 #: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #: ../calendar/gui/goto-dialog.ui.h:5
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #: ../calendar/gui/goto-dialog.ui.h:7
-#, fuzzy
 msgid "June"
-msgstr "Спам"
+msgstr "Июнь"
 
 #: ../calendar/gui/goto-dialog.ui.h:8
-#, fuzzy
 msgid "March"
-msgstr "Пои�к"
+msgstr "Март"
 
 #: ../calendar/gui/goto-dialog.ui.h:9
-#, fuzzy
 msgid "May"
-msgstr "Понедельник"
+msgstr "Май"
 
 #: ../calendar/gui/goto-dialog.ui.h:10
-#, fuzzy
 msgid "November"
-msgstr "Уча�тник"
+msgstr "�о�брь"
 
 #: ../calendar/gui/goto-dialog.ui.h:11
-#, fuzzy
 msgid "October"
-msgstr "Другой"
+msgstr "Окт�брь"
 
 #: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Выделить дату"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#, fuzzy
 msgid "September"
-msgstr "Уча�тник"
+msgstr "Сент�брь"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
-msgstr "_Выделить �егодн�шний день"
+msgstr "_Выбрать �егодн�шний день"
 
 #: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
 #: ../calendar/gui/itip-utils.c:552
@@ -6269,11 +6216,11 @@ msgstr "Информаци� iCalendar"
 
 #: ../calendar/gui/itip-utils.c:832
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "�е удаёт�� зарезервировать ре�ур�, новое �обытие конфликтует � каким-то другим."
 
 #: ../calendar/gui/itip-utils.c:834
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "�е удаёт�� зарезервировать ре�ур�, ошибка: "
 
 #: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
@@ -6281,127 +6228,127 @@ msgstr "Вы должны быть уча�тником �обыти�."
 
 #: ../calendar/gui/print.c:508
 msgid "1st"
-msgstr "1-ое"
+msgstr "1-ый"
 
 #: ../calendar/gui/print.c:508
 msgid "2nd"
-msgstr "2-ое"
+msgstr "2-ый"
 
 #: ../calendar/gui/print.c:508
 msgid "3rd"
-msgstr "3-ье"
+msgstr "3-ый"
 
 #: ../calendar/gui/print.c:508
 msgid "4th"
-msgstr "4-ое"
+msgstr "4-ый"
 
 #: ../calendar/gui/print.c:508
 msgid "5th"
-msgstr "5-ое"
+msgstr "5-ый"
 
 #: ../calendar/gui/print.c:509
 msgid "6th"
-msgstr "6-ое"
+msgstr "6-ый"
 
 #: ../calendar/gui/print.c:509
 msgid "7th"
-msgstr "7-ое"
+msgstr "7-ый"
 
 #: ../calendar/gui/print.c:509
 msgid "8th"
-msgstr "8-ое"
+msgstr "8-ый"
 
 #: ../calendar/gui/print.c:509
 msgid "9th"
-msgstr "9-ое"
+msgstr "9-ый"
 
 #: ../calendar/gui/print.c:509
 msgid "10th"
-msgstr "10-ое"
+msgstr "10-ый"
 
 #: ../calendar/gui/print.c:510
 msgid "11th"
-msgstr "11-ое"
+msgstr "11-ый"
 
 #: ../calendar/gui/print.c:510
 msgid "12th"
-msgstr "12-ое"
+msgstr "12-ый"
 
 #: ../calendar/gui/print.c:510
 msgid "13th"
-msgstr "13-ое"
+msgstr "13-ый"
 
 #: ../calendar/gui/print.c:510
 msgid "14th"
-msgstr "14-ое"
+msgstr "14-ый"
 
 #: ../calendar/gui/print.c:510
 msgid "15th"
-msgstr "15-ое"
+msgstr "15-ый"
 
 #: ../calendar/gui/print.c:511
 msgid "16th"
-msgstr "16-ое"
+msgstr "16-ый"
 
 #: ../calendar/gui/print.c:511
 msgid "17th"
-msgstr "17-ое"
+msgstr "17-ый"
 
 #: ../calendar/gui/print.c:511
 msgid "18th"
-msgstr "18-ое"
+msgstr "18-ый"
 
 #: ../calendar/gui/print.c:511
 msgid "19th"
-msgstr "19-ое"
+msgstr "19-ый"
 
 #: ../calendar/gui/print.c:511
 msgid "20th"
-msgstr "20-ое"
+msgstr "20-ый"
 
 #: ../calendar/gui/print.c:512
 msgid "21st"
-msgstr "21-ое"
+msgstr "21-ый"
 
 #: ../calendar/gui/print.c:512
 msgid "22nd"
-msgstr "22-ое"
+msgstr "22-ый"
 
 #: ../calendar/gui/print.c:512
 msgid "23rd"
-msgstr "23-ье"
+msgstr "23-ый"
 
 #: ../calendar/gui/print.c:512
 msgid "24th"
-msgstr "24-ое"
+msgstr "24-ый"
 
 #: ../calendar/gui/print.c:512
 msgid "25th"
-msgstr "25-ое"
+msgstr "25-ый"
 
 #: ../calendar/gui/print.c:513
 msgid "26th"
-msgstr "26-ое"
+msgstr "26-ый"
 
 #: ../calendar/gui/print.c:513
 msgid "27th"
-msgstr "27-ое"
+msgstr "27-ый"
 
 #: ../calendar/gui/print.c:513
 msgid "28th"
-msgstr "28-ое"
+msgstr "28-ый"
 
 #: ../calendar/gui/print.c:513
 msgid "29th"
-msgstr "29-ое"
+msgstr "29-ый"
 
 #: ../calendar/gui/print.c:513
 msgid "30th"
-msgstr "30-ое"
+msgstr "30-ый"
 
 #: ../calendar/gui/print.c:514
 msgid "31st"
-msgstr "31-ое"
+msgstr "31-ый"
 
 #: ../calendar/gui/print.c:593
 msgid "Su"
@@ -6480,7 +6427,7 @@ msgstr "Контакты: "
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
-msgstr "% Завершено"
+msgstr "Завершено % "
 
 #: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
@@ -8094,7 +8041,7 @@ msgid "Save as..."
 msgstr "Сохранить как..."
 
 #: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Вложить файл"
 
@@ -8207,7 +8154,7 @@ msgstr "Подпи�ать �то �ообщение вашим �ертифик
 
 #: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
-msgstr "Поле �крытой копии"
+msgstr "Поле «Скрыта� копи�»"
 
 #: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
@@ -8215,7 +8162,7 @@ msgstr "Переключить отображение пол� �крытой к
 
 #: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
-msgstr "Поле копии"
+msgstr "Поле «Копи�»"
 
 #: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
@@ -8223,7 +8170,7 @@ msgstr "Переключить отображение пол� копии"
 
 #: ../composer/e-composer-actions.c:425
 msgid "_From Field"
-msgstr "Поле \"От\""
+msgstr "Поле «От»"
 
 #: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
@@ -8231,7 +8178,7 @@ msgstr "Переключить отображение выбора дл� пол
 
 #: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
-msgstr "Поле \"Об_ратный адре�\""
+msgstr "Поле «Об_ратный адре�»"
 
 #: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
@@ -8242,14 +8189,12 @@ msgid "Save Draft"
 msgstr "Сохранить черновик"
 
 #: ../composer/e-composer-header.c:129
-#, fuzzy
 msgid "Show"
-msgstr "По_казать: "
+msgstr "Показать"
 
 #: ../composer/e-composer-header.c:137
-#, fuzzy
 msgid "Hide"
-msgstr "_Скрыть"
+msgstr "Скрыть"
 
 #: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
@@ -8296,7 +8241,7 @@ msgstr "CC"
 
 #: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
-msgstr "_Скр.копи�:"
+msgstr "_Скрыта� копи�:"
 
 #: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
@@ -8323,34 +8268,27 @@ msgid "Click here to select folders to post to"
 msgstr "�ажмите, чтобы выбрать папки дл� помещени� в них �ообщений"
 
 #: ../composer/e-composer-private.c:199
-#, fuzzy
 msgid "Undo the last action"
-msgstr "Копировать выделение"
+msgstr "Отменить по�леднее дей�твие"
 
 #: ../composer/e-composer-private.c:203
-#, fuzzy
 msgid "Redo the last undone action"
-msgstr "Отправить по�леднюю информацию"
+msgstr "Вернуть по�леднее отменённое дей�твие"
 
 #: ../composer/e-composer-private.c:207
-#, fuzzy
 msgid "Search for text"
-msgstr ""
-"\n"
-"\n"
-"Пои�к контакта."
+msgstr "�айти тек�т"
 
 #: ../composer/e-composer-private.c:211
-#, fuzzy
 msgid "Search for and replace text"
-msgstr "Пои�к в тек�те отображаемого �ообщени�"
+msgstr "�айти и заменить тек�т"
 
 #: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "Сохранить черновик"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_�е выводить больше �то �ообщение."
@@ -8370,9 +8308,8 @@ msgstr ""
 "�той учётной запи�и"
 
 #: ../composer/e-msg-composer.c:1379
-#, fuzzy
 msgid "Unable to reconstruct message from autosave file"
-msgstr "�е удало�ь получить �ообщение из редактора"
+msgstr "�е удало�ь во��тановить �ообщение из файла авто�охранени�"
 
 #: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
@@ -8402,9 +8339,7 @@ msgstr "В�е учётные запи�и были удалены."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"Вы дей�твительно хотите отклонить �о�тавл�емое вами �ообщение � заголовком "
-"'{0}'?"
+msgstr "Дей�твительно отклонить �о�тавл�емое вами �ообщение � заголовком «{0}»?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -8420,9 +8355,9 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"Закрытие �того окна редактора приведет к окончательной потере �ообщени�, "
-"е�ли только вы не �охраните его в папке «Черновики». Это позволит вам "
-"продолжить напи�ание �ообщени� позже."
+"Закрыв �то окно редактора, вы окончательно потер�ете �ообщение, е�ли только "
+"не �охраните его в папке «Черновики». Это позволит вам позже допи�ать "
+"�ообщение."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -8446,11 +8381,11 @@ msgstr "Ð�е удалоÑ�ÑŒ Ñ�охранить в файл автоÑ�охранÐ
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Do you want to recover unfinished messages?"
-msgstr "Во��тановить незавершенные �ообщени�?"
+msgstr "Во��тановить незавершённые �ообщени�?"
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "Идет проце�� загрузки. Вы дей�твительно хотите отправить почту?"
+msgstr "Идёт загрузка. Дей�твительно отправить почту?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
@@ -8509,18 +8444,267 @@ msgstr "_Во��тановить"
 msgid "_Save Draft"
 msgstr "_Сохранить черновик"
 
+#: ../capplet/anjal-settings-main.c:202
+msgid "Run Anjal in a window"
+msgstr "Запу�тить Anjal в окне"
+
+#: ../capplet/anjal-settings-main.c:203
+msgid "Make Anjal the default email client"
+msgstr "Сделать Anjal почтовым клиентом по умолчанию"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:210
+msgid "ID of the socket to embed in"
+msgstr "ID �окета дл� в�траивани�"
+
+#: ../capplet/anjal-settings-main.c:211
+msgid "socket"
+msgstr "�окет"
+
+#: ../capplet/anjal-settings-main.c:225
+msgid "Anjal email client"
+msgstr "Почтовый клиент Anjal"
+
+#: ../capplet/settings/mail-view.c:244
+msgid "New Tab"
+msgstr "�ова� вкладка"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "Введите ваше полное им�."
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "Введите ваш адре� �л. почты."
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr "Вы ввели неверный адре� �лектронной почты."
+
+#: ../capplet/settings/mail-account-view.c:224
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Личные данные:</span>"
+
+#: ../capplet/settings/mail-account-view.c:229
+msgid "Name:"
+msgstr "Им�:"
+
+#: ../capplet/settings/mail-account-view.c:238
+msgid "Email address:"
+msgstr "Электронна� почта:"
+
+#: ../capplet/settings/mail-account-view.c:248
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Параметры получени�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:253
+#: ../capplet/settings/mail-account-view.c:303
+msgid "Server type:"
+msgstr "Тип �ервера:"
+
+#: ../capplet/settings/mail-account-view.c:262
+#: ../capplet/settings/mail-account-view.c:312
+msgid "Server address:"
+msgstr "�дре� �ервера:"
+
+#: ../capplet/settings/mail-account-view.c:272
+#: ../capplet/settings/mail-account-view.c:322
+msgid "Username:"
+msgstr "Им� пользовател�:"
+
+#: ../capplet/settings/mail-account-view.c:281
+#: ../capplet/settings/mail-account-view.c:331
+msgid "Use encryption:"
+msgstr "И�пользовать шифрование:"
+
+#: ../capplet/settings/mail-account-view.c:286
+#: ../capplet/settings/mail-account-view.c:336
+msgid "never"
+msgstr "никогда"
+
+#: ../capplet/settings/mail-account-view.c:298
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Параметры отправки:</span>"
+
+#: ../capplet/settings/mail-account-view.c:355
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr "Чтобы и�пользовать приложение дл� работы � �лектронной почтой, вам необходимо на�троить учётную запи�ь. Введите ваш адре� �лектронной почты и пароль, и мы попробуем подобрать о�тальные параметры. Е�ли подобрать параметры �ервера автоматиче�ки не уда�т��, вам придёт�� вве�ти их вручную."
+
+#: ../capplet/settings/mail-account-view.c:357
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr "К �ожалению, не удало�ь автоматиче�ки у�тановить параметры дл� получени� вашей �лектронной почты. Была �делана попытка подобрать параметры на о�новании введённой вами информации, измените их в �лучае необходимо�ти."
+
+#: ../capplet/settings/mail-account-view.c:359
+msgid "You can specify more options to configure the account."
+msgstr "Вы можете указать дополнительные параметры на�тройки учётной запи�и."
+
+#: ../capplet/settings/mail-account-view.c:361
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Теперь нужно указать параметры, необходимые дл� отправки �л. почты. "
+"�екоторые из них были подобраны автоматиче�ки, проверьте их правильно�ть."
+
+#: ../capplet/settings/mail-account-view.c:362
+msgid "You can specify your default settings for your account."
+msgstr "Вы можете указать параметры по умолчанию дл� вашей учётной запи�и."
+
+#: ../capplet/settings/mail-account-view.c:363
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Теперь можно проверить в�е параметры учётной запи�и перед попыткой "
+"подключени� к �ерверу и получени� вашей почты."
+
+#: ../capplet/settings/mail-account-view.c:378
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../mail/mail-config.ui.h:58
+msgid "Identity"
+msgstr "Подлинно�ть"
+
+#: ../capplet/settings/mail-account-view.c:378
+msgid "Next - Receiving mail"
+msgstr "Вперёд - Получение почты"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Receiving mail"
+msgstr "Получение почты"
+
+#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:380
+msgid "Next - Sending mail"
+msgstr "Вперёд - Отправка �л.почты"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Back - Identity"
+msgstr "�азад - Подлинно�ть"
+
+#: ../capplet/settings/mail-account-view.c:379
+msgid "Next - Receiving options"
+msgstr "Вперёд - Параметры получени�"
+
+#: ../capplet/settings/mail-account-view.c:380
+msgid "Receiving options"
+msgstr "Параметры получени�"
+
+#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Back - Receiving mail"
+msgstr "�азад - Получение почты"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Sending mail"
+msgstr "Отправка �л.почты"
+
+#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:383
+msgid "Next - Review account"
+msgstr "Вперёд - Обзор учётной запи�и"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Next - Defaults"
+msgstr "Вперёд - По умолчанию"
+
+#: ../capplet/settings/mail-account-view.c:382
+msgid "Back - Receiving options"
+msgstr "�азад - Параметры получени�"
+
+#: ../capplet/settings/mail-account-view.c:383
+#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "По умолчанию"
+
+#: ../capplet/settings/mail-account-view.c:383
+msgid "Back - Sending mail"
+msgstr "�азад - Отправка �л. почты"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Review account"
+msgstr "Обзор учётной запи�и"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Finish"
+msgstr "Готово"
+
+#: ../capplet/settings/mail-account-view.c:385
+msgid "Back - Sending"
+msgstr "�азад - Отправка"
+
+#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-settings-view.c:266
+msgid "Close Tab"
+msgstr "Закрыть вкладку"
+
+#: ../capplet/settings/mail-account-view.c:729
+msgid "Account Wizard"
+msgstr "Ма�тер учётных запи�ей"
+
+#: ../capplet/settings/mail-capplet-shell.c:284
+msgid "Evolution account assistant"
+msgstr "Ма�тер учётных запи�ей Evolution"
+
+#: ../capplet/settings/mail-capplet-shell.c:320
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Параметры �л. почты"
+
+#: ../capplet/settings/mail-capplet-shell.c:334
+msgid "Quit"
+msgstr "Выйти"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
+#: ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "�а �том компьютере"
+
+#: ../capplet/settings/mail-settings-view.c:148
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "Изменить"
+
+#: ../capplet/settings/mail-settings-view.c:150
+msgid "Add a new account"
+msgstr "Добавить новую учётную запи�ь"
+
+#: ../capplet/settings/mail-settings-view.c:185
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Управление учётными запи��ми</span>"
+
+#: ../capplet/settings/mail-settings-view.c:276
+msgid "Settings"
+msgstr "Параметры"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
-#, fuzzy
 msgid "Calendar event notifications"
-msgstr "Информаци� календар�"
+msgstr "Уведомлени� о календарных �обыти�х"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
-#, fuzzy
 msgid "Evolution Alarm Notify"
-msgstr "Evolution Elm importer"
+msgstr "Уведомление �игналами в Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
-#: ../shell/e-shell-window-private.c:258
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8528,7 +8712,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Электронна� почта и календарь Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Пакет дл� групповой работы"
 
@@ -8536,6 +8720,10 @@ msgstr "Пакет дл� групповой работы"
 msgid "Manage your email, contacts and schedule"
 msgstr "Ваша �лектронна� почта, контакты и ра�пи�ание"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "�а�тройка учётных запи�ей �л. почты"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "визитна� карточка"
@@ -8546,22 +8734,22 @@ msgstr "информаци� календар�"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "%s (cancelled)"
-msgstr "Отменено"
+msgstr "%s (отменено)"
 
 #. Translators: This is a completed activity.
 #: ../e-util/e-activity.c:227
-#, fuzzy, c-format
+#, c-format
 msgid "%s (completed)"
-msgstr "%s (%d%% выполнено)"
+msgstr "%s (выполнено)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
 #: ../e-util/e-activity.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s..."
-msgstr "%s (...)"
+msgstr "%s…"
 
 #: ../e-util/e-activity.c:236
 #, c-format
@@ -8644,7 +8832,7 @@ msgstr "Традиционна�"
 #: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
 #: ../e-util/e-charset.c:91
 msgid "Simplified"
-msgstr "Упрощенна�"
+msgstr "Упрощённа�"
 
 #: ../e-util/e-charset.c:94
 msgid "Ukrainian"
@@ -8656,7 +8844,7 @@ msgstr "Визуально"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
@@ -8691,37 +8879,33 @@ msgid "Format:"
 msgstr "Формат:"
 
 #: ../e-util/e-file-utils.c:136
-#, fuzzy
 msgid "(Unknown Filename)"
-msgstr "�еизве�тный тип"
+msgstr "(�еизве�тное им� файла)"
 
 #. Translators: The string value is the basename of a file.
 #: ../e-util/e-file-utils.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "Writing \"%s\""
-msgstr "Ping на %s"
+msgstr "Запи�ь «%s»"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
 #: ../e-util/e-file-utils.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "Копирование «%s» в «%s»"
+msgstr "Запи�ь «%s» на «%s»"
 
 #: ../e-util/e-logger.c:175
-#, fuzzy
 msgid "Name of the logger"
-msgstr "�азвание компонента дл� журнала"
+msgstr "�азвание компонента дл� журналов"
 
 #: ../e-util/e-module.c:188
-#, fuzzy
 msgid "Filename"
-msgstr "_Им� файла:"
+msgstr "Им� файла"
 
 #: ../e-util/e-module.c:189
-#, fuzzy
 msgid "The filename of the module"
-msgstr "Изменить им� �той папки"
+msgstr "Им� файла модул�"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
@@ -8750,8 +8934,8 @@ msgstr "Уровень журналировани�"
 msgid "Messages"
 msgstr "Сообщени�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1430
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "Закрыть �то окно"
 
@@ -8840,12 +9024,12 @@ msgstr "�е удало�ь открыть ��ылку."
 msgid "Could not display help for Evolution."
 msgstr "�е удало�ь показать �правку по Evolution."
 
-#: ../e-util/gconf-bridge.c:1276
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "Ошибка GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1287
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "Дальнейшие ошибки будут выведены на терминал."
 
@@ -8855,16 +9039,16 @@ msgid "Reply-To"
 msgstr "Обратный адре�"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
+#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Копи�"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
-#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
+#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
-msgstr "Скр.копи�"
+msgstr "Скрыта� копи�"
 
 #: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
@@ -8874,14 +9058,14 @@ msgid "Subject"
 msgstr "Тема"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
-msgstr "-------- Пере�ланное �ообщение --------"
+msgstr "-------- Пере�ылаемое �ообщение --------"
 
 #: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
@@ -9075,7 +9259,6 @@ msgid "Select a time to compare against"
 msgstr "Выбрать врем� дл� �равнени�"
 
 #: ../filter/e-filter-file.c:184
-#, fuzzy
 msgid "Choose a File"
 msgstr "Выберите файл"
 
@@ -9124,11 +9307,11 @@ msgid "I_nclude threads"
 msgstr "Включ_а� подшивки"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "Вход�щие"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "И�ход�щие"
 
@@ -9190,7 +9373,7 @@ msgstr "Сравнивать �"
 
 #: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
-msgstr "Отображать фильтры почты:"
+msgstr "Показать фильтры дл� почты:"
 
 #: ../filter/filter.ui.h:4
 msgid ""
@@ -9221,51 +9404,40 @@ msgid "_Filter Rules"
 msgstr "_Правила фильтра"
 
 #: ../filter/filter.ui.h:12
-#, fuzzy
 msgid "a time relative to the current time"
-msgstr ""
-"текущее врем�\n"
-"указанное вами врем�\n"
-"врем� отно�ительно текущего времени"
+msgstr "врем� отно�ительно текущего времени"
 
 #: ../filter/filter.ui.h:13
-#, fuzzy
 msgid "ago"
-msgstr "Метка"
+msgstr "тому назад"
 
 #: ../filter/filter.ui.h:16
-#, fuzzy
 msgid "in the future"
-msgstr ""
-"назад\n"
-"в будущем"
+msgstr "в будущем"
 
 #: ../filter/filter.ui.h:18
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#, fuzzy
 msgid "months"
-msgstr "Ме��ц"
+msgstr "ме��цы"
 
 #: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
 msgid "seconds"
 msgstr "�екунд"
 
 #: ../filter/filter.ui.h:20
-#, fuzzy
 msgid "the current time"
-msgstr "Сохранить текущий файл"
+msgstr "текущее врем�"
 
 #: ../filter/filter.ui.h:21
 msgid "the time you specify"
-msgstr ""
+msgstr "врем�, указанное вами"
 
 #: ../filter/filter.ui.h:23
-#, fuzzy
 msgid "years"
-msgstr "Заголовки"
+msgstr "годы"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9274,63 +9446,55 @@ msgstr[0] "Вложение"
 msgstr[1] "Вложени�"
 msgstr[2] "Вложений"
 
-#: ../mail/e-mail-attachment-bar.c:617
+#: ../mail/e-mail-attachment-bar.c:621
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "В виде значков"
 
-#: ../mail/e-mail-attachment-bar.c:618
+#: ../mail/e-mail-attachment-bar.c:622
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "В виде �пи�ка"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
+#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
-msgstr ""
+msgstr "От�леживание фоку�а"
 
-#: ../mail/e-mail-browser.c:739
-#, fuzzy
+#: ../mail/e-mail-browser.c:742
 msgid "Shell Module"
-msgstr "Режим выделени�"
+msgstr "Модуль оболочки"
 
-#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
 msgid "The mail shell backend"
-msgstr ""
+msgstr "Б�к-�нд почтовой оболочки"
 
-#: ../mail/e-mail-browser.c:750
-#, fuzzy
+#: ../mail/e-mail-browser.c:753
 msgid "Show Deleted"
-msgstr "Удалено"
+msgstr "Показать удалённые"
 
-#: ../mail/e-mail-browser.c:751
-#, fuzzy
+#: ../mail/e-mail-browser.c:754
 msgid "Show deleted messages"
-msgstr "Пере�ланные �ообщени�"
+msgstr "Показать удалённые �ообщени�"
 
 #: ../mail/e-mail-display.c:66
-#, fuzzy
 msgid "_Add to Address Book..."
-msgstr "_Добавить в адре�ную книгу"
+msgstr "_Добавить в адре�ную книгу…"
 
 #: ../mail/e-mail-display.c:73
-#, fuzzy
 msgid "_To This Address"
 msgstr "_По �тому адре�у"
 
 #: ../mail/e-mail-display.c:80
-#, fuzzy
 msgid "_From This Address"
-msgstr "_ �того адре�а"
+msgstr "_С �того адре�а"
 
 #: ../mail/e-mail-display.c:89
-#, fuzzy
 msgid "Create Search _Folder"
-msgstr "Создать папку пои�ка"
+msgstr "_Создать папку пои�ка"
 
 #: ../mail/e-mail-label-dialog.c:220
-#, fuzzy
 msgid "_Label name:"
-msgstr "_Им� �рлыка:"
+msgstr "_�азвание метки:"
 
 #: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
@@ -9359,44 +9523,43 @@ msgstr "_Позже"
 #: ../mail/e-mail-label-manager.c:165
 #: ../modules/mail/e-mail-shell-view-actions.c:515
 msgid "Add Label"
-msgstr "Добавить �рлык"
+msgstr "Добавить метку"
 
 #: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
-msgstr "Изменить �рлык"
+msgstr "Изменить метку"
 
 #: ../mail/e-mail-label-manager.c:349
-#, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"Примечание: Символ подчёркивани� в надпи�и и�пользует�� как обозначение "
-"мнемоники в меню."
+"Примечание: �имвол подчёркивани� в названии метки\n"
+"и�пользует�� как мнемониче�кий идентификатор в меню."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Цвет"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
+#: ../modules/mail/e-mail-shell-view-private.c:963
 msgid "Inbox"
 msgstr "Вход�щие"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
 msgid "Drafts"
 msgstr "Черновики"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
 msgid "Outbox"
 msgstr "И�ход�щие"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:574
 msgid "Templates"
@@ -9450,7 +9613,7 @@ msgstr "�е удало�ь �копировать де�криптор файл
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "�е удало�ь �канировать имеющие�� почтовые �щики на `%s': %s"
 
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
 msgid "Migrating Folders"
 msgstr "Перено� папок"
 
@@ -9469,7 +9632,7 @@ msgstr ""
 #: ../mail/e-mail-migrate.c:2027
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "�е удало�ь открыть �охраненные на �ервере POP данные «%s»: %s"
+msgstr "�е удало�ь открыть �охранённые на �ервере POP данные «%s»: %s"
 
 #: ../mail/e-mail-migrate.c:2043
 #, c-format
@@ -9479,14 +9642,14 @@ msgstr "Ð�е удалоÑ�ÑŒ Ñ�оздать каталог длÑ� хранениÑ
 #: ../mail/e-mail-migrate.c:2075
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "�е удало�ь �копировать �охраненные на �ервере POP3 данные «%s»: %s"
+msgstr "�е удало�ь �копировать �охранённые на �ервере POP3 данные «%s»: %s"
 
 #: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Ошибка �оздани� локального хранилища почты «%s»: %s"
 
-#: ../mail/e-mail-migrate.c:2928
+#: ../mail/e-mail-migrate.c:2934
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9498,29 +9661,12 @@ msgstr ""
 "\n"
 "Подождите, пока Evolution преобразует ваши папки..."
 
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
-#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
-msgid "On This Computer"
-msgstr "�а �том компьютере"
-
-#: ../mail/e-mail-migrate.c:3023
+#: ../mail/e-mail-migrate.c:3031
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "�е удало�ь �оздать локальные почтовые папки в «%s»: %s"
 
-#: ../mail/e-mail-migrate.c:3041
+#: ../mail/e-mail-migrate.c:3049
 #, c-format
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -9533,34 +9679,32 @@ msgstr ""
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:572
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid "Do not ask me again"
-msgstr "�е задавать больше �тот вопро�."
+msgstr "�е задавать больше �тот вопро�"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Скопировать в папку"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "_Копировать"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Переме�тить в папку"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "Пере_ме�тить"
 
-#: ../mail/e-mail-reader.c:808
-#, fuzzy
+#: ../mail/e-mail-reader.c:864
 msgid "Save Message"
 msgid_plural "Save Messages"
-msgstr[0] "Сохранить �ообщение ..."
-msgstr[1] "Сохранить �ообщение ..."
-msgstr[2] "Сохранить �ообщение ..."
+msgstr[0] "Сохранить �ообщение"
+msgstr[1] "Сохранить �ообщени�"
+msgstr[2] "Сохранить �ообщени�"
 
 #. Translators: This is a part of a suggested file name
 #. * used when saving a message or multiple messages to an
@@ -9568,523 +9712,506 @@ msgstr[2] "Сохранить �ообщение ..."
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
 #: ../widgets/table/e-table-click-to-add.c:518
-#, fuzzy
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Сообщение"
-msgstr[1] "Сообщение"
-msgstr[2] "Сообщение"
+msgstr[1] "Сообщени�"
+msgstr[2] "Сообщений"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1143
 msgid "A_dd Sender to Address Book"
 msgstr "_Добавить отправител� в адре�ную книгу"
 
-#: ../mail/e-mail-reader.c:1089
-#, fuzzy
+#: ../mail/e-mail-reader.c:1145
 msgid "Add sender to address book"
 msgstr "Добавить отправител� в адре�ную книгу"
 
-#: ../mail/e-mail-reader.c:1094
+#: ../mail/e-mail-reader.c:1150
 msgid "Check for _Junk"
 msgstr "Проверить на _�пам"
 
-#: ../mail/e-mail-reader.c:1096
+#: ../mail/e-mail-reader.c:1152
 msgid "Filter the selected messages for junk status"
 msgstr "Фильтровать выбранные �ообщени� по �о�то�нию «�пам»"
 
-#: ../mail/e-mail-reader.c:1101
+#: ../mail/e-mail-reader.c:1157
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1159
 msgid "Copy selected messages to another folder"
 msgstr "Копировать выбранные �ообщени� в другую папку"
 
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1164
 msgid "_Delete Message"
 msgstr "_Удалить �ообщение"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1166
 msgid "Mark the selected messages for deletion"
 msgstr "Пометить выбранные �ообщени� дл� удалени�"
 
-#: ../mail/e-mail-reader.c:1115
+#: ../mail/e-mail-reader.c:1171
 msgid "Filter on Mailing _List..."
 msgstr "Фильтр по �пи�ку ра��ылки..."
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1173
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Создать правило дл� фильтрации �ообщений в �тот �пи�ок ра��ылки"
 
-#: ../mail/e-mail-reader.c:1122
+#: ../mail/e-mail-reader.c:1178
 msgid "Filter on _Recipients..."
 msgstr "Фильтр по получателю..."
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1180
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Создать правило дл� фильтрации �ообщений к �тим получател�м"
 
-#: ../mail/e-mail-reader.c:1129
+#: ../mail/e-mail-reader.c:1185
 msgid "Filter on Se_nder..."
 msgstr "Фильтр по отправителю..."
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1187
 msgid "Create a rule to filter messages from this sender"
 msgstr "Создать правило дл� фильтрации �ообщений от �того отправител�"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1192
 msgid "Filter on _Subject..."
 msgstr "Фильтр по теме..."
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1194
 msgid "Create a rule to filter messages with this subject"
 msgstr "Создать правило дл� фильтрации �ообщений � �той темой"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1199
 msgid "A_pply Filters"
 msgstr "Применить _фильтры"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1201
 msgid "Apply filter rules to the selected messages"
 msgstr "Применить фильтры к выбранным �ообщени�м"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1206
 msgid "_Find in Message..."
 msgstr "_Пои�к в �ообщении..."
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1208
 msgid "Search for text in the body of the displayed message"
 msgstr "Пои�к в тек�те отображаемого �ообщени�"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1213
 msgid "_Clear Flag"
 msgstr "О_чи�тить отметку"
 
-#: ../mail/e-mail-reader.c:1159
-#, fuzzy
+#: ../mail/e-mail-reader.c:1215
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "Создать новую задачу из выделенного �ообщени�"
+msgstr "Сн�ть метку «к и�полнению» � выбранных �ообщений"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1220
 msgid "_Flag Completed"
 msgstr "_Отметка «Завершено»"
 
-#: ../mail/e-mail-reader.c:1166
-#, fuzzy
+#: ../mail/e-mail-reader.c:1222
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Выделить в�е �ообщени� в той же подшивке, что и выделенное �ообщение"
+msgstr "У�тановить флаг «к и�полнению» в значение «завершено» дл� выделенных �ообщений"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1227
 msgid "Follow _Up..."
 msgstr "К _и�полнению..."
 
-#: ../mail/e-mail-reader.c:1173
-#, fuzzy
+#: ../mail/e-mail-reader.c:1229
 msgid "Flag the selected messages for follow-up"
-msgstr "Пометить выделенные �ообщени� к и�полнению"
+msgstr "Отметить выделенные �ообщени� к и�полнению"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1234
 msgid "_Attached"
 msgstr "_Вложение"
 
-#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Пере�лать выбранное �ообщение кому-либо как вложение"
+msgstr "Перенаправить выбранное �ообщение кому-либо как вложение"
 
-#: ../mail/e-mail-reader.c:1185
-#, fuzzy
+#: ../mail/e-mail-reader.c:1241
 msgid "Forward As _Attached"
-msgstr "_Пере�лать как iCalendar"
+msgstr "Перенаправить как _вложенное"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1248
 msgid "_Inline"
 msgstr "В_�троенное"
 
-#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
 msgid "Forward the selected message in the body of a new message"
-msgstr "Пере�лать выбранное �ообщение в теле нового �ообщени�"
+msgstr "Перенаправить выбранное �ообщение в теле нового �ообщени�"
 
-#: ../mail/e-mail-reader.c:1199
-#, fuzzy
+#: ../mail/e-mail-reader.c:1255
 msgid "Forward As _Inline"
-msgstr "Стиль _пере�ылки:"
+msgstr "Перенаправить как в�_троенное"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1262
 msgid "_Quoted"
 msgstr "_Цитирование"
 
-#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
 msgid "Forward the selected message quoted like a reply"
-msgstr "Пере�лать выбранное �ообщение процитированным как при ответе"
+msgstr "Перенаправить выбранное �ообщение процитированным как при ответе"
 
-#: ../mail/e-mail-reader.c:1213
-#, fuzzy
+#: ../mail/e-mail-reader.c:1269
 msgid "Forward As _Quoted"
-msgstr "Стиль _пере�ылки:"
+msgstr "Перенаправить как _цитируемое"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1276
 msgid "_Load Images"
 msgstr "_Загрузить изображени�"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1278
 msgid "Force images in HTML mail to be loaded"
 msgstr "Включить загрузку картинок в почте в формате HTML"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1283
 msgid "_Important"
 msgstr "_Важное"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1285
 msgid "Mark the selected messages as important"
 msgstr "Пометить выделенные �ообщени� как важные"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1290
 msgid "_Junk"
 msgstr "_Спам"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1292
 msgid "Mark the selected messages as junk"
 msgstr "Пометить выделенные �ообщени� как �пам"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1297
 msgid "_Not Junk"
 msgstr "_�е �пам"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1299
 msgid "Mark the selected messages as not being junk"
 msgstr "Пометить выделенные �ообщени� как не �пам"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1304
 msgid "_Read"
 msgstr "_Чтение"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1306
 msgid "Mark the selected messages as having been read"
 msgstr "Пометить выделенные �ообщени� как уже прочитанные"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1311
 msgid "Uni_mportant"
 msgstr "_�еважное"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1313
 msgid "Mark the selected messages as unimportant"
 msgstr "Пометить выделенные �ообщени� как неважные"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1318
 msgid "_Unread"
 msgstr "_�епрочитано"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1320
 msgid "Mark the selected messages as not having been read"
 msgstr "Пометить выделенные �ообщени� как еще не прочитанные"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1325
 msgid "_Edit as New Message..."
 msgstr "_Править как новое �ообщение..."
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1327
 msgid "Open the selected messages in the composer for editing"
 msgstr "Открыть выделенные �ообщени� в редакторе дл� изменени�"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1332
 msgid "Compose _New Message"
 msgstr "Созд_ать новое �ообщение"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1334
 msgid "Open a window for composing a mail message"
 msgstr "Открыть окно дл� �оздани� почтового �ообщени�"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1339
 msgid "_Open in New Window"
 msgstr "_Открыть в новом окне"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1341
 msgid "Open the selected messages in a new window"
 msgstr "Отправить выделенные �ообщени� в новом окне"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1346
 msgid "_Move to Folder..."
 msgstr "Переме�тить в папку..."
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1348
 msgid "Move selected messages to another folder"
 msgstr "Переме�тить выделенные �ообщени� в другую папку"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1353
 msgid "_Next Message"
 msgstr "_Следующему �ообщению"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1355
 msgid "Display the next message"
 msgstr "Показать �ледующее �ообщение"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1360
 msgid "Next _Important Message"
 msgstr "Следующему важному �ообщению"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1362
 msgid "Display the next important message"
 msgstr "Показать �ледующее важное �ообщение"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1367
 msgid "Next _Thread"
 msgstr "Следующей подшивке"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1369
 msgid "Display the next thread"
 msgstr "Показать �ледующую подшивку"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1374
 msgid "Next _Unread Message"
 msgstr "Следующему непрочитанному �ообщению"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1376
 msgid "Display the next unread message"
 msgstr "Показать �ледующее непрочитанное �ообщение"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1381
 msgid "_Previous Message"
 msgstr "_Предыдущему �ообщению"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1383
 msgid "Display the previous message"
 msgstr "Показать предыдущее �ообщение"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1388
 msgid "Pr_evious Important Message"
 msgstr "Предыдущему важному �ообщению"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1390
 msgid "Display the previous important message"
 msgstr "Показать предыдущее важное �ообщение"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1395
 msgid "P_revious Unread Message"
 msgstr "Предыдущему непрочитанному �ообщению"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1397
 msgid "Display the previous unread message"
 msgstr "Показать предыдущее непрочитанное �ообщение"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1404
 msgid "Print this message"
-msgstr "�апечатать �то �ообщение"
+msgstr "Выве�ти на печать �то �ообщение"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1411
 msgid "Preview the message to be printed"
 msgstr "По�мотреть вид �ообщени� на печати"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1416
 msgid "Re_direct"
 msgstr "Пе_ренаправить"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1418
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Пере�лать выбранное �ообщение кому-либо от �воего имени"
 
-#: ../mail/e-mail-reader.c:1367
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../mail/e-mail-reader.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Ответить _в�ем"
 
-#: ../mail/e-mail-reader.c:1369
-#, fuzzy
+#: ../mail/e-mail-reader.c:1425
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Ответить в�ем получател�м �того �ообщени�"
+msgstr "Ответить в�ем получател�м выделенного �ообщени�"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1430
 msgid "Reply to _List"
 msgstr "Ответить в _�пи�ок"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1432
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Ответить в �пи�ок ра��ылки �того �ообщени�"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1437
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1439
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Ответить отправителю �того �ообщени�"
 
-#: ../mail/e-mail-reader.c:1388
-#, fuzzy
+#: ../mail/e-mail-reader.c:1444
 msgid "_Save as mbox..."
-msgstr "Сохранить как..."
+msgstr "Со_хранить как mbox..."
 
-#: ../mail/e-mail-reader.c:1390
-#, fuzzy
+#: ../mail/e-mail-reader.c:1446
 msgid "Save selected messages as an mbox file"
-msgstr "Сохранить выделенные �ообщени� в тек�товом файле"
+msgstr "Сохранить выделенные �ообщени� как файл mbox"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1451
 msgid "Search Folder from Mailing _List..."
-msgstr "Папку пои�ка по �пи�ку _ра��ылки..."
+msgstr "Папка пои�ка по �пи�ку _ра��ылки..."
 
-#: ../mail/e-mail-reader.c:1397
-#, fuzzy
+#: ../mail/e-mail-reader.c:1453
 msgid "Create a search folder for this mailing list"
 msgstr "Создать папку пои�ка дл� �того �пи�ка ра��ылки"
 
-#: ../mail/e-mail-reader.c:1402
+#: ../mail/e-mail-reader.c:1458
 msgid "Search Folder from Recipien_ts..."
-msgstr "Папку пои�ка по полу_чател�м..."
+msgstr "Папка пои�ка по полу_чател�м..."
 
-#: ../mail/e-mail-reader.c:1404
-#, fuzzy
+#: ../mail/e-mail-reader.c:1460
 msgid "Create a search folder for these recipients"
 msgstr "Создать папку пои�ка дл� �тих получателей"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1465
 msgid "Search Folder from Sen_der..."
-msgstr "Папку пои�ка по _отправителю..."
+msgstr "Папка пои�ка по _отправителю..."
 
-#: ../mail/e-mail-reader.c:1411
-#, fuzzy
+#: ../mail/e-mail-reader.c:1467
 msgid "Create a search folder for this sender"
 msgstr "Создать папку пои�ка дл� �того отправител�"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1472
 msgid "Search Folder from S_ubject..."
-msgstr "Папку пои�ка по _теме..."
+msgstr "Папка пои�ка по _теме..."
 
-#: ../mail/e-mail-reader.c:1418
-#, fuzzy
+#: ../mail/e-mail-reader.c:1474
 msgid "Create a search folder for this subject"
 msgstr "Создать папку пои�ка дл� �той темы"
 
-#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1479
 msgid "_Message Source"
 msgstr "_И�ходный тек�т �ообщени�"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1481
 msgid "Show the raw email source of the message"
-msgstr "Отображать полный и�ходный тек�т �ообщени�"
+msgstr "Показать и�ходный тек�т �ообщени�"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1493
 msgid "_Undelete Message"
 msgstr "В_о��тановить �ообщение"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1495
 msgid "Undelete the selected messages"
 msgstr "Во��тановить выделенные �ообщени�"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1500
 msgid "_Normal Size"
 msgstr "Обычный размер"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1502
 msgid "Reset the text to its original size"
 msgstr "У�тановить размер тек�та в и�ходный"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1507
 msgid "_Zoom In"
 msgstr "У_величить"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1509
 msgid "Increase the text size"
 msgstr "Увеличить размер тек�та"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1514
 msgid "Zoom _Out"
 msgstr "У_меньшить"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1516
 msgid "Decrease the text size"
 msgstr "Уменьшить размер тек�та"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1523
 msgid "Create R_ule"
 msgstr "Создать прав_ило"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1530
 msgid "Ch_aracter Encoding"
 msgstr "Ко_дировка �имволов"
 
-#: ../mail/e-mail-reader.c:1481
-#, fuzzy
+#: ../mail/e-mail-reader.c:1537
 msgid "F_orward As"
-msgstr "П_ере�лать как..."
+msgstr "_Перенаправить как"
 
-#: ../mail/e-mail-reader.c:1488
+#: ../mail/e-mail-reader.c:1544
 msgid "_Go To"
 msgstr "Пе_рейти к"
 
-#: ../mail/e-mail-reader.c:1495
-#, fuzzy
+#: ../mail/e-mail-reader.c:1551
 msgid "Mar_k As"
 msgstr "По_метить как"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1558
 msgid "_Message"
 msgstr "Сооб_щение"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1565
 msgid "_Zoom"
 msgstr "_Ма�штаб"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark for Follo_w Up..."
 msgstr "Пометить к _и�полнению..."
 
-#: ../mail/e-mail-reader.c:1542
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Important"
 msgstr "Пометить как _важное"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Junk"
 msgstr "Пометить как _�пам"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1606
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не �пам"
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1610
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: ../mail/e-mail-reader.c:1558
-#, fuzzy
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as Uni_mportant"
 msgstr "Пометить как нева_жное"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark as _Unread"
 msgstr "Пометить как _непрочтенные"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1654
 msgid "_Caret Mode"
 msgstr "Режим _каретки"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1656
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Показывать мигающий кур�ор в теле отображаемых �ообщений"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1662
 msgid "All Message _Headers"
 msgstr "В�е _заголовки �ообщени�"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1664
 msgid "Show messages with all email headers"
 msgstr "Отображать �ообщени� �о в�еми заголовками"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1897
 msgid "Unable to retrieve message"
 msgstr "�е удало�ь получить �ообщение"
 
-#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
-#, fuzzy, c-format
+#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/mail-ops.c:1849
+#, c-format
 msgid "Retrieving message '%s'"
-msgstr "Получение �ообщени� %s"
+msgstr "Получение �ообщени� «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2467
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10092,33 +10219,33 @@ msgstr "Получение �ообщени� %s"
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2588
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "Пе_ре�лать"
 
-#: ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2589
 msgid "Forward the selected message to someone"
-msgstr "Пере�лать выбранное �ообщение кому-либо"
+msgstr "Перенаправить выбранное �ообщение кому-либо"
 
-#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../mail/e-mail-reader.c:2538
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../mail/e-mail-reader.c:2637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Вперёд"
 
-#: ../mail/e-mail-reader.c:2542
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../mail/e-mail-reader.c:2641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "�азад"
 
-#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Ответить"
 
@@ -10128,7 +10255,7 @@ msgstr "Пометить к и�полнению"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "Без шифровани�"
@@ -10136,7 +10263,7 @@ msgstr "Без шифровани�"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "Шифрование TLS"
@@ -10144,17 +10271,17 @@ msgstr "Шифрование TLS"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "Шифрование SSL"
 
-#: ../mail/em-account-editor.c:595
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Лицензионное �оглашение"
 
-#: ../mail/em-account-editor.c:602
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -10168,8 +10295,7 @@ msgstr ""
 "и у�тановите флажок, чтобы прин�ть его\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
-#, fuzzy
+#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "�ет"
@@ -10187,32 +10313,26 @@ msgid "Ask for each message"
 msgstr "Запрашивать дл� каждого �ообщени�"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
-#, fuzzy
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "�ет"
 
-#: ../mail/em-account-editor.c:2055
+#: ../mail/em-account-editor.c:2061
 msgid "Mail Configuration"
 msgstr "�а�тройка почты"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2062
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin."
 msgstr ""
-"Ва� привет�твует ма�тер на�тройки �лектронной почты Evolution.\n"
+"Добро пожаловать в ма�тер на�тройки �лектронной почты Evolution.\n"
 "\n"
 "Чтобы при�тупить к на�тройке, нажмите «Далее»."
 
-#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "Подлинно�ть"
-
-#: ../mail/em-account-editor.c:2059
+#: ../mail/em-account-editor.c:2065
 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 "
@@ -10222,20 +10342,20 @@ msgstr ""
 "об�зательны дл� заполнени�, е�ли только вы не хотите включать �ти �ведени� в "
 "отправл�емую вами почту."
 
-#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
+#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2068
 msgid "Please configure the following account settings."
-msgstr "Пожалуй�та, на�тройте �ледующие параметры учётной запи�и."
+msgstr "�а�тройте �ледующие параметры учётной запи�и."
 
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
+#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
 msgid "Sending Email"
 msgstr "Отправка �л.почты"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2071
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10243,25 +10363,23 @@ msgstr ""
 "Введите информацию о �по�обе отправки �лектронной почты. Е�ли вы не уверены, "
 "�в�жите�ь �о �воим �и�темным админи�тратором или по�тавщиком у�луг Интернета."
 
-#: ../mail/em-account-editor.c:2067
+#: ../mail/em-account-editor.c:2073
 msgid "Account Management"
 msgstr "Управление учётными запи��ми"
 
-#: ../mail/em-account-editor.c:2068
-#, fuzzy
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Введите им�, опи�ывающее �ту учётную запи�ь. Это им� будет и�пользовать�� "
-"только на �кране."
+"�иже введите им�, опи�ывающее �ту учётную запи�ь.\n"
+"Это им� будет и�пользовать�� только дл� отображени�."
 
-#: ../mail/em-account-editor.c:2072
+#: ../mail/em-account-editor.c:2078
 msgid "Done"
 msgstr "Готово"
 
-#: ../mail/em-account-editor.c:2073
-#, fuzzy
+#: ../mail/em-account-editor.c:2079
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10271,53 +10389,61 @@ msgid ""
 msgstr ""
 "Поздравл�ем, на�тройка почты завершена.\n"
 "\n"
-"Программа готова к отправке и приему �лектронной почты\n"
+"Программа готова к отправке и приёму �лектронной почты\n"
 "� и�пользованием Evolution.\n"
 "\n"
 "�ажмите «Применить», чтобы �охранить ваши на�тройки."
 
-#: ../mail/em-account-editor.c:2518
+#: ../mail/em-account-editor.c:2520
 msgid "Check for _new messages every"
 msgstr "Провер�ть _новую почту каждые"
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2528
 msgid "minu_tes"
 msgstr "мину_т"
 
-#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "По умолчанию"
-
-#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "Безопа�но�ть"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "Параметры получени�"
 
-#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
+#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
-msgstr "Проверка новой почты"
+msgstr "Проверка новых �ообщений"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3418
 msgid "Account Editor"
-msgstr "Редактор учётных запи�ей"
+msgstr "Редактор учётной запи�и"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3418
 msgid "Evolution Account Assistant"
-msgstr "Помощник по учётным запи��м Evolution"
+msgstr "Ма�тер учётной запи�и Evolution"
+
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1578
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "Сообщение дл� %s о «%s» было прочитано %s."
 
-#: ../mail/em-composer-utils.c:1954
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1626
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "До�тавка уведомлени� дл�: «%s»"
+
+#: ../mail/em-composer-utils.c:1950
 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:2001
+#: ../mail/em-composer-utils.c:1997
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10325,15 +10451,15 @@ msgstr ""
 "В ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} в ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пишет:"
 
-#: ../mail/em-composer-utils.c:2145
+#: ../mail/em-composer-utils.c:2141
 msgid "-----Original Message-----"
 msgstr "-------- И�ходное �ообщение --------"
 
-#: ../mail/em-composer-utils.c:2326
+#: ../mail/em-composer-utils.c:2322
 msgid "Posting destination"
 msgstr "�азначение:"
 
-#: ../mail/em-composer-utils.c:2327
+#: ../mail/em-composer-utils.c:2323
 msgid "Choose folders to post the message to."
 msgstr "Выберите папки дл� помещени� в них �ообщений."
 
@@ -10416,7 +10542,7 @@ msgstr "К и�полнению"
 
 #: ../mail/em-filter-i18n.h:29
 msgid "Forward to"
-msgstr "Пере�лать к"
+msgstr "Перенаправить к"
 
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
@@ -10537,7 +10663,7 @@ msgstr "Отправитель или получатели"
 
 #: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
-msgstr "У�тановить �рлык"
+msgstr "У�тановить метку"
 
 #: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
@@ -10625,17 +10751,19 @@ msgid "Folder _name:"
 msgstr "_Им� папки:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
+#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
 #: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "Папки пои�ка"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
+#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "Загрузка..."
 
@@ -10701,14 +10829,12 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ельз� перетащить �ообщение в хранилище верхнего уровн�"
 
 #: ../mail/em-folder-utils.c:386
-#, fuzzy
 msgid "Move Folder To"
-msgstr "Пере_ме�тить папку в..."
+msgstr "Переме�тить папку в"
 
 #: ../mail/em-folder-utils.c:386
-#, fuzzy
 msgid "Copy Folder To"
-msgstr "_Копировать папку в..."
+msgstr "Копировать папку в"
 
 #: ../mail/em-folder-utils.c:507
 #: ../plugins/groupwise-features/share-folder-common.c:141
@@ -10717,9 +10843,8 @@ msgid "Creating folder `%s'"
 msgstr "Создание папки «%s»"
 
 #: ../mail/em-folder-utils.c:670
-#, fuzzy
 msgid "Create Folder"
-msgstr "Создать новую папку"
+msgstr "Создать папку"
 
 #: ../mail/em-folder-utils.c:671
 #: ../plugins/groupwise-features/install-shared.c:175
@@ -10872,15 +10997,15 @@ msgstr "Про�рочена:"
 msgid "by"
 msgstr "в"
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
 msgid "View _Unformatted"
 msgstr "Отобразить _неотформатированные"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid "Hide _Unformatted"
 msgstr "Скрыть _неформатированные"
 
-#: ../mail/em-format-html-display.c:1017
+#: ../mail/em-format-html-display.c:1021
 msgid "O_pen With"
 msgstr "О_ткрыть � помощью"
 
@@ -10938,7 +11063,7 @@ msgstr "Указатель на неизве�тные внешние данны
 #. 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:2595
+#: ../mail/em-format-html.c:2628
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Это пи�ьмо было ото�лано <b>%s</b> от лица <b>%s</b>"
@@ -10958,18 +11083,18 @@ msgstr "Папка"
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
-msgstr "Пожалуй�та, выберите �ервер."
+msgstr "Выберите �ервер."
 
 #: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
-msgstr "�е был выбран �ервер"
+msgstr "Сервер не выбран"
 
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "Фильтры �ообщений"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "Сообщени� от %s"
@@ -10979,39 +11104,32 @@ msgid "Search _Folders"
 msgstr "_Папки пои�ка"
 
 #: ../mail/em-vfolder-rule.c:522
-#, fuzzy
 msgid "Add Folder"
-msgstr "Папка"
+msgstr "Добавить папку"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Filter Editor\" window height"
-msgstr "Вы�ота окна по умолчанию"
+msgstr "Вы�ота окна «Редактор фильтров»"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-#, fuzzy
 msgid "\"Filter Editor\" window maximize state"
-msgstr "Развёрнутое �о�то�ние окна «Получение и отправка почты»"
+msgstr "Развёрнутое �о�то�ние окна «Редактор фильтров»"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Filter Editor\" window width"
-msgstr "Ширина окна по умолчанию"
+msgstr "Ширина окна «Редактор фильтров»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#, fuzzy
 msgid "\"Search Folder Editor\" window height"
-msgstr "Вы�ота окна по умолчанию"
+msgstr "Вы�ота окна «Редактор папок пои�ка»"
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#, fuzzy
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Развёрнутое �о�то�ние окна «Получение и отправка почты»"
+msgstr "Развёрнутое �о�то�ние окна «Редактор папок пои�ка»"
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#, fuzzy
 msgid "\"Search Folder Editor\" window width"
-msgstr "Папка пои�ка по �пи�ку _ра��ылки"
+msgstr "Ширина окна «Редактор папок пои�ка»"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
@@ -11122,18 +11240,16 @@ msgid "Default height of the Composer Window."
 msgstr "Вы�ота окна редактора по умолчанию."
 
 #: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
 msgid "Default height of the mail browser window."
-msgstr "Вы�ота окна редактора по умолчанию."
+msgstr "Вы�ота окна браузера почты по умолчанию."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Вы�ота диалога подпи�ки по умолчанию."
 
 #: ../mail/evolution-mail.schemas.in.h:34
-#, fuzzy
 msgid "Default maximized state of the mail browser window."
-msgstr "Ширина окна редактора по умолчанию."
+msgstr "Развёрнутое �о�то�ние окна браузера почты по умолчанию "
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
@@ -11148,9 +11264,8 @@ msgid "Default width of the Composer Window."
 msgstr "Ширина окна редактора по умолчанию."
 
 #: ../mail/evolution-mail.schemas.in.h:38
-#, fuzzy
 msgid "Default width of the mail browser window."
-msgstr "Ширина окна редактора по умолчанию."
+msgstr "Ширина окна браузера почты по умолчанию"
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
@@ -11177,8 +11292,8 @@ msgid ""
 msgstr ""
 "Определ�ет, нужно ли и�кать �лектронный адре� отправител� в адре�ной книге. "
 "Е�ли он там е�ть, то �ообщение, видимо, не �вл�ет�� �памом. Пои�к "
-"производит�� в адре�ных книгах, помеченных дл� автозавершени�. Пои�к может "
-"быть медленным, е�ли дл� автозавершени� помечены удалённые книги (например, "
+"производит�� в адре�ных книгах, помеченных дл� автодополнени�. Пои�к может "
+"быть медленным, е�ли дл� автодополнени� помечены удалённые книги (например, "
 "LDAP)."
 
 #: ../mail/evolution-mail.schemas.in.h:43
@@ -11218,9 +11333,8 @@ msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Включить или выключить �окращение имён папок в боковой панели"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-#, fuzzy
 msgid "Do not add signature delimiter"
-msgstr "�е удало�ь �охранить файл подпи�и."
+msgstr "�е добавл�ть разделитель дл� подпи�и."
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
@@ -11347,22 +11461,20 @@ msgstr ""
 "�того компонента."
 
 #: ../mail/evolution-mail.schemas.in.h:73
-#, fuzzy
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"И�ходное значение вы�оты окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь измен�ет размер окна по вертикали."
+"И�ходное значение вы�оты окна «Редактор фильтров». Значение обновл�ет��, "
+"когда пользователь измен�ет вертикальные размеры окна."
 
 #: ../mail/evolution-mail.schemas.in.h:74
-#, fuzzy
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"И�ходное значение вы�оты окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь измен�ет размер окна по вертикали."
+"И�ходное значение вы�оты окна «Редактор папок пои�ка». Значение обновл�ет��, "
+"когда пользователь измен�ет вертикальные размеры окна."
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
@@ -11373,32 +11485,30 @@ msgstr ""
 "измен�ет��, когда пользователь измен�ет размер окна по вертикали."
 
 #: ../mail/evolution-mail.schemas.in.h:76
-#, fuzzy
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"И�ходное �о�то�ние окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь разворачивает окно на ве�ь �кран или "
-"�ворачивает его. Заметьте, что значение не и�пользует�� Evolution, так как "
-"окно «Отправка и получение почты» не может быть развёрнуто на ве�ь �кран. "
-"Этот ключ �уще�твует только из-за деталей реализации."
+"И�ходное �о�то�ние окна «Редактор фильтров». Значение обновл�ет��, когда "
+"пользователь разворачивает окно на ве�ь �кран или во��танавливает его. "
+"Заметьте, что значение не и�пользует�� Evolution, так как окно «Редактор "
+"фильтров» не может быть развёрнуто на ве�ь �кран. Этот ключ �уще�твует "
+"только из-за деталей реализации."
 
 #: ../mail/evolution-mail.schemas.in.h:77
-#, fuzzy
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"И�ходное �о�то�ние окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь разворачивает окно на ве�ь �кран или "
-"�ворачивает его. Заметьте, что значение не и�пользует�� Evolution, так как "
-"окно «Отправка и получение почты» не может быть развёрнуто на ве�ь �кран. "
-"Этот ключ �уще�твует только из-за деталей реализации."
+"И�ходное �о�то�ние окна «Редактор папок пои�ка». Значение обновл�ет��, когда "
+"пользователь разворачивает окно на ве�ь �кран или во��танавливает его. "
+"Заметьте, что значение не и�пользует�� Evolution, так как окно «Редактор "
+"папок пои�ка» не может быть развёрнуто на ве�ь �кран. Этот ключ �уще�твует "
+"только из-за деталей реализации."
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
@@ -11415,22 +11525,20 @@ msgstr ""
 "Этот ключ �уще�твует только из-за деталей реализации."
 
 #: ../mail/evolution-mail.schemas.in.h:79
-#, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"И�ходное значение ширины окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь измен�ет размер окна по горизонтали."
+"И�ходное значение ширины окна «Редактор фильтров». Значение обновл�ет��, "
+"когда пользователь измен�ет горизонтальные размеры окна."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-#, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"И�ходное значение ширины окна «Отправка и получение почты». Это значение "
-"измен�ет��, когда пользователь измен�ет размер окна по горизонтали."
+"И�ходное значение ширины окна «Редактор папок пои�ка». Значение обновл�ет��, "
+"когда пользователь измен�ет горизонтальные размеры окна."
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
@@ -11459,13 +11567,12 @@ msgid "Last time empty trash was run"
 msgstr "Врем� по�ледней очи�тки корзины"
 
 #: ../mail/evolution-mail.schemas.in.h:85
-#, fuzzy
 msgid "Layout style"
-msgstr "Панели _ин�трументов"
+msgstr "Стиль размещени�"
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
-msgstr "Спи�ок �рлыков и �в�занных � ними цветов"
+msgstr "Спи�ок меток и �в�занных � ними цветов"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
@@ -11501,7 +11608,7 @@ 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."
 msgstr ""
-"Спи�ок �рлыков, изве�тных почтовому компоненту Evolution. Спи�ок �одержит "
+"Спи�ок меток, изве�тных почтовому компоненту Evolution. Спи�ок �одержит "
 "�троки им�:цвет, где цвет и�пользует кодировку цвета HTML."
 
 #: ../mail/evolution-mail.schemas.in.h:95
@@ -11539,18 +11646,16 @@ msgid "Logfile to log filter actions."
 msgstr "Файл журнала дей�твий фильтра."
 
 #: ../mail/evolution-mail.schemas.in.h:102
-#, fuzzy
 msgid "Mail browser height"
-msgstr "Обща� вы�ота �троки"
+msgstr "Вы�ота браузера почты"
 
 #: ../mail/evolution-mail.schemas.in.h:103
 msgid "Mail browser maximized"
-msgstr ""
+msgstr "Браузер почты имеет мак�имальные размеры"
 
 #: ../mail/evolution-mail.schemas.in.h:104
-#, fuzzy
 msgid "Mail browser width"
-msgstr "Почтовый адре� начинает�� �"
+msgstr "Ширина браузера почты"
 
 #: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
@@ -11604,9 +11709,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Предупреждать, е�ли пользователь пытает�� отправить �ообщение � пу�тым полем "
-"Subject."
+msgstr "Предупреждать, е�ли пользователь пытает�� отправить �ообщение без темы."
 
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
@@ -11618,7 +11721,7 @@ msgstr "Предупреждать при очиÑ�тке пользователÐ
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
-msgstr "Предупреждать, е�ли пользователь заполнил только поле Bcc"
+msgstr "Предупреждать, е�ли пользователь заполнил только поле �крытой копии"
 
 #: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -11634,7 +11737,9 @@ msgstr "Предупреждать при отправке �ообщений в
 
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Предупреждать при попытке отправить �ообщение � пу�тыми пол�ми To и Cc."
+msgstr ""
+"Предупреждать при попытке отправки �ообщений � пу�тыми пол�ми «Кому» или "
+"«Копи�»."
 
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
@@ -11693,22 +11798,24 @@ msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
+"У�тановите в значение ИСТИ��, е�ли вы не хотите добавл�ть разделитель "
+"подпи�и при �оздании почтового �ообщени�"
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Отображать поле «Bcc» при отправке почтового �ообщени�"
+msgstr "Отображать поле «Скрыта� копи�» при отправке почтового �ообщени�"
 
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Отображать поле «Cc» при отправке почтового �ообщени�"
+msgstr "Отображать поле «Копи�» при отправке почтового �ообщени�"
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "Отображать поле «From» при отправке в группу ново�тей"
+msgstr "Отображать поле «От» при отправке в группу ново�тей"
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
-msgstr "Отображать поле «From» при отправке почтового �ообщени�"
+msgstr "Отображать поле «От» при отправке почтового �ообщени�"
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
@@ -11723,14 +11830,12 @@ msgid "Show Animations"
 msgstr "Показывать анимацию"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
 msgid "Show all message headers"
-msgstr "Свернуть в�е подшивки �ообщений"
+msgstr "Показывать в�е заголовки �ообщений"
 
 #: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
 msgid "Show all the headers when viewing a messages."
-msgstr "Отображать поле «�дре� дл� ответа» при отправке почтовых �ообщений"
+msgstr "Показывать в�е заголовки при про�мотре �ообщений."
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
@@ -11750,7 +11855,7 @@ msgstr "Показывать анимацию изображений"
 
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show original \"Date\" header value."
-msgstr ""
+msgstr "Показать и�ходное значение заголовка «Дата»"
 
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
@@ -11777,7 +11882,7 @@ msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"Показывать поле «От кого» при отправке в группу ново�тей. Этот параметр "
+"Показывать поле «От» при отправке в группу ново�тей. Этот параметр "
 "управл�ет�� из меню Вид, когда выбрана учётна� запи�ь ново�тей."
 
 #: ../mail/evolution-mail.schemas.in.h:156
@@ -11785,7 +11890,7 @@ msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Показывать поле «От кого» при отправке в группу ново�тей. Этот параметр "
+"Показывать поле «От» при отправке в группу ново�тей. Этот параметр "
 "управл�ет�� из меню Вид, когда выбрана учётна� запи�ь почты."
 
 #: ../mail/evolution-mail.schemas.in.h:157
@@ -11816,6 +11921,9 @@ msgid ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
+"Показать и�ходный заголовок «Дата» (� локальным временем, только е�ли "
+"отличает�� ча�овой по��). В противном �лучае, в�егда показывать значение "
+"заголовка «Дата» в формате и � ча�овым по��ом, выбранным пользователем."
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
@@ -11868,6 +11976,10 @@ msgid ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
+"Стиль размещени� задаёт ме�то дл� панели предварительного про�мотра "
+"отно�ительно �пи�ка �ообщений. «0» (кла��иче�кий вид) помещает панель под "
+"�пи�ок �ообщений. «1» (вертикальный вид) помещает панель р�дом �о �пи�ком "
+"�ообщений."
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
@@ -12096,7 +12208,7 @@ msgid "Select folder to import into"
 msgstr "Выберите папку дл� импорта"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:243
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -12136,7 +12248,7 @@ msgstr "Evolution Pine importer"
 
 #: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
-msgstr "Импорт почты из Pine"
+msgstr "Импорт почты из Pine."
 
 #: ../mail/mail-autofilter.c:73
 #, c-format
@@ -12164,16 +12276,15 @@ msgstr "Добавить правило фильтра"
 
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
-msgstr "(Примечание: требует перезапу�ка приложени�)"
+msgstr "(примечание: требует�� перезапу�к приложени�)"
 
 #: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Ответ в начале пи�ьма</b> (�е рекомендует��)"
+msgstr "<b>Ответ в начале пи�ьма</b> (не рекомендует��)"
 
 #: ../mail/mail-config.ui.h:3
-#, fuzzy
 msgid "Account Information"
-msgstr "�ет информации"
+msgstr "Информаци� об учётной запи�и"
 
 #: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
@@ -12191,11 +12302,11 @@ msgstr "Шифровать также и длÑ� _Ñ�ебÑ� при отправкÐ
 
 #: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "В�егда отправл�ть копию (Cc) на:"
+msgstr "В�егда отправл�ть копию на:"
 
 #: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "В�егда отправл�ть невидимую копию (Bcc) на:"
+msgstr "В�егда отправл�ть �лепую копию на:"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
@@ -12254,9 +12365,8 @@ msgid "Color for _misspelled words:"
 msgstr "Цвет дл� _ошибочных �лов:"
 
 #: ../mail/mail-config.ui.h:25
-#, fuzzy
 msgid "Composing Messages"
-msgstr "�овое �ообщение"
+msgstr "Создание �ообщений"
 
 #: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
@@ -12267,18 +12377,16 @@ msgid "Confirm _when expunging a folder"
 msgstr "_Запрашивать подтверждение очи�тки папки от удаленных �ообщений"
 
 #: ../mail/mail-config.ui.h:29
-#, fuzzy
 msgid "Default Behavior"
-msgstr "Приоритет по умолчанию:"
+msgstr "Поведение по умолчанию"
 
 #: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "_Кодировка �имволов по умолчанию:"
 
 #: ../mail/mail-config.ui.h:32
-#, fuzzy
 msgid "Delete Mail"
-msgstr "Удалить"
+msgstr "Удаление �ообщений"
 
 #: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
@@ -12289,9 +12397,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Подпи�ывать и�ход�щие �ообщени� (по умолчанию)"
 
 #: ../mail/mail-config.ui.h:36
-#, fuzzy
 msgid "Displayed Message _Headers"
-msgstr "В�е _заголовки �ообщени�"
+msgstr "_Отображаемые заголовки �ообщений"
 
 #: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
@@ -12302,9 +12409,8 @@ msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�е поме_чать �ообщени� как �пам, е�ли отправитель е�ть в моей адре�ной книге"
 
 #: ../mail/mail-config.ui.h:39
-#, fuzzy
 msgid "Do not quote"
-msgstr "�е удал�ть"
+msgstr "�е цитировать"
 
 #: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
@@ -12371,13 +12477,12 @@ msgid "Highlight _quotations with"
 msgstr "Выдел�ть _цитирование цветом:"
 
 #: ../mail/mail-config.ui.h:59
-#, fuzzy
 msgid "Inline"
-msgstr "В_�троенное"
+msgstr "В�троенное"
 
 #: ../mail/mail-config.ui.h:60
 msgid "Inline (Outlook style)"
-msgstr ""
+msgstr "В�троенный (в духе Outlook)"
 
 #: ../mail/mail-config.ui.h:62
 msgid "KB"
@@ -12385,16 +12490,15 @@ msgstr "КБ"
 
 #: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
-msgstr "Ярлыки"
+msgstr "Метки"
 
 #: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "Таблица �зыков"
 
 #: ../mail/mail-config.ui.h:65
-#, fuzzy
 msgid "Loading Images"
-msgstr "_Загрузить изображени�"
+msgstr "Загрузка изображений"
 
 #: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
@@ -12405,19 +12509,16 @@ msgid "Mailbox location"
 msgstr "Ра�положение почтового �щика"
 
 #: ../mail/mail-config.ui.h:68
-#, fuzzy
 msgid "Message Display"
-msgstr "Сообщени�"
+msgstr "Отображение �ообщений"
 
 #: ../mail/mail-config.ui.h:69
-#, fuzzy
 msgid "Message Fonts"
-msgstr "Сообщение �одержит"
+msgstr "Шрифты �ообщени�"
 
 #: ../mail/mail-config.ui.h:70
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Отзыв �ообщени�"
+msgstr "Отчёты"
 
 #: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
@@ -12433,15 +12534,12 @@ msgstr ""
 
 #: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Этот параметр будет проигнорирован, в �лучае �овпадени� �\n"
-"указанным пользователем заголовком дл� определени� �пама."
+msgstr "Параметр игнорирует�� при �овпадении � указанными заголовками дл� �пама."
 
 #: ../mail/mail-config.ui.h:75
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
-#, fuzzy
 msgid "Optional Information"
-msgstr "Лична� информаци�"
+msgstr "Дополнительна� информаци�"
 
 #: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
@@ -12457,7 +12555,7 @@ msgstr "_Пароль:"
 
 #: ../mail/mail-config.ui.h:81
 msgid "Port:"
-msgstr "_Порт:"
+msgstr "Порт:"
 
 #: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
@@ -12466,24 +12564,20 @@ msgstr ""
 "только получатели �крытой копии"
 
 #: ../mail/mail-config.ui.h:83
-#, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:85
-#, fuzzy
 msgid "Printed Fonts"
-msgstr "�апечатать заметки"
+msgstr "Печатные шрифты"
 
 #: ../mail/mail-config.ui.h:86
-#, fuzzy
 msgid "Proxy Settings"
-msgstr "�а�тройка �пама"
+msgstr "Параметры прок�и"
 
 #: ../mail/mail-config.ui.h:87
-#, fuzzy
 msgid "Quoted"
-msgstr "_Цитирование"
+msgstr "Цитируемый"
 
 #: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
@@ -12498,14 +12592,12 @@ msgid "Remember _password"
 msgstr "Запомнить _пароль"
 
 #: ../mail/mail-config.ui.h:92
-#, fuzzy
 msgid "Required Information"
-msgstr "Сведени� о �ервере"
+msgstr "Об�зательна� информаци�"
 
 #: ../mail/mail-config.ui.h:94
-#, fuzzy
 msgid "SSL is not supported in this build of Evolution"
-msgstr "<b>SSL не поддерживает�� в �той �борке Evolution</b>"
+msgstr "SSL не поддерживает�� в �той �борке Evolution"
 
 #: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
@@ -12525,12 +12617,11 @@ msgstr "С_тандартный шрифт:"
 
 #: ../mail/mail-config.ui.h:99
 msgid "Secure MIME (S/MIME)"
-msgstr ""
+msgstr "Безопа�ный MIME (S/MIME)"
 
 #: ../mail/mail-config.ui.h:101
-#, fuzzy
 msgid "Select Drafts Folder"
-msgstr "Выбрать папку"
+msgstr "Выбрать папку дл� черновиков"
 
 #: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
@@ -12549,14 +12640,12 @@ msgid "Select HTML variable width font for printing"
 msgstr "Выбрать шрифт HTML переменной ширины дл� печати"
 
 #: ../mail/mail-config.ui.h:106
-#, fuzzy
 msgid "Select Sent Folder"
-msgstr "Выбрать папку"
+msgstr "Выбрать папку дл� отправленных"
 
 #: ../mail/mail-config.ui.h:107
-#, fuzzy
 msgid "Sender Photograph"
-msgstr "<b>Фотографи� отправител�</b>"
+msgstr "Фотографи� отправител�"
 
 #: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
@@ -12567,27 +12656,24 @@ msgid "Sent _Messages Folder:"
 msgstr "Папка _отправленных �ообщений:"
 
 #: ../mail/mail-config.ui.h:110
-#, fuzzy
 msgid "Sent and Draft Messages"
-msgstr "Отправленные �ообщени�"
+msgstr "Отправленные �ообщени� и черновики"
 
 #: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребует�� проверка подлинно�ти"
 
 #: ../mail/mail-config.ui.h:112
-#, fuzzy
 msgid "Server Configuration"
-msgstr "Сведени� о �ервере"
+msgstr "�а�тройка �ервера"
 
 #: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "_Тип �ервера:"
 
 #: ../mail/mail-config.ui.h:114
-#, fuzzy
 msgid "Sig_natures"
-msgstr "Подпи�и"
+msgstr "_Подпи�и"
 
 #: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
@@ -12622,13 +12708,12 @@ msgstr ""
 "у�тановлены �ловари."
 
 #: ../mail/mail-config.ui.h:123
-#, fuzzy
 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 ""
-"Вывод из �того �крипта будет и�пользовать��\n"
+"Вывод �того �ценари� будет и�пользовать��\n"
 "в каче�тве вашей подпи�и. Им�, указанное вами,\n"
 "будет и�пользовать�� только дл� отображени�."
 
@@ -12692,9 +12777,8 @@ msgid "_Keep Signature above the original message on replying"
 msgstr "Помещать подпи�ь _над и�ходным �ообщением при ответе"
 
 #: ../mail/mail-config.ui.h:140
-#, fuzzy
 msgid "_Languages"
-msgstr "Язык"
+msgstr "_Языки"
 
 #: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
@@ -12764,7 +12848,7 @@ msgstr "_Обрезать заголовки To / Cc / Bcc до "
 
 #: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
-msgstr "И�пользовать _защищенное �оединение:"
+msgstr "И�пользовать _защищённое �оединение:"
 
 #: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
@@ -12775,22 +12859,20 @@ msgid "_Use the same fonts as other applications"
 msgstr "_И�пользовать такие же шрифты, как и прочие приложени�"
 
 #: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
-#, fuzzy
 msgid "a"
-msgstr "am"
+msgstr "a"
 
 #: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "адре�ов"
 
 #: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
-#, fuzzy
 msgid "b"
-msgstr "в"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:166
 msgid "color"
-msgstr "."
+msgstr "цвет"
 
 #: ../mail/mail-config.ui.h:167
 msgid "description"
@@ -12821,18 +12903,16 @@ msgid "Co_mpleted"
 msgstr "_Завершено"
 
 #: ../mail/mail-dialogs.ui.h:7
-#, fuzzy
 msgid "Digital Signature"
-msgstr "Редактировать подпи�и"
+msgstr "Цифрова� подпи�ь"
 
 #: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "�е пере�ылать"
 
 #: ../mail/mail-dialogs.ui.h:9
-#, fuzzy
 msgid "Encryption"
-msgstr "Зашифровать"
+msgstr "Шифрование"
 
 #: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
@@ -12848,7 +12928,7 @@ msgstr "Дл� �ведени�"
 
 #: ../mail/mail-dialogs.ui.h:13
 msgid "Forward"
-msgstr "Пере�лать"
+msgstr "Перенаправить"
 
 #: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
@@ -12871,9 +12951,8 @@ msgid "S_erver:"
 msgstr "С_ервер:"
 
 #: ../mail/mail-dialogs.ui.h:22
-#, fuzzy
 msgid "Search Folder Sources"
-msgstr "И�точник папок пои�ка"
+msgstr "И�точники папок пои�ка"
 
 #: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
@@ -12942,7 +13021,7 @@ msgstr "Ошибка Ñ�охранениÑ� в локальной папке «ОÑ
 
 #: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
-msgstr "Отправить �ообщение"
+msgstr "Отправка �ообщени�"
 
 #: ../mail/mail-ops.c:762
 #, c-format
@@ -12963,48 +13042,48 @@ msgid "Complete."
 msgstr "Выполнено."
 
 #: ../mail/mail-ops.c:905
-#, fuzzy, c-format
+#, c-format
 msgid "Saving message to folder '%s'"
-msgstr "Сохранение �ообщени� в папке"
+msgstr "Сохранение �ообщени� в папку «%s»"
 
 #: ../mail/mail-ops.c:982
-#, fuzzy, c-format
+#, c-format
 msgid "Moving messages to '%s'"
-msgstr "Перемещение �ообщений в %s"
+msgstr "Перемещение �ообщений в «%s»"
 
 #: ../mail/mail-ops.c:982
-#, fuzzy, c-format
+#, c-format
 msgid "Copying messages to '%s'"
-msgstr "Копирование �ообщений в %s"
+msgstr "Копирование �ообщений в «%s»"
 
 #: ../mail/mail-ops.c:1091
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Сканирование папок на «%s»"
 
 #: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
-msgstr "Пере�ланные �ообщени�"
+msgstr "Пере�ылаемые �ообщени�"
 
 #: ../mail/mail-ops.c:1240
-#, fuzzy, c-format
+#, c-format
 msgid "Opening folder '%s'"
-msgstr "Открытие папки %s"
+msgstr "Открытие папки «%s»"
 
 #: ../mail/mail-ops.c:1306
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving quota information for folder '%s'"
-msgstr "Получение информации о квоте дл� папки %s"
+msgstr "Получение информации о квоте дл� папки «%s»"
 
 #: ../mail/mail-ops.c:1378
-#, fuzzy, c-format
+#, c-format
 msgid "Opening store '%s'"
-msgstr "Открытие хранилища %s"
+msgstr "Открытие хранилища «%s»"
 
 #: ../mail/mail-ops.c:1449
-#, fuzzy, c-format
+#, c-format
 msgid "Removing folder '%s'"
-msgstr "Удаление папки %s"
+msgstr "Удаление папки «%s»"
 
 #: ../mail/mail-ops.c:1567
 #, c-format
@@ -13022,14 +13101,14 @@ msgid "Storing account '%s'"
 msgstr "Сохранение учётной запи�и «%s»"
 
 #: ../mail/mail-ops.c:1685
-#, fuzzy, c-format
+#, c-format
 msgid "Refreshing folder '%s'"
-msgstr "Обновление папки"
+msgstr "Обновление папки «%s»"
 
 #: ../mail/mail-ops.c:1725
-#, fuzzy, c-format
+#, c-format
 msgid "Expunging folder '%s'"
-msgstr "Очи�тка папки"
+msgstr "Очи�тка папки «%s»"
 
 #: ../mail/mail-ops.c:1770
 #, c-format
@@ -13084,14 +13163,14 @@ msgid "Could not write data: %s"
 msgstr "�е удало�ь запи�ать данные: %s"
 
 #: ../mail/mail-ops.c:2394
-#, fuzzy, c-format
+#, c-format
 msgid "Disconnecting from '%s'"
-msgstr "Отключение от %s"
+msgstr "Отключение от «%s»"
 
 #: ../mail/mail-ops.c:2394
-#, fuzzy, c-format
+#, c-format
 msgid "Reconnecting to '%s'"
-msgstr "Переподключение к %s"
+msgstr "Переподключение к «%s»"
 
 #: ../mail/mail-ops.c:2490
 #, c-format
@@ -13165,16 +13244,16 @@ msgstr "�е удало�ь �оздать каталог очереди «%s»:
 #: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Попытка переме�тить почту из не-mbox и�точника `%s'"
+msgstr "Попытка переме�тить почту из не-mbox и�точника «%s»"
 
 #: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Пере�ланное �ообщение - %s"
+msgstr "Пере�ылаемое �ообщение — %s"
 
 #: ../mail/mail-tools.c:261
 msgid "Forwarded message"
-msgstr "Пере�ланные �ообщени�"
+msgstr "Пере�ылаемое �ообщение"
 
 #: ../mail/mail-tools.c:301
 #, c-format
@@ -13241,62 +13320,56 @@ msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"Е�ли добавить �одержательную Тему к �ообщению, получателю �ообщени� легче "
-"будет пон�ть, о чем ваше пи�ьмо."
+"Добавление пон�тной темы к вашим �ообщени�м позволит получател�м пон�ть, о "
+"чём ваше пи�ьмо."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Вы дей�твительно хотите удалить �ту учётную запи�ь и в�е его прок�и?"
+msgstr "Дей�твительно удалить �ту учётную запи�ь и в�е её прок�и?"
 
 #: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
-msgstr "Вы дей�твительно хотите удалить �ту учётную запи�ь?"
+msgstr "Дей�твительно удалить �ту учётную запи�ь?"
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "Вы дей�твительно хотите удалить �ту учётную запи�ь и в�е её прок�и?"
+msgstr "Дей�твительно удалить �ту учётную запи�ь и в�е её прок�и?"
 
 #: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Вы дей�твительно хотите открыть {0} �ообщений одновременно?"
+msgstr "Дей�твительно хотите открыть {0} �ообщений одновременно?"
 
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
-"Вы дей�твительно хотите окончательно уничтожить в�е удалённые �ообщени� во "
-"в�ех папках?"
+msgstr "Дей�твительно окончательно уничтожить в�е удалённые �ообщени� во в�ех папках?"
 
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr ""
-"Вы дей�твительно хотите окончательно уничтожить в�е удалённые �ообщени� в  "
-"папке «{0}»?"
+msgstr "Дей�твительно окончательно уничтожить в�е удалённые �ообщени� в  папке «{0}»?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Вы дей�твительно хотите отправить �ообщение в формате HTML?"
+msgstr "Дей�твительно отправить �ообщение в формате HTML?"
 
 #: ../mail/mail.error.xml.h:16
-#, fuzzy
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr "Вы дей�твительно хотите отправить �ообщение получател�м только �лепой копии?"
+msgstr "Дей�твительно отправить �ообщение � некорректным адре�ом?"
 
 #: ../mail/mail.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "Вы дей�твительно хотите отправить �ообщение получател�м только �лепой копии?"
+msgstr "Дей�твительно отправить �ообщение � некорректными адре�ами?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Вы дей�твительно хотите отправить �ообщение получател�м только �лепой копии?"
+msgstr "Дей�твительно отправить �ообщение только получател�м �лепой копии?"
 
 #: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "Вы дей�твительно хотите отправить �ообщение � пу�тым полем «Тема»?"
+msgstr "Дей�твительно отправить �ообщение без темы?"
 
 #: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
@@ -13452,7 +13525,7 @@ msgstr "Ошибка при выполнении операции."
 
 #: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
-msgstr "Ошибка при {0}."
+msgstr "«{0}»: ошибка."
 
 #: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
@@ -13475,11 +13548,8 @@ msgstr ""
 "папок будет окончательно удалено."
 
 #: ../mail/mail.error.xml.h:61
-#, fuzzy
 msgid "If you delete the folder, all of its contents will be deleted permanently."
-msgstr ""
-"Е�ли вы удалите �ту папку, в�ё ее �одержимое и �одержимое в�ех вложенных "
-"папок будет окончательно удалено."
+msgstr "Е�ли вы удалите �ту папку, в�ё её �одержимое будет окончательно удалено."
 
 #: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -13504,7 +13574,7 @@ msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
-"Е�ли вы выйдете, �ти �ообщени� не будут отправлены до повторного запу�ка "
+"Е�ли выйти, �ти �ообщени� не будут отправлены до повторного запу�ка "
 "Evolution."
 
 #: ../mail/mail.error.xml.h:67
@@ -13581,7 +13651,7 @@ msgstr "Введите уникальное им� дл� идентификац
 
 #: ../mail/mail.error.xml.h:82
 msgid "Please wait."
-msgstr "Подождите, пожалуй�та."
+msgstr "Подождите."
 
 #: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
@@ -13602,9 +13672,8 @@ msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Дей�твительно удалить папку «{0}» и в�е вложенные в нее папки?"
 
 #: ../mail/mail.error.xml.h:87
-#, fuzzy
 msgid "Really delete folder \"{0}\"?"
-msgstr "�е удало�ь удалить папку «{0}»."
+msgstr "Дей�твительно удалить папку «{0}»?"
 
 #: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
@@ -13692,12 +13761,16 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
+"�дре� �л. почты �ледующего получател� не ра�познан как корректный:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
+"�дре� �л. почты �ледующих получателей не ра�познаны как корректные:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
@@ -13773,10 +13846,10 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Предупреждение: Е�ли удалить �ообщение из папки пои�ка, то будет удалено "
+"Предупреждение: е�ли удалить �ообщение из папки пои�ка, то будет удалено "
 "�амо �ообщение, которое хранит�� в одной из ваших локальных или удалённых "
 "папок.\n"
-"Вы дей�твительно хотите �делать �то?"
+"Дей�твительно �делать �то?"
 
 #: ../mail/mail.error.xml.h:128
 msgid "You do not have sufficient permissions to delete this mail."
@@ -13788,7 +13861,7 @@ msgstr "Вы не ввели в�ю необходимую информацию.
 
 #: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "У ва� е�ть неотправленные �ообщени�, вы дей�твительно хотите выйти?"
+msgstr "Имеют�� неотправленные �ообщени�, дей�твительно выйти?"
 
 #: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
@@ -13911,16 +13984,16 @@ msgstr "%b %d %Y"
 msgid "Select all visible messages"
 msgstr "Выделить в�е видимые �ообщени�"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
 msgid "Shell Backend"
-msgstr ""
+msgstr "Б�к-�нд оболочки"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
 msgid "Generating message list"
 msgstr "Создание �пи�ка �ообщений"
 
-#: ../mail/message-list.c:4722
+#: ../mail/message-list.c:4726
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13928,7 +14001,7 @@ msgstr ""
 "�ет пи�ем, удовлетвор�ющих критери�м пои�ка. Очи�тите поле пои�ка � помощью "
 "меню Пои�к → Очи�тить или измените критерии."
 
-#: ../mail/message-list.c:4724
+#: ../mail/message-list.c:4728
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -13936,7 +14009,7 @@ msgstr ""
 "В �той папке только �крытые �ообщени�. И�пользуйте меню Вид -> Показать "
 "�крытые �ообщени�, чтобы увидеть их."
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4730
 msgid "There are no messages in this folder."
 msgstr "В папке нет �ообщений."
 
@@ -13986,12 +14059,12 @@ msgstr "Сообщение �одержит"
 #: ../mail/searchtypes.xml.h:3
 #: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Recipients contain"
-msgstr "«Получатели» �одержит"
+msgstr "Получатели �одержат"
 
 #: ../mail/searchtypes.xml.h:4
 #: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "Sender contains"
-msgstr "«Отправитель» �одержит"
+msgstr "Отправитель �одержит"
 
 #: ../mail/searchtypes.xml.h:5
 #: ../modules/mail/e-mail-shell-view-actions.c:1303
@@ -14000,7 +14073,7 @@ msgstr "Тема �одержит"
 
 #: ../mail/searchtypes.xml.h:6
 msgid "Subject or Addresses contains"
-msgstr "Тема или Получатели �одержит"
+msgstr "Тема или получатели �одержат"
 
 #: ../modules/addressbook/addressbook-config.c:206
 msgid ""
@@ -14028,9 +14101,8 @@ msgstr ""
 "Это означает, что ваше �оединение � �ервером будет у�звимым дл� атак. "
 
 #: ../modules/addressbook/addressbook-config.c:592
-#, fuzzy
 msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Дни рождени� и годовщины"
+msgstr "_И�пользовать в календаре дней рождений и годовщин"
 
 #: ../modules/addressbook/addressbook-config.c:628
 msgid "Copy _book content locally for offline operation"
@@ -14096,37 +14168,39 @@ msgstr "�ова� адре�на� книга"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
-msgstr "Длина автозавершени�"
+msgstr "Длина автодополнени�"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-#, fuzzy
 msgid "Contact layout style"
-msgstr "Спи�ок контактов"
+msgstr "Стиль ра�положени� контактов"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Contact preview pane position (horizontal)"
-msgstr ""
+msgstr "Положение панели предварительного вида контактов (горизонтальное)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-#, fuzzy
 msgid "Contact preview pane position (vertical)"
-msgstr "Позици� вертикальной панели в обзоре ме��ца"
+msgstr "Положение панели предварительного про�мотра контактов (вертикально)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList xml дл� �пи�ка URI дополнени�"
+msgstr "EFolderList XML дл� �пи�ка дополнени� URI "
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList xml дл� �пи�ка URI дополнени�."
+msgstr "EFolderList xml дл� �пи�ка дополнени� URI."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
+"Положение панели предварительного про�мотра контактов при горизонтальной "
+"ориентации."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
+"Положение панели предварительного про�мотра контактов при вертикальной "
+"ориентации."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
@@ -14143,14 +14217,18 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
+"Стиль ра�положени� определ�ет ме�то дл� панели предварительного про�мотра "
+"отно�ительно �пи�ка контактов. «0» (кла��иче�кий вид) помещает панель "
+"предварительного про�мотра под �пи�ком контактов. «1» (вертикальный вид) "
+"помещает панель р�дом �о �пи�ком контактов."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Количе�тво �имволов, которое необходимо вве�ти перед активацией функции "
-"автозавершени�."
+"Количе�тво �имволов, которое необходимо вве�ти дл� вызова функции "
+"автодополнени�."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
@@ -14178,7 +14256,7 @@ msgstr "Столбец таблицы:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
-msgstr "�втозавершение"
+msgstr "�втодополнение"
 
 #: ../modules/addressbook/autocompletion-config.c:165
 msgid "Always _show address of the autocompleted contact"
@@ -14232,49 +14310,42 @@ msgstr "Контакты"
 #: ../modules/calendar/e-cal-shell-backend.c:777
 #: ../modules/calendar/e-memo-shell-backend.c:587
 #: ../modules/calendar/e-task-shell-backend.c:597
-#, fuzzy
 msgid "Source List"
-msgstr "И�точник"
+msgstr "Спи�ок и�точников"
 
 #: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
 msgid "The registry of address books"
-msgstr "�е удало�ь получить �пи�ок адре�ных книг"
+msgstr "Рее�тр адре�ных книг"
 
 #: ../modules/addressbook/e-book-shell-content.c:364
-#, fuzzy
 msgid "Current View"
-msgstr "_Текущий вид"
+msgstr "Текущий вид"
 
 #: ../modules/addressbook/e-book-shell-content.c:365
 msgid "The currently selected address book view"
-msgstr ""
+msgstr "Текущий выбранный вид адре�ной книги"
 
 #: ../modules/addressbook/e-book-shell-content.c:374
-#, fuzzy
 msgid "Previewed Contact"
-msgstr "Создать контакт"
+msgstr "Предварительный про�мотр контакта"
 
 #: ../modules/addressbook/e-book-shell-content.c:375
-#, fuzzy
 msgid "The contact being shown in the preview pane"
-msgstr "Показывать ли панель предварительного про�мотра."
+msgstr "Контакт, отображаемый в панели предварительного про�мотра"
 
 #: ../modules/addressbook/e-book-shell-content.c:384
 #: ../modules/calendar/e-memo-shell-content.c:617
 #: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:688
-#, fuzzy
+#: ../modules/mail/e-mail-shell-content.c:689
 msgid "Preview is Visible"
-msgstr "Бокова� панель видима"
+msgstr "Предварительный про�мотр включён"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
 #: ../modules/calendar/e-memo-shell-content.c:618
 #: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
+#: ../modules/mail/e-mail-shell-content.c:690
 msgid "Whether the preview pane is visible"
-msgstr "Показывать ли панель предварительного про�мотра."
+msgstr "Показывать ли панель предварительного про�мотра"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
@@ -14282,7 +14353,7 @@ msgstr "Серверы LDAP"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:765
 msgid "Autocompletion Settings"
-msgstr "�а�тройка автозавершени�"
+msgstr "Параметры автодополнени�"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:1152
 msgid ""
@@ -14330,48 +14401,41 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-sidebar.c:761
 #: ../modules/calendar/e-memo-shell-sidebar.c:687
 #: ../modules/calendar/e-task-shell-sidebar.c:687
-#, fuzzy
 msgid "Source Selector Widget"
-msgstr "Выбор и�точника заметок"
+msgstr "Виджет выбора и�точника"
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
 msgid "This widget displays groups of address books"
-msgstr "�е удало�ь получить �пи�ок адре�ных книг"
+msgstr "Этот виджет отображает группы из адре�ных книг"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:262
 #: ../modules/addressbook/e-book-shell-view-actions.c:539
-#, fuzzy
 msgid "Save as vCard"
-msgstr "Сохранить как vCard..."
+msgstr "Сохранить как vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "_Копировать контакты в..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:664
-#, fuzzy
 msgid "Copy the contacts of the selected address book to another"
-msgstr "Копировать контакты из выделенной папки в другую папку"
+msgstr "Копировать контакты из выбранной адре�ной книги в другую книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:669
-#, fuzzy
 msgid "D_elete Address Book"
 msgstr "_Удалить адре�ную книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:671
-#, fuzzy
 msgid "Delete the selected address book"
-msgstr "Удалить выделенную папку"
+msgstr "Удалить выбранную адре�ную книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "Пере_ме�тить в�е контакты в..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:678
-#, fuzzy
 msgid "Move the contacts of the selected address book to another"
-msgstr "Переме�тить в�е контакты из выделенной папки в другую папку"
+msgstr "Переме�тить контакты из выбранной адре�ной книги в другую книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
@@ -14382,61 +14446,52 @@ msgid "Address _Book Properties"
 msgstr "_Свой�тва адре�ной книги"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:692
-#, fuzzy
 msgid "Show properties of the selected address book"
-msgstr "Изменить �вой�тва выделенной папки"
+msgstr "Показать �вой�тва выбранной адре�ной книги"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 #: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_Rename..."
 msgstr "Пе_реименовать..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:699
-#, fuzzy
 msgid "Rename the selected address book"
-msgstr "Переименовать выделенную папку"
+msgstr "Переименовать выбранную адре�ную книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:704
-#, fuzzy
 msgid "S_ave Address Book as vCard"
 msgstr "С_охранить адре�ную книгу в формате vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:706
-#, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Сохранить контакты из выделенной папки в формате vCard"
+msgstr "Сохранить контакты из выбранной адре�ной книги в формате vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:713
-#, fuzzy
 msgid "Stop loading"
 msgstr "О�тановить загрузку"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:718
-#, fuzzy
 msgid "_Copy Contact To..."
-msgstr "_Копировать контакт в..."
+msgstr "_Копировать контакт в…"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:720
-#, fuzzy
 msgid "Copy selected contacts to another address book"
-msgstr "Копировать выделенные контакты в другую папку"
+msgstr "Копировать выделенные контакты в другую адре�ную книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "_Удалить контакт"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:732
-#, fuzzy
 msgid "_Find in Contact..."
-msgstr "_Пере�лать контакт..."
+msgstr "_�айти в контактах…"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:734
-#, fuzzy
 msgid "Search for text in the displayed contact"
-msgstr "Пои�к в тек�те отображаемого �ообщени�"
+msgstr "Пои�к тек�та в отображаемом контакте"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
@@ -14447,14 +14502,12 @@ msgid "Send selected contacts to another person"
 msgstr "Пере�лать выбранные контакты другому лицу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:746
-#, fuzzy
 msgid "_Move Contact To..."
-msgstr "_Переме�тить контакт в..."
+msgstr "_Переме�тить контакт в…"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:748
-#, fuzzy
 msgid "Move selected contacts to another address book"
-msgstr "Переме�тить выделенные контакты в другую папку"
+msgstr "Переме�тить выделенные контакты в другую адре�ную книгу"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
@@ -14465,9 +14518,8 @@ msgid "New Contact _List..."
 msgstr "Соз_дать �пи�ок контактов..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:767
-#, fuzzy
 msgid "_Open Contact"
-msgstr "_Контакт"
+msgstr "_Открыть контакт"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
@@ -14482,22 +14534,22 @@ msgid "Send a message to the selected contacts"
 msgstr "Отправить �ообщение к выбранным контактам"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "_Дей�тви�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 #: ../modules/mail/e-mail-shell-view-actions.c:1090
 msgid "_Preview"
 msgstr "_Предварительный про�мотр"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
 msgstr "_Удалить"
 
@@ -14518,74 +14570,69 @@ msgid "Show contact preview window"
 msgstr "Показать окно про�мотра контакта"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 #: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "_Classic View"
 msgstr "_Кла��иче�кий вид"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:862
-#, fuzzy
 msgid "Show contact preview below the contact list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать предварительный про�мотр контактов ниже �пи�ка контактов"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:737
-#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 #: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "_Vertical View"
-msgstr "_Вертикальна� вид"
+msgstr "_Вертикальный вид"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:869
-#, fuzzy
 msgid "Show contact preview alongside the contact list"
-msgstr "Показать окно про�мотра контакта"
+msgstr "Показывать предварительный про�мотр контакта р�дом �о �пи�ком контактов"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "Люба� категори�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1608
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "Прочее"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 #: ../modules/mail/e-mail-shell-view-actions.c:1268
 #: ../shell/e-shell-content.c:516
 msgid "Advanced Search"
 msgstr "Ра�ширенный пои�к"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:927
-#, fuzzy
 msgid "Print all shown contacts"
-msgstr "�апечатать выбранные контакты"
+msgstr "Печать в�ех видимых контактов"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:934
-#, fuzzy
 msgid "Preview the contacts to be printed"
-msgstr "По�мотреть на вид контактов на печати"
+msgstr "Предварительный про�мотр контактов дл� печати"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
-msgstr "�апечатать выбранные контакты"
+msgstr "Выве�ти на печать выделенные контакты"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Save as vCard..."
 msgstr "Сохранить как vCard..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:958
-#, fuzzy
 msgid "Save selected contacts as a vCard"
-msgstr "Сохранить выделенные контакты как VCard"
+msgstr "Сохранить выделенные контакты как vCard"
 
 #: ../modules/addressbook/e-book-shell-view.c:338
 msgid "_Forward Contacts"
@@ -14596,19 +14643,16 @@ msgid "_Forward Contact"
 msgstr "_Пере�лать контакт"
 
 #: ../modules/addressbook/e-book-shell-view.c:371
-#, fuzzy
 msgid "_Send Message to Contacts"
-msgstr "Отправить _�ообщение к контактам"
+msgstr "_Отправить �ообщение контактам"
 
 #: ../modules/addressbook/e-book-shell-view.c:373
-#, fuzzy
 msgid "_Send Message to List"
-msgstr "Отправить _�ообщение в �пи�ок"
+msgstr "_Отправить �ообщение в �пи�ок"
 
 #: ../modules/addressbook/e-book-shell-view.c:375
-#, fuzzy
 msgid "_Send Message to Contact"
-msgstr "Отправить _�ообщение к контакту"
+msgstr "_Отправить �ообщение контакту"
 
 #: ../modules/addressbook/eab-composer-util.c:137
 msgid "Multiple vCards"
@@ -14636,11 +14680,11 @@ msgstr "1"
 
 #: ../modules/addressbook/ldap-config.ui.h:2
 msgid "3268"
-msgstr ""
+msgstr "3268"
 
 #: ../modules/addressbook/ldap-config.ui.h:3
 msgid "389"
-msgstr ""
+msgstr "389"
 
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
@@ -14648,11 +14692,11 @@ msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
 msgid "636"
-msgstr ""
+msgstr "636"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
-msgstr ""
+msgstr "�нонимно"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
 #: ../modules/addressbook/ldap-config.ui.h:8
@@ -14665,9 +14709,8 @@ msgstr "_Им� пользовател�:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:12
-#, fuzzy
 msgid "One"
-msgstr "В �ети"
+msgstr "Один"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
@@ -14691,26 +14734,20 @@ msgstr ""
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:19
-#, fuzzy
 msgid "Sub"
-msgstr "В�"
+msgstr "Под"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr "Поддерживаемые базы пои�ка"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
-#, fuzzy
 msgid "Using distinguished name (DN)"
-msgstr ""
-"Anonymously\n"
-"И�пользу� адре� email\n"
-"И�пользу� Distinguished Name (DN)"
+msgstr "И�пользу� уникальное им�"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
-#, fuzzy
 msgid "Using email address"
-msgstr "_Электронна� почта:"
+msgstr "И�пользу� адре� �л. почты"
 
 #: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Download limit:"
@@ -14738,11 +14775,11 @@ msgstr "_Задержка:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "_Use secure connection:"
-msgstr "И�пользовать _защищенное �оединение:"
+msgstr "И�пользовать _защищённое �оединение:"
 
 #: ../modules/addressbook/ldap-config.ui.h:33
 msgid "cards"
-msgstr "карточек"
+msgstr "карточки"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 msgid "I_mport"
@@ -14790,7 +14827,7 @@ msgid "_Appointment"
 msgstr "_В�треча"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new appointment"
 msgstr "Создать новую в�тречу"
 
@@ -14818,7 +14855,7 @@ msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -14828,9 +14865,8 @@ msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
 #: ../modules/calendar/e-cal-shell-backend.c:778
-#, fuzzy
 msgid "The registry of calendars"
-msgstr "О�новной календарь"
+msgstr "Рее�тр календарей"
 
 #: ../modules/calendar/e-cal-shell-migrate.c:131
 msgid ""
@@ -14860,50 +14896,47 @@ msgstr "�е удало�ь преобразовать календарь «%s»
 #: ../modules/calendar/e-cal-shell-sidebar.c:167
 #: ../modules/calendar/e-memo-shell-sidebar.c:162
 #: ../modules/calendar/e-task-shell-sidebar.c:162
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error on %s\n"
 "%s"
 msgstr ""
-"Ошибка в \"%s\":\n"
+"Ошибка в %s\n"
 "%s"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:226
-#, fuzzy
 msgid "Loading calendars"
-msgstr "Загрузка календар�"
+msgstr "Загрузка календарей"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:615
-#, fuzzy
 msgid "Calendar Selector"
-msgstr "Выбор и�точника календар�"
+msgstr "Выбор календар�"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:741
 msgid "Date Navigator Widget"
-msgstr ""
+msgstr "Виджет навигатора даты"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:742
 msgid "This widget displays a miniature calendar"
-msgstr ""
+msgstr "Этот виджет отображает миниатюрный календарь"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:751
-#, fuzzy
 msgid "Default Calendar Client"
-msgstr "Почтовый клиент по умолчанию"
+msgstr "Клиент дл� календар� по умолчанию"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:752
 msgid "Default client for calendar operations"
-msgstr ""
+msgstr "Клиент по умолчанию дл� операций � календарём"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:762
 msgid "This widget displays groups of calendars"
-msgstr ""
+msgstr "Этот виджет отображает группы календар�"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "Opening calendar at %s"
-msgstr "Открывает�� календарь"
+msgstr "Открывает�� календарь %s"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
@@ -14925,355 +14958,326 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Очи�тить �лементы �тарше чем"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:540
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
 msgid "Copying Items"
 msgstr "Копирование �лементов"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:795
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
 msgid "Moving Items"
 msgstr "Перемещение �лементов"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1097
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
 msgid "event"
-msgstr "Отправленные"
+msgstr "�обытие"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:507
-#: ../modules/calendar/e-task-shell-view-actions.c:624
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:611
 msgid "Save as iCalendar"
-msgstr "Выбор календар�"
+msgstr "Сохранить как iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "D_elete Calendar"
-msgstr "Выбор календар�"
+msgstr "_Удалить календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1239
 msgid "Delete the selected calendar"
-msgstr "Переименовать выделенную папку"
+msgstr "Удалить выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
 msgid "Go Back"
-msgstr "Перейти в прошлое"
+msgstr "Вернуть�� назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
 msgid "Go Forward"
-msgstr "Перейти в будущее"
+msgstr "Перейти вперёд"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select _Today"
 msgstr "Выделить _�егодн�шний день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
 msgid "Select today"
 msgstr "Выделить �егодн�шний день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select _Date"
 msgstr "Выделить _дату"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "Select a specific date"
 msgstr "Выделить указанную дату"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "_New Calendar"
 msgstr "_Создать календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "О_чи�тить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Purge old appointments and meetings"
 msgstr "Очи�тить �тарые в�тречи и �обрани�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
-msgstr "Обнов_ить"
+msgstr "О_бновление"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Refresh the selected calendar"
-msgstr "Переименовать выделенную папку"
+msgstr "Обновить выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "Rename the selected calendar"
-msgstr "Переименовать выделенную папку"
+msgstr "Переименовать выделенный календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Show _Only This Calendar"
-msgstr "_Отображать только �тот Calendar"
+msgstr "_Показывать только �тот календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ировать в календарь..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "_Delegate Meeting..."
 msgstr "_Поручить �обрание..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "_Delete Appointment"
-msgstr "Удалить �ту в�тречу"
+msgstr "_Удалить в�тречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "Delete selected appointments"
-msgstr "Удалить �ту в�тречу"
+msgstr "Удалить выделенные в�тречи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Delete This _Occurrence"
-msgstr "Удалить �то вхождение"
+msgstr "_Удалить �то вхождение"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Delete this occurrence"
 msgstr "Удалить �то вхождение"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Delete All Occ_urrences"
-msgstr "Удалить в�е вхождени�"
+msgstr "_Удалить в�е вхождени�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete all occurrences"
 msgstr "Удалить в�е вхождени�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "New All Day _Event..."
-msgstr "�овое ежедневное �обытие"
+msgstr "_Создать ежедневное �обытие…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Create a new all day event"
-msgstr "Создать новую ежедневную в�тречу"
+msgstr "Создать новое ежедневное �обытие"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:581
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:692
 msgid "_Forward as iCalendar..."
 msgstr "_Пере�лать как iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "New _Meeting..."
-msgstr "�овое _�обрание"
+msgstr "�овое _�обрание…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Create a new meeting"
-msgstr "Создать новое приглашение на �обрание"
+msgstr "Создать новое �обрание"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Mo_ve to Calendar..."
 msgstr "Пере_ме�тить в календарь..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "New _Appointment..."
 msgstr "�ова� _в�треча..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать �то вхождение пере_мещаемым"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "_Open Appointment"
 msgstr "_Открыть в�тречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "View the current appointment"
 msgstr "Про�мотреть текущую в�тречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#, fuzzy
 msgid "Save as iCalendar..."
-msgstr "Сохранить как vCard..."
+msgstr "Сохранить как iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_Schedule Meeting..."
 msgstr "_�азначить �обрание..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Converts an appointment to a meeting"
-msgstr "Очи�тить �тарые в�тречи и �обрани�"
+msgstr "Преобразовывает в�тречу в �обрание"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Conv_ert to Appointment..."
-msgstr "�ова� _в�треча..."
+msgstr "_Преобразовать во в�тречу…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Converts a meeting to an appointment"
-msgstr "%s в конце в�тречи"
+msgstr "Преобразовывает �обрание во в�тречу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1550
 msgid "Day"
 msgstr "День"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Show one day"
-msgstr "Показать 1 день"
+msgstr "Показывать один день"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "List"
 msgstr "Спи�ок"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Show as list"
 msgstr "Показать как �пи�ок"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Month"
 msgstr "Ме��ц"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1565
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Show one month"
-msgstr "Показать 1 ме��ц"
+msgstr "Показывать один ме��ц"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1570
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Week"
 msgstr "�едел�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1572
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 msgid "Show one week"
-msgstr "Показать 1 неделю"
+msgstr "Показывать одну неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Show one work week"
-msgstr "Показать 1 неделю"
+msgstr "Показать одну рабочую неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Active Appointments"
 msgstr "�ктивные в�тречи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Next 7 Days' Appointments"
 msgstr "В�тречи на �ледующую неделю"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "Опи�ание �одержит"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "Сводка �одержит"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Print this calendar"
-msgstr "�апечатать �тот календарь"
+msgstr "Выве�ти на печать �тот календарь"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Preview the calendar to be printed"
-msgstr "По�мотреть на вид календар� на печати"
+msgstr "Предварительный про�мотр календар� дл� печати"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Go To"
 msgstr "Перейти к"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:505
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
 msgid "memo"
-msgstr "Заметка"
+msgstr "заметка"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "New _Memo"
-msgstr "�ова� заметка"
+msgstr "_Создать заметку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Create a new memo"
 msgstr "Создать новую заметку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "_Open Memo"
 msgstr "_Открыть заметку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "View the selected memo"
 msgstr "Про�мотреть выделенные заметки"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:776
 msgid "Open _Web Page"
 msgstr "Открыть _веб-�траницу"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:811
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
 msgid "Print the selected memo"
-msgstr "Про�мотреть выделенные заметки"
+msgstr "Печать выделенной заметки"
 
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:622
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:609
 msgid "task"
-msgstr "Задание"
+msgstr "задача"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:671
 msgid "_Assign Task"
 msgstr "_�азначить задачу"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:750
 msgid "Mark selected tasks as complete"
 msgstr "Пометить выбранные задачи как выполненные"
 
@@ -15282,44 +15286,41 @@ msgid "_Mark as Incomplete"
 msgstr "По_метить как невыполненные"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:770
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Mark selected tasks as incomplete"
-msgstr "Пометить выбранные задачи как выполненные"
+msgstr "Пометить выделенные задачи как невыполненные"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "New _Task"
 msgstr "�ова� _задача"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "_Open Task"
 msgstr "_Открыть задачу"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "View the selected task"
 msgstr "Про�мотреть выбранную задачу"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
 msgid "_Save as iCalendar..."
-msgstr "_Пере�лать как iCalendar..."
+msgstr "_Сохранить как iCalendar…"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1010
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Print the selected task"
-msgstr "Про�мотреть выбранную задачу"
+msgstr "Печать выделенной задачи"
 
 #: ../modules/calendar/e-memo-shell-backend.c:318
 msgctxt "New"
@@ -15327,58 +15328,51 @@ msgid "Mem_o"
 msgstr "За_метка"
 
 #: ../modules/calendar/e-memo-shell-backend.c:325
-#, fuzzy
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Обща� заме_тка"
 
 #: ../modules/calendar/e-memo-shell-backend.c:327
-#, fuzzy
 msgid "Create a new shared memo"
 msgstr "Создать новую общую заметку"
 
 #: ../modules/calendar/e-memo-shell-backend.c:335
-#, fuzzy
 msgctxt "New"
 msgid "Memo Li_st"
-msgstr "Спи�ок заметок"
+msgstr "С_пи�ок заметок"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:604
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "Create a new memo list"
 msgstr "Создать новый �пи�ок заметок"
 
 #: ../modules/calendar/e-memo-shell-backend.c:588
-#, fuzzy
 msgid "The registry of memo lists"
-msgstr "О�новной �пи�ок заметок"
+msgstr "Рее�тр �пи�ков заметок"
 
 #: ../modules/calendar/e-memo-shell-content.c:608
-#, fuzzy
 msgid "The memo table model"
-msgstr "Модель таблицы"
+msgstr "Модель таблицы заметок"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "Загрузка заметок"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:569
-#, fuzzy
 msgid "Memo List Selector"
-msgstr "Выбор и�точника заметок"
+msgstr "Выбор �пи�ка заметок"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:677
-#, fuzzy
 msgid "Default Memo Client"
-msgstr "Почтовый клиент по умолчанию"
+msgstr "Клиент дл� заметок по умолчанию"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:678
 msgid "Default client for memo operations"
-msgstr ""
+msgstr "Клиент по умолчанию дл� операций � заметками"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:688
 msgid "This widget displays groups of memo lists"
-msgstr ""
+msgstr "Этот виджет отображает группы из �пи�ков заметок"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:868
@@ -15389,82 +15383,69 @@ msgstr "Открывают�� заметки в %s"
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 msgid "Print Memos"
-msgstr "�апечатать заметки"
+msgstr "Выве�ти на печать заметки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:567
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
 msgid "_Delete Memo"
-msgstr "_Удалить �ообщение"
+msgstr "_Удалить заметку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:574
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
 msgid "_Find in Memo..."
-msgstr "_Пои�к в �ообщении..."
+msgstr "_�айти в заметке…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:576
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 msgid "Search for text in the displayed memo"
-msgstr "Пои�к в тек�те отображаемого �ообщени�"
+msgstr "Пои�к тек�та в отображаемой заметке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
 msgid "D_elete Memo List"
-msgstr "_Удалить �ообщение"
+msgstr "_Удалить �пи�ок заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:597
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "Delete the selected memo list"
-msgstr "Переименовать выделенную папку"
+msgstr "Удалить �пи�ок выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "_New Memo List"
 msgstr "_�овый �пи�ок заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "Refresh the selected memo list"
-msgstr "Удалить выделенные заметки"
+msgstr "Обновить �пи�ок выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:625
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "Rename the selected memo list"
-msgstr "Переименовать выделенную папку"
+msgstr "Переименовать �пи�ок выделенных заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Show _Only This Memo List"
-msgstr "_Отображать только �тот �пи�ок заметок"
+msgstr "_Показывать только �тот �пи�ок заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
 msgid "Memo _Preview"
-msgstr "_Предварительный про�мотр"
+msgstr "_Предварительный про�мотр заметки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:711
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
 msgid "Show memo preview pane"
-msgstr "Показывать панель предварительного про�мотра"
+msgstr "Показывать панель предварительного про�мотра заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:732
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
 msgid "Show memo preview below the memo list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать панель предварительного про�мотра заметок под �пи�ком заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:739
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Show memo preview alongside the memo list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать панель предварительного про�мотра заметок р�дом �о �пи�ком заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
 msgid "Print the list of memos"
 msgstr "Ра�печатать �пи�ок заметок"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
 msgid "Preview the list of memos to be printed"
-msgstr "Предварительный про�мотр �пи�ка заметок перед печатью"
+msgstr "Предварительный про�мотр �пи�ка заметок дл� печати"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:414
+#: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -15472,21 +15453,19 @@ msgstr[0] "%d заметка"
 msgstr[1] "%d заметки"
 msgstr[2] "%d заметок"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:418
-#: ../modules/calendar/e-task-shell-view-private.c:567
-#, fuzzy, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
+#, c-format
 msgid "%d selected"
-msgstr ", выделено %d"
+msgstr "выделено %d"
 
 #: ../modules/calendar/e-memo-shell-view.c:223
-#, fuzzy
 msgid "Delete Memos"
-msgstr "_Удалить �ообщение"
+msgstr "Удалить заметки"
 
 #: ../modules/calendar/e-memo-shell-view.c:225
-#, fuzzy
 msgid "Delete Memo"
-msgstr "Поручить"
+msgstr "Удалить заметку"
 
 #: ../modules/calendar/e-task-shell-backend.c:322
 msgctxt "New"
@@ -15503,25 +15482,22 @@ msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#, fuzzy
 msgctxt "New"
 msgid "Tas_k List"
-msgstr "Спи�ок задач"
+msgstr "_Спи�ок задач"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Create a new task list"
 msgstr "Создать новый �пи�ок задач"
 
 #: ../modules/calendar/e-task-shell-backend.c:598
-#, fuzzy
 msgid "The registry of task lists"
-msgstr "О�новной �пи�ок задач"
+msgstr "Рее�тр �пи�ков задач"
 
 #: ../modules/calendar/e-task-shell-content.c:630
-#, fuzzy
 msgid "The task table model"
-msgstr "Модель таблицы"
+msgstr "Модель таблицы задач"
 
 #: ../modules/calendar/e-task-shell-migrate.c:98
 msgid ""
@@ -15546,23 +15522,20 @@ msgid "Loading tasks"
 msgstr "Загрузка задач"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:569
-#, fuzzy
 msgid "Task List Selector"
-msgstr "Выбор и�точника задач"
+msgstr "Выбор �пи�ка задач"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:677
-#, fuzzy
 msgid "Default Task Client"
-msgstr "Почтовый клиент по умолчанию"
+msgstr "Клиент дл� задач по умолчанию"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:678
-#, fuzzy
 msgid "Default client for task operations"
-msgstr "Со�то�ние подшивки по умолчанию"
+msgstr "Клиент по умолчанию дл� операций � задачами"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:688
 msgid "This widget displays groups of task lists"
-msgstr ""
+msgstr "Этот виджет отображает группы из �пи�ков задач"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:868
@@ -15573,131 +15546,117 @@ msgstr "Открытие задач %s"
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
-msgstr "�апечатать задачи"
+msgstr "Выве�ти на печать задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:566
+#: ../modules/calendar/e-task-shell-view-actions.c:553
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Эта операци� уничтожит в�е задани�, помеченные как \"выполненные\". Е�ли вы "
+"Эта операци� уничтожит в�е задани�, помеченные как выполненные. Е�ли вы "
 "продолжите, то потом не �можете во��тановить �ти задани�.\n"
 "\n"
 "Дей�твительно уничтожить �ти задани�?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:691
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:678
 msgid "_Delete Task"
-msgstr "_Удалить"
+msgstr "_Удалить задачу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:698
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:685
 msgid "_Find in Task..."
-msgstr "_Пои�к в �ообщении..."
+msgstr "_�айти в задаче…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:700
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "Search for text in the displayed task"
-msgstr "Пои�к в тек�те отображаемого �ообщени�"
+msgstr "Пои�к тек�та в отображаемой задаче"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:699
 msgid "Copy..."
-msgstr "_Копировать..."
+msgstr "_Копировать…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:706
 msgid "D_elete Task List"
-msgstr "Завершённые задачи"
+msgstr "_Удалить �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:721
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "Delete the selected task list"
-msgstr "Переименовать выделенную папку"
+msgstr "Удалить выбранный �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "_New Task List"
 msgstr "_�овый �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Refresh the selected task list"
-msgstr "Удалить выбранные задачи"
+msgstr "Обновить выбранный �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:749
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "Rename the selected task list"
-msgstr "Переименовать выделенную папку"
+msgstr "Переименовать выделенный �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Show _Only This Task List"
-msgstr "_Отображать только �тот �пи�ок задач"
+msgstr "_Показывать только �тот �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:755
 msgid "Mar_k as Incomplete"
-msgstr "По_метить как невыполненные"
+msgstr "От_метить как невыполненные"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Delete completed tasks"
 msgstr "Удалить выполненные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:873
+#: ../modules/calendar/e-task-shell-view-actions.c:860
 msgid "Task _Preview"
 msgstr "_Предварительный про�мотр задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:875
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:862
 msgid "Show task preview pane"
-msgstr "Показывать панель предварительного про�мотра"
+msgstr "Показывать панель предварительного про�мотра задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:896
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:883
 msgid "Show task preview below the task list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать панель предварительного про�мотра задач под �пи�ком задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:903
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview alongside the task list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать панель предварительного про�мотра задач р�дом �о �пи�ком задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:898
 msgid "Active Tasks"
 msgstr "�ктивные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:925
+#: ../modules/calendar/e-task-shell-view-actions.c:912
 msgid "Completed Tasks"
 msgstr "Завершённые задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/calendar/e-task-shell-view-actions.c:919
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи на �ледующую неделю"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:939
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Overdue Tasks"
 msgstr "Про�роченные задачи"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Tasks with Attachments"
 msgstr "Задачи � вложени�ми"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-task-shell-view-actions.c:983
 msgid "Print the list of tasks"
 msgstr "Ра�печатать �пи�ок задач"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Preview the list of tasks to be printed"
-msgstr "Предварительный про�мотр �пи�ка задач перед печатью"
+msgstr "Предварительный про�мотр �пи�ка задач дл� печати"
 
-#: ../modules/calendar/e-task-shell-view-private.c:461
+#: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
 msgstr "Очи�тка папки"
 
-#: ../modules/calendar/e-task-shell-view-private.c:563
+#: ../modules/calendar/e-task-shell-view-private.c:565
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15706,14 +15665,12 @@ msgstr[1] "%d задачи"
 msgstr[2] "%d задач"
 
 #: ../modules/calendar/e-task-shell-view.c:351
-#, fuzzy
 msgid "Delete Tasks"
-msgstr "Завершённые задачи"
+msgstr "Удалить задачи"
 
 #: ../modules/calendar/e-task-shell-view.c:353
-#, fuzzy
 msgid "Delete Task"
-msgstr "Поручить"
+msgstr "Удалить задачу"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:335
@@ -15724,7 +15681,6 @@ msgstr "%d вложенное �ообщение"
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
 #: ../modules/mail/e-mail-junk-hook.c:90
-#, fuzzy
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "�ет"
@@ -15736,7 +15692,7 @@ msgstr "Почтовое �ообщ_ение"
 
 #: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
-msgstr "Создать новое �ообщение"
+msgstr "Создать новое почтовое �ообщение"
 
 #: ../modules/mail/e-mail-shell-backend.c:178
 msgctxt "New"
@@ -15753,40 +15709,36 @@ msgstr "Учётные запи�и"
 
 #: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Mail Preferences"
-msgstr "�а�тройка почты"
+msgstr "�а�тройки почты"
 
 #: ../modules/mail/e-mail-shell-backend.c:215
 msgid "Composer Preferences"
-msgstr "�а�тройка редактора"
+msgstr "�а�тройки редактора"
 
 #: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Network Preferences"
-msgstr "Параметры �ети"
+msgstr "�а�тройки �ети"
 
-#: ../modules/mail/e-mail-shell-content.c:678
-#, fuzzy
+#: ../modules/mail/e-mail-shell-content.c:679
 msgid "Group by Threads"
-msgstr "_Группировать по подшивкам"
+msgstr "Группировать по об�уждени�м"
 
-#: ../modules/mail/e-mail-shell-content.c:679
+#: ../modules/mail/e-mail-shell-content.c:680
 msgid "Whether to group messages by threads"
-msgstr ""
+msgstr "Группировать ли �ообщени� по об�уждени�м"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:855
 #: ../modules/mail/e-mail-shell-view.c:875
-#, fuzzy
 msgid "_Disable Account"
-msgstr "Запрет учётной запи�и"
+msgstr "О_тключить учётную запи�ь"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:857
-#, fuzzy
 msgid "Disable this account"
-msgstr "Запрет учётной запи�и"
+msgstr "Отключить �ту учётную запи�ь"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:864
-#, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr "Уничтожить в�е �ообщени�, помеченные как удалённые, во в�ех папках"
+msgstr "Удалить окончательно в�е удалённые �ообщени� из в�ех папок"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "C_reate Search Folder From Search..."
@@ -15797,11 +15749,8 @@ msgid "_Download Messages for Offline Usage"
 msgstr "Загрузить �ообщени� дл� автономной работы"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:878
-#, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr ""
-"Загрузить �ообщени� учётных запи�ей/каталогов, отмеченных дл� автономной "
-"работы"
+msgstr "Загрузить �ообщени� учётных запи�ей и папок, отмеченных дл� автономной работы"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Fl_ush Outbox"
@@ -15884,27 +15833,24 @@ msgid "_Unsubscribe"
 msgstr "_Отказать�� от подпи�ки"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:969
-#, fuzzy
 msgid "Unsubscribe from the selected folder"
-msgstr "Переименовать выделенную папку"
+msgstr "Отпи�ать�� от выделенной папки"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:974
 msgid "Empty _Trash"
 msgstr "О_чи�тить корзину"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:976
-#, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "Уничтожить в�е �ообщени�, помеченные как удалённые, во в�ех папках"
+msgstr "Убрать в�е удалённые �ообщени� из в�ех учётных запи�ей"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "_New Label"
-msgstr "_�овый �рлык"
+msgstr "_�ова� метка"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:990
-#, fuzzy
 msgid "N_one"
-msgstr "�ет"
+msgstr "_�ет"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Hide _Read Messages"
@@ -15963,7 +15909,6 @@ msgid "Search F_olders"
 msgstr "П_апки пои�ка"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1062
-#, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "Создать или изменить определени� папки пои�ка"
 
@@ -16000,27 +15945,24 @@ msgid "Show Message _Preview"
 msgstr "_Предварительный про�мотр �ообщени�"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1158
-#, fuzzy
 msgid "Show message preview pane"
-msgstr "Показать окно про�мотра �ообщени�"
+msgstr "Показать панель предварительного про�мотра �ообщений"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "_Group By Threads"
 msgstr "_Группировать по подшивкам"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1166
-#, fuzzy
 msgid "Threaded message list"
-msgstr "Показывать подшитые по теме �ообщени� в �пи�ке �ообщений"
+msgstr "Спи�ок подшитых �ообщений"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Show message preview below the message list"
 msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1194
-#, fuzzy
 msgid "Show message preview alongside the message list"
-msgstr "Предварительный про�мотр �ообщени� под �пи�ком �ообщений"
+msgstr "Показывать предварительный про�мотр �ообщений р�дом �о �пи�ком �ообщений"
 
 # This translation and all below should be short
 # to fit window on 800 x 600
@@ -16061,9 +16003,8 @@ msgid "Unread Messages"
 msgstr "�епрочитанные"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1310
-#, fuzzy
 msgid "Subject or Addresses contain"
-msgstr "Тема или Получатели �одержит"
+msgstr "Тема или адре�а �одержат"
 
 # This translation and below will be used
 # in search bar in main window, so it should
@@ -16080,24 +16021,24 @@ msgstr "учётной запи�и"
 msgid "Current Folder"
 msgstr "текущей папке"
 
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
-msgstr[0] "выделено %d, "
-msgstr[1] "выделено %d, "
-msgstr[2] "выделено %d, "
+msgstr[0] "выделено %d,"
+msgstr[1] "выделено %d,"
+msgstr[2] "выделено %d,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:900
+#: ../modules/mail/e-mail-shell-view-private.c:902
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d удаленное"
-msgstr[1] "%d удаленных"
-msgstr[2] "%d удаленных"
+msgstr[0] "%d удалённое"
+msgstr[1] "%d удалённых"
+msgstr[2] "%d удалённых"
 
-#: ../modules/mail/e-mail-shell-view-private.c:906
-#: ../modules/mail/e-mail-shell-view-private.c:913
+#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:915
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -16105,15 +16046,15 @@ msgstr[0] "%d �пам"
 msgstr[1] "%d �пам"
 msgstr[2] "%d �пам"
 
-#: ../modules/mail/e-mail-shell-view-private.c:919
+#: ../modules/mail/e-mail-shell-view-private.c:921
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "%d черновиков"
+msgstr[0] "%d черновик"
 msgstr[1] "%d черновика"
 msgstr[2] "%d черновиков"
 
-#: ../modules/mail/e-mail-shell-view-private.c:925
+#: ../modules/mail/e-mail-shell-view-private.c:927
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16121,7 +16062,7 @@ msgstr[0] "%d неотправленное"
 msgstr[1] "%d неотправленных"
 msgstr[2] "%d неотправленных"
 
-#: ../modules/mail/e-mail-shell-view-private.c:931
+#: ../modules/mail/e-mail-shell-view-private.c:933
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16129,7 +16070,7 @@ msgstr[0] "%d отправленное"
 msgstr[1] "%d отправленных"
 msgstr[2] "%d отправленных"
 
-#: ../modules/mail/e-mail-shell-view-private.c:943
+#: ../modules/mail/e-mail-shell-view-private.c:945
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16137,7 +16078,7 @@ msgstr[0] "%d непрочитанное, "
 msgstr[1] "%d непрочитанных, "
 msgstr[2] "%d непрочитанных, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:948
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16149,14 +16090,12 @@ msgstr[2] "%d в�его"
 # in search bar in main window, so it should
 # be shorter
 #: ../modules/mail/e-mail-shell-view.c:548
-#, fuzzy
 msgid "All Account Search"
-msgstr "в�ей почте"
+msgstr "По в�ем уч. запи��м"
 
 #: ../modules/mail/e-mail-shell-view.c:685
-#, fuzzy
 msgid "Account Search"
-msgstr "Им� учётной запи�и"
+msgstr "Пои�к по уч. запи�и"
 
 #: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
@@ -16217,26 +16156,22 @@ msgid "%s plugin is not available. Please check whether the package is installed
 msgstr "Модуль %s недо�тупен. Проверьте, что �оответ�твующий пакет у�тановлен."
 
 #: ../modules/mail/em-mailer-prefs.c:766
-#, fuzzy
 msgid "No junk plugin available"
-msgstr "Модуль работы �о �памом недо�тупен"
+msgstr "Модуль дл� работы �о �памом недо�тупен"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/mail/em-mailer-prefs.c:1151
-#, fuzzy
 msgid "_Table column:"
-msgstr "Столбец таблицы:"
+msgstr "С_толбец таблицы:"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
 #: ../modules/mail/em-mailer-prefs.c:1153
-#, fuzzy
 msgid "_Date header:"
-msgstr "Заголовок даты:"
+msgstr "З_аголовок даты:"
 
 #: ../modules/mail/em-mailer-prefs.c:1154
-#, fuzzy
 msgid "Show _original header value"
-msgstr "Показать _и�ходный размер"
+msgstr "Показывать _и�ходное значение заголовка"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -16312,14 +16247,12 @@ msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "�апоминает, е�ли вы забыли добавить вложение в почтовое �ообщение."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid "Inline Audio"
-msgstr "В�троенное отображение vCard"
+msgstr "В�троенный звук"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#, fuzzy
 msgid "Play audio attachments directly in mail messages."
-msgstr "Во�производить звуковые вложени� непо�ред�твенно из Evolution."
+msgstr "Во�производить звуковые вложени� пр�мо в �ообщени�х."
 
 #: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
@@ -16368,118 +16301,116 @@ msgid "_Backup Settings..."
 msgstr "Сохранить пара_метры..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
-#, fuzzy
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "Сохранение и во��тановление данных и параметров Evolution"
+msgstr "Сохранить данные и на�тройки Evolution в архивный файл"
 
 #: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "Во��тановить _параметры..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
-#, fuzzy
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "Сохранение и во��тановление данных и параметров Evolution"
+msgstr "Во��тановить данные и на�тройки Evolution из архивного файла"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "Сохранить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "Во��тановить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "Проверить архив Evolution"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "Перезапу�тить Evolution"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "С графиче�ким интерфей�ом"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "О�танавливает�� Evolution"
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "Сохранение и во��тановление данных и параметров Evolution"
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Сохранение данных Evolution (пи�ем, контактов, календарей, задач, заметок)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "�рхив �оздан"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "Перезапу�к Evolution"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "Сохранение текущих данных Evolution"
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "Во��тановление из архива"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "Загрузка на�троек Evolution"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "Удаление временных файлов архивации"
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "Проверка локальных и�точников"
 
-#: ../plugins/backup-restore/backup.c:427
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "�рхиваци� данных в каталог %s"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Во��тановление из каталога %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Backup"
 msgstr "�рхив Evolution"
 
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Restore"
 msgstr "Во��тановление Evolution"
 
-#: ../plugins/backup-restore/backup.c:487
+#: ../plugins/backup-restore/backup.c:488
 msgid "Backing up Evolution Data"
 msgstr "Резервное копирование данных Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Подождите, пока Evolution выполн�ет резервное копирование ваших данных."
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
 msgstr "Во��тановление данных Evolution"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:492
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Подождите, пока Evolution во��танавливает ваши данные."
 
-#: ../plugins/backup-restore/backup.c:509
+#: ../plugins/backup-restore/backup.c:510
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Это может зан�ть некоторое врем�, в завимо�ти от объема данных вашей учётной "
@@ -16496,11 +16427,11 @@ msgstr "Сохранение и воÑ�Ñ�тановление данных и пÐ
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
-msgstr "Вы дей�твительно хотите закрыть Evolution?"
+msgstr "Дей�твительно закрыть Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "Вы дей�твительно хотите во��тановить Evolution из выбранного файла архива?"
+msgstr "Дей�твительно во��тановить Evolution из выбранного файла резервной копии?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -16598,7 +16529,7 @@ msgstr ""
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
-msgstr ""
+msgstr "Bogofilter недо�тупен. У�тановите его."
 
 #. 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:162
@@ -16623,7 +16554,7 @@ msgstr "Ошибка канала дл� Bogofilter, код ошибки: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
-msgstr "Преобразовать тек�т пи�ьма в _Юникод"
+msgstr "Преобразовывать тек�т �ообщени� в _Юникод"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
@@ -16652,10 +16583,12 @@ msgstr "Фильтрует �пам и�пользу� Bogofilter."
 #: ../plugins/caldav/caldav-browse-server.c:198
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
+"�утентификаци� прошла неудачно. Сервер требует корректного имени учётной "
+"запи�и."
 
 #: ../plugins/caldav/caldav-browse-server.c:200
 msgid "Given URL cannot be found."
-msgstr ""
+msgstr "Данный URL не найден."
 
 #: ../plugins/caldav/caldav-browse-server.c:204
 #, c-format
@@ -16663,6 +16596,8 @@ msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
+"Сервер вернул неожиданные данные.\n"
+"%d - %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:204
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
@@ -16671,95 +16606,78 @@ msgstr "�еизве�тна� ошибка"
 
 #: ../plugins/caldav/caldav-browse-server.c:334
 #: ../plugins/caldav/caldav-browse-server.c:585
-#, fuzzy
 msgid "Failed to parse server response."
-msgstr "Ошибка обновлени� пред�тавителей:"
+msgstr "�е удало�ь разобрать ответ от �ервера."
 
 #: ../plugins/caldav/caldav-browse-server.c:428
-#, fuzzy
 msgid "Events"
-msgstr "Заканчивает��"
+msgstr "Событи�"
 
 #: ../plugins/caldav/caldav-browse-server.c:450
-#, fuzzy
 msgid "User's calendars"
-msgstr "�овый календарь"
+msgstr "Календари пользовател�"
 
 #: ../plugins/caldav/caldav-browse-server.c:558
 #: ../plugins/caldav/caldav-browse-server.c:629
-#, fuzzy
 msgid "Failed to get server URL."
-msgstr "Сбой проверки подлинно�ти на �ервере LDAP."
+msgstr "�е удало�ь получить URL �ервера."
 
 #: ../plugins/caldav/caldav-browse-server.c:627
 #: ../plugins/caldav/caldav-browse-server.c:668
 #: ../plugins/caldav/caldav-browse-server.c:1272
-#, fuzzy
 msgid "Searching for user's calendars..."
-msgstr ""
-"\n"
-"\n"
-"Пои�к контактов..."
+msgstr "Пои�к календарей пользовател�…"
 
 #: ../plugins/caldav/caldav-browse-server.c:666
-#, fuzzy
 msgid "Could not find any user calendar."
-msgstr "�е удало�ь найти ни одного календар�"
+msgstr "�е удало�ь найти ни одного календар�."
 
 #: ../plugins/caldav/caldav-browse-server.c:794
 #, c-format
 msgid "Previous attempt failed: %s"
-msgstr ""
+msgstr "Предыдуща� попытка закончила�ь неудачей: %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:796
 #, c-format
 msgid "Previous attempt failed with code %d"
-msgstr ""
+msgstr "Предыдуща� попытка закончила�ь неудачей � кодом %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:799
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Введите пароль дл� %s (пользователь %s)"
+msgstr "Введите пароль пользовател� <b>%s</b> на �ервере <b>%s</b>"
 
 #: ../plugins/caldav/caldav-browse-server.c:856
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr ""
-"�е удало�ь �оздать файл вывода: %s\n"
-" %s"
+msgstr "�е удало�ь �оздать �ерверное �ообщение дл� URL «%s»"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1091
-#, fuzzy
 msgid "Searching folder content..."
-msgstr ""
-"\n"
-"\n"
-"Пои�к контактов..."
+msgstr "Пои�к �одержимого папки…"
 
 #: ../plugins/caldav/caldav-browse-server.c:1134
-#, fuzzy
 msgid "List of available calendars:"
-msgstr "Локальные календари"
+msgstr "Спи�ок до�тупных календарей:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1171
-#, fuzzy
 msgid "Supports"
-msgstr "Поддержка Hula"
+msgstr "Поддержки"
 
 #: ../plugins/caldav/caldav-browse-server.c:1249
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create thread: %s"
-msgstr "Ошибка �оздани� канала: %s"
+msgstr "�е удало�ь �оздать поток: %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:1357
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
-msgstr ""
+msgstr "URL «%s» �ервера не �вл�ет�� корректным"
 
 #: ../plugins/caldav/caldav-browse-server.c:1363
 msgid "Browse for a CalDAV calendar"
-msgstr ""
+msgstr "Обзор календар� CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
@@ -16777,7 +16695,7 @@ msgstr "И�пользовать _SSL"
 
 #: ../plugins/caldav/caldav-source.c:228
 msgid "Brows_e server for a calendar"
-msgstr ""
+msgstr "Про�мотр_еть календари на �ервере"
 
 #: ../plugins/caldav/caldav-source.c:237
 #: ../plugins/calendar-file/calendar-file.c:178
@@ -16786,7 +16704,7 @@ msgstr ""
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
-msgstr "Обнов_ить"
+msgstr "О_бновл�ть:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
@@ -16822,7 +16740,7 @@ msgstr "Периодиче�ки"
 
 #: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
-msgstr "У�тановить только дл� _чтени�"
+msgstr "То_лько дл� чтени�"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
@@ -16834,7 +16752,7 @@ msgstr "Локальные календари"
 
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
-msgstr "И�пользовать _защищенное �оединение"
+msgstr "_Защищённое �оединение"
 
 #: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
@@ -16891,7 +16809,6 @@ msgstr "Выберите адре�"
 #. Translators: "None" location for a weather calendar
 #: ../plugins/calendar-weather/calendar-weather.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:371
-#, fuzzy
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "�ет"
@@ -16918,23 +16835,20 @@ msgstr "Календари погоды"
 
 #: ../plugins/contacts-map/contacts-map.c:55
 #: ../plugins/contacts-map/contacts-map.c:201
-#, fuzzy
 msgid "Contacts map"
-msgstr "Контакты: "
+msgstr "Карта контактов"
 
 #: ../plugins/contacts-map/contacts-map.c:56
-#, fuzzy
 msgid "Show a map of all the contacts"
-msgstr "Отправить �ообщение к выбранным контактам"
+msgstr "Показать карту дл� в�ех контактов"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr ""
+msgstr "Добавить карту, показывающую, когда �то возможно, ме�тоположение контактов."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#, fuzzy
 msgid "Map for contacts"
-msgstr "�ет контактов"
+msgstr "Карта дл� контактов"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16963,9 +16877,8 @@ msgid "Mark as _default address book"
 msgstr "Пометить как адре�ную книгу по _умолчанию"
 
 #: ../plugins/default-source/default-source.c:88
-#, fuzzy
 msgid "A_utocomplete with this address book"
-msgstr "Показывать адре� найденного в адре�ной книге контакта"
+msgstr "_И�пользовать автодополнение � помощью �той адре�ной книги"
 
 #: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
@@ -17026,7 +16939,6 @@ msgstr "Совершенно �екретное"
 #. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
 #. indicating the header will not be added to a mail message
 #: ../plugins/email-custom-header/email-custom-header.c:379
-#, fuzzy
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "�ет"
@@ -17094,8 +17006,8 @@ msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 msgstr ""
-"Дл� Emacs и�пользуйте \"xemacs\"\n"
-"Дл� VI и�пользуйте \"gvim -f\""
+"Дл� Emacs и�пользуйте «xemacs»\n"
+"Дл� VI и�пользуйте «gvim -f»"
 
 #: ../plugins/external-editor/external-editor.c:375
 #: ../plugins/external-editor/external-editor.c:377
@@ -17108,7 +17020,7 @@ msgstr "Внешний редактор"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr "И�пользует внешний редактор дл� �о�тавлени� �ообщений."
+msgstr "И�пользовать внешний редактор дл� �о�тавлени� про�тых �ообщений."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -17148,69 +17060,63 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr ""
+msgstr "В�тавл�ть по умолчанию личную фотографию"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
+"В�тавл�ть ли по умолчанию изображение лица в и�ход�щие �ообщени�. Перед �тим "
+"необходимо у�тановить изображение, иначе ничего не произойдёт."
 
 #: ../plugins/face/face.c:286
-#, fuzzy
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr "Выберите изображение в формате png размером (48x48) не больше 700 байт"
+msgstr "Выберите изображение png (желательно, размером 48x48, менее 720 байт)"
 
 #: ../plugins/face/face.c:296
-#, fuzzy
 msgid "Image files"
-msgstr "Импорт файлов"
+msgstr "Файлы изображений"
 
 #: ../plugins/face/face.c:355
 msgid "_Insert Face picture by default"
-msgstr ""
+msgstr "_В�тавл�ть по умолчанию личную фотографию"
 
 #: ../plugins/face/face.c:366
 msgid "Load new _Face picture"
-msgstr ""
+msgstr "З_агрузить новую личную фотографию"
 
 #: ../plugins/face/face.c:415
-#, fuzzy
 msgid "Include _Face"
-msgstr "Включ_а� подшивки"
+msgstr "Включ_ать личную фотографию"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Attach a small picture of your face to outgoing messages."
-msgstr ""
+msgstr "Прикрепл�ть небольшое изображение вашего лица к и�ход�щим �ообщени�м."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
-#, fuzzy
 msgid "Failed Read"
-msgstr "Заголовок таблицы"
+msgstr "�е удало�ь прочитать"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-#, fuzzy
 msgid "Invalid Image Size"
-msgstr "�еверное значение даты"
+msgstr "�еверный размер изображени�"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-#, fuzzy
 msgid "Not an image"
-msgstr "_�ет изображени�"
+msgstr "�е �вл�ет�� изображением"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-#, fuzzy
 msgid "Please select an image of size 48 * 48"
-msgstr "Выберите изображение дл� �того контакта"
+msgstr "Выберите изображение размером 48 * 48"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-#, fuzzy
 msgid "The file cannot be read"
-msgstr "Элемент не может быть по�лан!\n"
+msgstr "Файл не может быть прочитан"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr ""
+msgstr "Выбранный файл не похож на корректное изображение .png. Ошибка: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:82
@@ -17296,7 +17202,7 @@ msgid "Create folder"
 msgstr "Создать новую папку"
 
 #: ../plugins/groupwise-features/install-shared.c:225
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17309,7 +17215,7 @@ msgid ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
-"Пользователь «%s» �делал папку общей � вами\n"
+"Пользователь «%s» �делал общую � вами папку\n"
 "\n"
 "Сообщение от «%s»\n"
 "\n"
@@ -17342,9 +17248,8 @@ msgid "Email:"
 msgstr "Эл. почта:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:2
-#, fuzzy
 msgid "Junk List:"
-msgstr "_Спи�ок �пама"
+msgstr "Спам-ли�т:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
 #: ../plugins/publish-calendar/publish-calendar.c:596
@@ -17370,13 +17275,12 @@ msgid "Message Retract"
 msgstr "Отзыв �ообщени�"
 
 #: ../plugins/groupwise-features/mail-retract.c:86
-#, fuzzy
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
-"Отзыв �ообщени� может повлечь за �обой его удаление из почтового �щика "
-"получател�. Вы дей�твительно хотите отозвать �ообщение?"
+"Отзыв �ообщени� может удалить �ообщение из почтового �щика получател�. "
+"Дей�твительно �делать �то?"
 
 #: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
@@ -17457,19 +17361,16 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "Вы должны указать им� пользовател�, которого хотите добавить в �пи�ок"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#, fuzzy
 msgid "Do you want to resend the meeting?"
-msgstr "Отправить �то �обрание повторно?"
+msgstr "Хотите повторно отправить �обрание?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
 msgid "Do you want to resend the recurring meeting?"
-msgstr "Вы дей�твительно хотите удалить �то повтор�ющее�� �обрание?"
+msgstr "Хотите повторно отправить повтор�ющее�� �обрание?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
 msgid "Do you want to retract the original item?"
-msgstr "Во��тановить оригинальный �лемент ?"
+msgstr "Хотите во��тановить и�ходный �лемент?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
 msgid "The original will be removed from the recipient's mailbox."
@@ -17585,8 +17486,8 @@ msgstr "<b>Им� учётной запи�и</b>"
 msgid "Proxy Login"
 msgstr "Учётна� запи�ь прок�и"
 
-#: ../plugins/groupwise-features/proxy-login.c:209
-#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy-login.c:210
+#: ../plugins/groupwise-features/proxy-login.c:253
 #: ../plugins/groupwise-features/proxy.c:495
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -17637,10 +17538,6 @@ msgstr "Дополнительное уведомление"
 msgid "Add   "
 msgstr "Добавить   "
 
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "Изменить"
-
 #: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "Со�то�ние �ообщени�"
@@ -17699,14 +17596,12 @@ msgid "Hula Support"
 msgstr "Поддержка Hula"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-#, fuzzy
 msgid "Inline Image"
-msgstr "В�троенное отображение vCard"
+msgstr "В�троенное отображение"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-#, fuzzy
 msgid "View image attachments directly in mail messages."
-msgstr "Отображать карточки vCard непо�ред�твенно в почтовых �ообщени�."
+msgstr "Показывать вложенные изображени� пр�мо в почтовых �ообщени�х."
 
 #: ../plugins/imap-features/imap-headers.c:328
 #: ../plugins/imap-features/imap-headers.ui.h:2
@@ -17794,7 +17689,7 @@ msgstr "�е удало�ь найти �ту заметку ни в одном
 
 #: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
-msgstr "Открывает�� календарь. Подождите, пожалуй�та..."
+msgstr "Открывает�� календарь. Подождите..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
@@ -17881,14 +17776,12 @@ msgstr "Ð�е удалоÑ�ÑŒ поÑ�лать информацию о заметкÐ
 
 #. Translators: This is a default filename for a calendar.
 #: ../plugins/itip-formatter/itip-formatter.c:1529
-#, fuzzy
 msgid "calendar.ics"
-msgstr "Календари"
+msgstr "календарь.ics"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1534
-#, fuzzy
 msgid "Save Calendar"
-msgstr "�овый календарь"
+msgstr "Сохранить календарь"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1587
 #: ../plugins/itip-formatter/itip-formatter.c:1598
@@ -18318,27 +18211,25 @@ msgstr "<b>%s</b> отменил �ледующую общую заметку:"
 
 #: ../plugins/itip-formatter/itip-view.c:676
 msgid "All day:"
-msgstr ""
+msgstr "Ве�ь день:"
 
 #: ../plugins/itip-formatter/itip-view.c:686
-#, fuzzy
 msgid "Start day:"
-msgstr "Да_та начала:"
+msgstr "День начала:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1041
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Start time:"
 msgstr "Врем� начала:"
 
 #: ../plugins/itip-formatter/itip-view.c:698
-#, fuzzy
 msgid "End day:"
-msgstr "%d день"
+msgstr "День завершени�:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:1056
 msgid "End time:"
 msgstr "Врем� завершени�:"
 
@@ -18397,51 +18288,51 @@ msgid "_Update"
 msgstr "_Обновить"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1072
-#: ../plugins/itip-formatter/itip-view.c:1126
+#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1130
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../plugins/itip-formatter/itip-view.c:1111
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
+#: ../plugins/itip-formatter/itip-view.c:1145
 msgid "Send _updates to attendees"
 msgstr "Отправить о_бновлени� к уча�тникам"
 
-#: ../plugins/itip-formatter/itip-view.c:1150
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Apply to all instances"
 msgstr "П_рименить ко в�ем запи��м"
 
-#: ../plugins/itip-formatter/itip-view.c:1159
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "Show time as _free"
 msgstr "Показать врем� как _�вободное"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1166
 msgid "_Preserve my reminder"
 msgstr "_Сохран�ть �игналы"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1168
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "_Inherit reminder"
 msgstr "�а�_ледовать напоминание"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
+#: ../plugins/itip-formatter/itip-view.c:1915
 msgid "_Tasks:"
 msgstr "_Задачи:"
 
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../plugins/itip-formatter/itip-view.c:1917
 msgid "_Memos:"
 msgstr "_Заметки:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Отображает MIME-ча�ти \"text/calendar\" в �ообщени�х."
+msgstr "Отображает в �ообщени�х MIME-ча�ти «text/calendar»."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Форматировщик Itip"
+msgstr "Форматтер Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
@@ -18456,12 +18347,12 @@ msgstr "Это �обрание было поручено"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"Этот ответ пришел не от текущего уча�тника. Добавить отправител� как "
+"Этот ответ пришёл не от текущего уча�тника. Добавить отправител� как "
 "уча�тника?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "Подавать звуковой �игнал или во�производить звуковой файл"
+msgstr "Подавать звуковой �игнал или во�производить звуковой файл."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Blink icon in notification area."
@@ -18496,11 +18387,8 @@ msgid "Play sound when new messages arrive."
 msgstr "Во�производить звуковой файл при приходе новой почты."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#, fuzzy
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Звуковой файл, во�производимый при приходе новой почты, е�ли не включён "
-"режим гудка."
+msgstr "Во�производить звук при получении новой почты, е�ли не включён режим гудка."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18522,25 +18410,23 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Use sound theme"
-msgstr ""
+msgstr "И�пользовать звуковую тему"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"�адо ли во�производить звуковой файл или подавать гудок при по�туплении "
-"новых �ообщений."
+msgstr "Во�производить ли звук или подавать гудок при получении новых �ообщений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
-msgstr "�адо ли показывать �ообщение над значком при по�туплении новых �ообщений."
+msgstr "Показывать ли �ообщение над значком при получении новых �ообщений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
-msgstr "Должен ли значёк мигать или нет."
+msgstr "Должен ли мигать значок."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
-msgstr "�адо ли оповещать о новых �ообщени�х только в папке Вход�щие."
+msgstr "Оповещать ли о новых �ообщени�х только в папке «Вход�щие»."
 
 #: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
@@ -18571,15 +18457,15 @@ msgstr[2] ""
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
 #: ../plugins/mail-notification/mail-notification.c:506
-#, fuzzy, c-format
+#, c-format
 msgid "From: %s"
-msgstr "Из %s:"
+msgstr "От %s:"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:518
-#, fuzzy, c-format
+#, c-format
 msgid "Subject: %s"
-msgstr "Тема:"
+msgstr "Тема: %s"
 
 #: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
@@ -18608,7 +18494,7 @@ msgstr "Показ_ывать в�плывающее �ообщение вме�
 
 #: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
-msgstr "_Во�производить звук при приходе новой почты"
+msgstr "_Во�производить звук при получении �ообщени�"
 
 #: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
@@ -18616,12 +18502,11 @@ msgstr "По_давать гудок"
 
 #: ../plugins/mail-notification/mail-notification.c:869
 msgid "Use sound _theme"
-msgstr ""
+msgstr "_И�пользовать звуковую тему"
 
 #: ../plugins/mail-notification/mail-notification.c:888
-#, fuzzy
 msgid "Play _file:"
-msgstr "Про_игрывать звуковой файл"
+msgstr "Во�производить _файл:"
 
 #: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
@@ -18647,7 +18532,7 @@ msgstr "УведомлÑ�ет о получении новых почтовых Ñ
 #: ../plugins/mail-to-task/mail-to-task.c:166
 #, c-format
 msgid "Created from a mail by %s"
-msgstr ""
+msgstr "Создано из �ообщени� от %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
@@ -18676,7 +18561,7 @@ msgid ""
 "you like to create new events anyway?"
 msgstr ""
 "Выделенный календарь уже �одержит некоторые �лементы дл� данных �ообщений. "
-"Вы дей�твительно хотите �оздать новые �обыти�?"
+"Дей�твительно �оздать новые �обыти�?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
@@ -18684,7 +18569,7 @@ msgid ""
 "you like to create new tasks anyway?"
 msgstr ""
 "Выделенный �пи�ок задач уже �одержит некоторые задачи дл� данных �ообщений. "
-"Вы дей�твительно хотите �оздать новый �пи�ок задач?"
+"Дей�твительно �оздать новый �пи�ок задач?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
@@ -18692,7 +18577,7 @@ msgid ""
 "you like to create new memos anyway?"
 msgstr ""
 "Выделенный �пи�ок заметок уже �одержит некоторые заметки дл� данных "
-"�ообщений. Вы дей�твительно хотите �оздать новый �пи�ок заметок?"
+"�ообщений. Дей�твительно �оздать новый �пи�ок заметок?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
@@ -18761,7 +18646,7 @@ msgstr "При обработке произошла ошибка: %s"
 #: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "�е удаёт�� открыть календарь. %s"
+msgstr "�е удало�ь открыть календарь. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
@@ -18769,7 +18654,7 @@ msgid ""
 "source, please."
 msgstr ""
 "Выбранный и�точник до�тупен только дл� чтени�, по�тому вы не можете "
-"�оздавать в нём �обыти�. Выберите, пожалуй�та, другой и�точник."
+"�оздавать в нём �обыти�. Выберите другой и�точник."
 
 #: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
@@ -18777,7 +18662,7 @@ msgid ""
 "source, please."
 msgstr ""
 "Выбранный и�точник до�тупен только дл� чтени�, по�тому вы не можете "
-"�оздавать в нём задачи. Выберите, пожалуй�та, другой и�точник."
+"�оздавать в нём задачи. Выберите другой и�точник."
 
 #: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
@@ -18785,7 +18670,7 @@ msgid ""
 "source, please."
 msgstr ""
 "Выбранный и�точник до�тупен только дл� чтени�, по�тому вы не можете "
-"�оздавать в нём заметки. Выберите, пожалуй�та, другой и�точник."
+"�оздавать в нём заметки. Выберите другой и�точник."
 
 #: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
@@ -18794,7 +18679,7 @@ msgstr "�е удало�ь получить �пи�ок и�точников.
 
 #: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
-msgstr " _�обытие"
+msgstr " _Создать �обытие"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
@@ -18875,7 +18760,6 @@ msgid "_Unsubscribe from List"
 msgstr "_Отпи�ать�� от �пи�ка ра��ылки"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:320
-#, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Отпи�ать�� от �пи�ка ра��ылки, которому принадлежит �то �ообщение"
 
@@ -19010,7 +18894,7 @@ msgstr "Управление модул�ми Evolution"
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 #: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
-msgstr "Мeнеджер модулей"
+msgstr "Ди�петчер модулей"
 
 #: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
@@ -19018,7 +18902,7 @@ msgstr "�втор(ы)"
 
 #: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
-msgstr "Примечание: �екоторые изменени� не в�туп�т в �илу до перезапу�ка"
+msgstr "Примечание: некоторые изменени� в�туп�т в �илу по�ле перезапу�ка"
 
 #: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
@@ -19058,33 +18942,35 @@ msgstr "Показывать HTML, е�ли е�ть"
 
 #: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Let Evolution choose the best part to show."
-msgstr ""
+msgstr "Evolution выбирает лучшую ча�ть дл� отображени�."
 
 #: ../plugins/prefer-plain/prefer-plain.c:202
-#, fuzzy
 msgid "Show plain text if present"
-msgstr "Показывать HTML, е�ли е�ть"
+msgstr "Показывать про�той тек�т, е�ли е�ть"
 
 #: ../plugins/prefer-plain/prefer-plain.c:202
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
+"Показывать ча�ть � про�тым тек�том, е�ли она е�ть, иначе Evolution выберет "
+"лучшую ча�ть дл� отображени�."
 
 #: ../plugins/prefer-plain/prefer-plain.c:203
-#, fuzzy
 msgid "Only ever show plain text"
-msgstr "Только когда показывает�� PLAIN"
+msgstr "В�егда показывать про�той тек�т"
 
 #: ../plugins/prefer-plain/prefer-plain.c:203
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
+"В�егда показывать ча�ть про�того тек�та и делать вложени� из других ча�тей, "
+"е�ли �то необходимо."
 
 #: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr ""
+msgstr "_Показывать запрещённые ча�ти HTML в виде вложений"
 
 #: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
@@ -19161,7 +19047,7 @@ msgstr "�е удало�ь открыть %s:"
 #: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "�е удаёт�� открыть %s: �еизве�тна� ошибка"
+msgstr "�е удало�ь открыть %s: неизве�тна� ошибка"
 
 #: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
@@ -19185,7 +19071,7 @@ msgstr "_Включить"
 
 #: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
-msgstr "Вы дей�твительно хотите удалить �тот ре�ур�?"
+msgstr "Дей�твительно удалить �то ме�тоположение?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
@@ -19199,35 +19085,28 @@ msgid "_Publish Calendar Information"
 msgstr "_Публиковать �ведени� календар�"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#, fuzzy
 msgid "Custom Location"
-msgstr "Дополнительное уведомление"
+msgstr "Другое ме�тоположение"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
-#, fuzzy
 msgid "Daily"
-msgstr "День"
+msgstr "Ежедневно"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "FTP (with login)"
-msgstr ""
+msgstr "FTP (� аутентификацией)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#, fuzzy
 msgid "Manual (via Actions menu)"
-msgstr ""
-"Ежедневно\n"
-"Еженедельно\n"
-"Вручную (из меню Дей�тви�)"
+msgstr "Вручную (из меню Дей�тви�)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "П_орт:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
-#, fuzzy
 msgid "Public FTP"
-msgstr "Общее"
+msgstr "Общедо�тупный FTP"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
@@ -19239,20 +19118,19 @@ msgstr "_Ча�тота публикации:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
-msgstr ""
+msgstr "Безопа�ный FTP (SSH)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
-msgstr ""
+msgstr "Безопа�ный WebDAV (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "_Тип �ерви�а:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-#, fuzzy
 msgid "Sources"
-msgstr "И�точник"
+msgstr "И�точники"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
@@ -19263,9 +19141,8 @@ msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#, fuzzy
 msgid "Weekly"
-msgstr "�едел�"
+msgstr "Еженедельно"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Windows share"
@@ -19299,13 +19176,13 @@ msgstr "iCal"
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "�е удаёт�� опубиковать календарь: модуль календар� более не �уще�твует"
+msgstr "�е удало�ь опубиковать календарь: модуль календар� более не �уще�твует"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:474
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "�овый адре�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "Правка адре�а"
 
@@ -19460,7 +19337,7 @@ msgstr "Сохранить календарь или Ñ�пиÑ�ок задач нÐ
 #. *
 #: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
-msgstr "%d/%m/%Y %T"
+msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
@@ -19488,21 +19365,21 @@ msgstr "Сохранить выделенный Ñ�пиÑ�ок задач на дÐ
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
-msgstr "Помогает вам выполнить начальную на�тройку."
+msgstr "Помогает выполнить первоначальную на�тройку учётной запи�и."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Setup Assistant"
-msgstr "Помощник по у�тановке"
+msgstr "Ма�тер у�тановки"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
-msgstr "Помощник по у�тановке Evolution"
+msgstr "Ма�тер у�тановки Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
@@ -19514,28 +19391,28 @@ msgstr ""
 "из других приложений. \n"
 "�ажмите «Далее» дл� продолжени�. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
-msgstr "Пожалуй�та, укажите, какую информацию вы хотите импортировать:"
+msgstr "Укажите, какую информацию вы хотите импортировать:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:168
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "Из %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:185
 msgid "Importing files"
 msgstr "Импорт файлов"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:248
 msgid "Importing data."
 msgstr "Импорт данных."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:250
 msgid "Please wait"
-msgstr "Подождите, пожалуй�та"
+msgstr "Подождите"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
@@ -19588,24 +19465,24 @@ msgstr "Декодер TNEF"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
-msgstr "В�троенное отображение vCard"
+msgstr "В�троенна� карточка vCard"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
 msgid "Show vCards directly in mail messages."
-msgstr "Отображать карточки vCard непо�ред�твенно в почтовых �ообщени�."
+msgstr "Показывать карточки vCard непо�ред�твенно в почтовых �ообщени�."
 
 #: ../plugins/vcard-inline/vcard-inline.c:160
 #: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
-msgstr "Показывать в�ю карточку"
+msgstr "Показывать полную карточку vCard"
 
 #: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
-msgstr "Показывать компактную карточку"
+msgstr "Показывать компактную карточку vCard"
 
 #: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
-msgstr "Имеет�� еще один контакт."
+msgstr "Имеет�� ещё один контакт."
 
 #: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
@@ -19617,11 +19494,11 @@ msgstr[2] "Имеет�� %d других контактов."
 
 #: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
-msgstr "Сохранить в �дре�ной Книге"
+msgstr "Сохранить в адре�ной книге"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "Add WebDAV contacts to Evolution."
-msgstr "Добавить контакты WebDAV к Evolution"
+msgstr "Добавить контакты WebDAV в Evolution."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
@@ -19676,32 +19553,40 @@ msgid "Default window width"
 msgstr "Ширина окна по умолчанию"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "Включить �к�пре��-режим"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "Включает на�тройки прок�и дл� до�тупа к Интернет по протоколу HTTP/HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "Флаг, который включает �ильно упрощённый интерфей� пользовател�."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "Узел HTTP прок�и"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "Пароль прок�и HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "Порт прок�и HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "Им� пользовател� прок�и HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Идентификатор или п�евдоним компонента, который будет показывать�� при "
 "запу�ке по умолчанию."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19713,63 +19598,63 @@ msgstr ""
 "shell/network_config/authentication_user» и локально �охраненного парол�  в ."
 "gnome2_private/."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "И�ходный вид панели вложений"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "И�ходна� папка выбора файлов"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "И�ходна� папка диалога GtkFileChooser."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr "�ачальное значение �лементов панели вложений. «0» - значки, «1» - �пи�ок."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Вер�и� по�ледней обновленной конфигурации"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Спи�ок путей дл� папок, которые будут �инхронизировать�� на ди�к дл� "
 "автономной работы"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "Узлы дл� до�тупа без прок�и"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Пароль дл� проверки подлинно�ти на прок�и."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "Режим на�тройки прок�и"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "Им� узла прок�и SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "Порт прок�и SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "Им� узла прок�и HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "Порт прок�и HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19781,23 +19666,23 @@ msgstr ""
 "«и�пользовать заданные на�тройки» и «и�пользовать ре�ур� дл� автоматиче�кой "
 "конфигурации»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "Бокова� панель видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "Пропу�кать диалог предупреждени� о те�товой вер�ии"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Запу�к в автономном режиме"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "Панель �о�то�ни� видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19805,27 +19690,27 @@ msgstr ""
 "Вер�и� конфигурации Evolution, � уровн�ми major/minor/configuration "
 "(например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
 msgstr "Координата Х по умолчанию дл� о�новного окна."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
 msgstr "Координата Y по умолчанию дл� о�новного окна."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "Вы�ота о�новного окна по умолчанию, в пик�елах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "Ширина о�новного окна по умолчанию, в пик�елах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "Ширина боковой панели по умолчанию, в пик�елах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19833,19 +19718,19 @@ msgstr ""
 "Вер�и� по�ледней обновленной вер�ии Evolution, � уровн�ми major/minor/"
 "configuration (например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "Им� узла прок�и протокола HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Им� узла прок�и протокола HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "Им� узла прок�и протокола SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19853,7 +19738,7 @@ msgstr ""
 "Порт на прок�и узле, определённом ключом «/apps/evolution/shell/"
 "network_config/http_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19861,7 +19746,7 @@ msgstr ""
 "Порт на прок�и узле, определённом ключом «/apps/evolution/shell/"
 "network_config/secure_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19869,7 +19754,7 @@ msgstr ""
 "Порт на прок�и узле, определённом ключом «/apps/evolution/shell/"
 "network_config/socks_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19879,7 +19764,7 @@ msgstr ""
 "у�тановлено значение «toolbar», �тиль кнопок �оответ�твует �и�темным "
 "параметрам �реды GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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 "
@@ -19891,59 +19776,59 @@ msgstr ""
 "могут и�ользовать шаблоны как *.foo.com, адре�ами IP (и IPv4 и IPv6) и "
 "адре�ами �етей � ма�кой (например, 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "Панель ин�трументов видима�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "URL дл� получени� параметров на�тройки прок�и."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "И�пользовать прок�и HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Им� пользовател� дл� прохождени� проверки подлинно�ти при подключении к "
 "прок�и HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Е�ли �тот ключ у�тановлен, Evolution будет запу�кать�� в автономном режиме."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "Должны ли окно быть мак�имизированным."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "Должна ли бокова� панель быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "Должна ли панель �о�то�ни� быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "Должна ли панель ин�трументов быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Е�ли �тот ключ у�тановлен, диалог предупреждени� в те�товых вер�и�х "
 "Evolution не отображает��."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "Должны ли быть видимыми кнопки окон."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "Стиль кнопок окон"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "Кнопки окон видимы"
 
@@ -19965,16 +19850,14 @@ msgstr "%ld КБ"
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
 #: ../shell/e-shell-searchbar.c:883
-#, fuzzy
 msgid "Sho_w:"
-msgstr "По_казать: "
+msgstr "По_казывать: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:910
-#, fuzzy
 msgid "Sear_ch:"
-msgstr "_И�кать: "
+msgstr "По_и�к: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
@@ -19988,116 +19871,108 @@ msgstr "Стиль панели ин�трументов"
 
 #: ../shell/e-shell-switcher.c:449
 msgid "The switcher's toolbar style"
-msgstr ""
+msgstr "Стиль панели ин�трументов переключателей"
 
 #: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
 msgstr "Панель ин�трументов видима�"
 
 #: ../shell/e-shell-switcher.c:466
-#, fuzzy
 msgid "Whether the switcher is visible"
-msgstr "Должна ли бокова� панель быть видимой."
+msgstr "Явл�ет�� ли переключатель видимым"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:245
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:222
+#: ../shell/e-shell-utils.c:247
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:268
 msgid "All Files (*)"
 msgstr "В�е файлы (*)"
 
-#: ../shell/e-shell-view.c:604
-#, fuzzy
+#: ../shell/e-shell-view.c:675
 msgid "Switcher Action"
-msgstr "Переключить�� в %s"
+msgstr "Дей�твие переключател�"
 
-#: ../shell/e-shell-view.c:605
+#: ../shell/e-shell-view.c:676
 msgid "The switcher action for this shell view"
-msgstr ""
+msgstr "Дей�твие переключател� дл� �того вида оболочки"
 
-#: ../shell/e-shell-view.c:620
+#: ../shell/e-shell-view.c:691
 msgid "Page Number"
 msgstr "�омер �траницы"
 
-#: ../shell/e-shell-view.c:621
+#: ../shell/e-shell-view.c:692
 msgid "The notebook page number of the shell view"
-msgstr ""
+msgstr "�омер �траницы запи�ной книжки вида оболочки"
 
-#: ../shell/e-shell-view.c:637
-#, fuzzy
+#: ../shell/e-shell-view.c:708
 msgid "Search Rule"
-msgstr "Фильтр пои�ка"
+msgstr "Правило пои�ка"
 
-#: ../shell/e-shell-view.c:638
-#, fuzzy
+#: ../shell/e-shell-view.c:709
 msgid "Criteria for the current search results"
-msgstr "Очи�тить пои�к"
+msgstr "Критерий дл� текущих результатов пои�ка"
 
-#: ../shell/e-shell-view.c:653
+#: ../shell/e-shell-view.c:724
 msgid "The EShellBackend for this shell view"
-msgstr ""
+msgstr "EShellBackend дл� �того вида оболочки"
 
-#: ../shell/e-shell-view.c:668
+#: ../shell/e-shell-view.c:739
 msgid "Shell Content Widget"
-msgstr ""
+msgstr "Виджет �одержимого оболочки"
 
-#: ../shell/e-shell-view.c:669
+#: ../shell/e-shell-view.c:740
 msgid "The content widget appears in a shell window's right pane"
-msgstr ""
+msgstr "Содержимое виджета по�вл�ет�� в правой панели окна оболочки"
 
-#: ../shell/e-shell-view.c:685
-#, fuzzy
+#: ../shell/e-shell-view.c:756
 msgid "Shell Sidebar Widget"
-msgstr "Ширина боковой панели по умолчанию"
+msgstr "Виджет боковой панели оболочки"
 
-#: ../shell/e-shell-view.c:686
+#: ../shell/e-shell-view.c:757
 msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
+msgstr "Содержимое виджета по�вл�ет�� в левой панели окна оболочки"
 
-#: ../shell/e-shell-view.c:701
+#: ../shell/e-shell-view.c:772
 msgid "Shell Taskbar Widget"
-msgstr ""
+msgstr "Виджет панели задач оболочки"
 
-#: ../shell/e-shell-view.c:702
+#: ../shell/e-shell-view.c:773
 msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
+msgstr "Виджет панели задач по�вл�ет�� в нижней ча�ти окна оболочки"
 
-#: ../shell/e-shell-view.c:717
-#, fuzzy
+#: ../shell/e-shell-view.c:788
 msgid "Shell Window"
-msgstr "_�овое окно"
+msgstr "Окно оболочки"
 
-#: ../shell/e-shell-view.c:718
+#: ../shell/e-shell-view.c:789
 msgid "The window to which the shell view belongs"
-msgstr ""
+msgstr "Окно, которому принадлежит вид оболочки"
 
-#: ../shell/e-shell-view.c:734
+#: ../shell/e-shell-view.c:805
 msgid "The key file holding widget state data"
-msgstr ""
+msgstr "Ключевой файл, �одержащий �о�то�ние данных виджета"
 
-#: ../shell/e-shell-view.c:749
+#: ../shell/e-shell-view.c:820
 msgid "The title of the shell view"
-msgstr ""
+msgstr "Заголовок вида оболочки"
 
-#: ../shell/e-shell-view.c:763
-#, fuzzy
+#: ../shell/e-shell-view.c:834
 msgid "Current View ID"
-msgstr "_Текущий вид"
+msgstr "ID текущего вида"
 
-#: ../shell/e-shell-view.c:764
-#, fuzzy
+#: ../shell/e-shell-view.c:835
 msgid "The current GAL view ID"
-msgstr "Сохранить текущий обзор"
+msgstr "ID текущего обзора GAL"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob@df.ru>\n"
@@ -20105,299 +19980,298 @@ msgstr ""
 "Leonid Kanter <leon@asplinux.ru>\n"
 "Michael Yakhontov <mvy@asplinux.ru>"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Веб-�айт Evolution"
 
-#: ../shell/e-shell-window-actions.c:1223
+#: ../shell/e-shell-window-actions.c:1224
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy не у�тановлен."
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Bug Buddy could not be run."
 msgstr "�е удало�ь запу�тить Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1327
+#: ../shell/e-shell-window-actions.c:1343
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot не у�тановлен."
 
-#: ../shell/e-shell-window-actions.c:1329
+#: ../shell/e-shell-window-actions.c:1345
 msgid "GNOME Pilot could not be run."
-msgstr "�е удаёт�� запу�тить GNOME Pilot"
+msgstr "�е удало�ь запу�тить GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: ../shell/e-shell-window-actions.c:1428
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: ../shell/e-shell-window-actions.c:1435
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Open the Evolution User Guide"
 msgstr "Открыть Руковод�тво пользовател� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1463
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Evolution _FAQ"
 msgstr "В_опро�ы и ответы по Evolution"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Открыть веб-�траницу ча�то задаваемых вопро�ов"
 
-#: ../shell/e-shell-window-actions.c:1470
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "_Забыть пароли"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "Забыть в�е �охранённые пароли"
 
-#: ../shell/e-shell-window-actions.c:1477
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "_Импорт..."
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr "Импортировать данные из других программ"
 
-#: ../shell/e-shell-window-actions.c:1484
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "_�овое окно"
 
-#: ../shell/e-shell-window-actions.c:1486
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
-msgstr "Создать новое окно, отображающее �ту папку"
+msgstr "Создать новое окно � �тим обзором"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Configure Evolution"
 msgstr "�а�троить Evolution"
 
-#: ../shell/e-shell-window-actions.c:1505
+#: ../shell/e-shell-window-actions.c:1521
 msgid "_Quick Reference"
 msgstr "_Бы�тра� �правка"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Show Evolution's shortcut keys"
 msgstr "�а�троить комбинации клавиш Evolution"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: ../shell/e-shell-window-actions.c:1519
+#: ../shell/e-shell-window-actions.c:1535
 msgid "_Advanced Search..."
 msgstr "_Ра�ширенный пои�к..."
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Construct a more advanced search"
 msgstr "Создать более ра�ширенные параметры пои�ка"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Clear the current search parameters"
 msgstr "Очи�тить текущие параметры пои�ка"
 
-#: ../shell/e-shell-window-actions.c:1533
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Edit Saved Searches..."
-msgstr "_Изменить �охраненные результаты пои�ка..."
+msgstr "_Изменить �охранённые результаты пои�ка…"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Manage your saved searches"
 msgstr "Управление �охранёнными параметрами пои�ка"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Click here to change the search type"
 msgstr "�ажмите, чтобы изменить тип пои�ка"
 
-#: ../shell/e-shell-window-actions.c:1547
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Find Now"
 msgstr "_�айти �ейча�"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Execute the current search parameters"
 msgstr "Выполнить пои�к � текущими параметрами"
 
-#: ../shell/e-shell-window-actions.c:1554
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Save Search..."
 msgstr "_Сохранить результаты пои�ка..."
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Save the current search parameters"
 msgstr "Сохранить текущие параметры пои�ка"
 
-#: ../shell/e-shell-window-actions.c:1568
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Send / _Receive"
 msgstr "_Отправить / Получить"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Send queued items and retrieve new items"
 msgstr "Отправить �лементы из очереди и получить новые �лементы"
 
-#: ../shell/e-shell-window-actions.c:1575
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
 msgstr "О_тправить �ообщение об ошибке..."
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Отправить �ообщение об ошибке, и�пользу� программу Баг Бадди"
 
-#: ../shell/e-shell-window-actions.c:1582
+#: ../shell/e-shell-window-actions.c:1598
 msgid "GNOME Pilot _Synchronization..."
 msgstr "Син_хронизаци� GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Set up GNOME Pilot configuration"
 msgstr "�а�троить GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1589
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "�в_тономна� работа"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into offline mode"
 msgstr "Переве�ти Evolution в автономный режим"
 
-#: ../shell/e-shell-window-actions.c:1596
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Online"
 msgstr "Перейти в �етевой режим"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into online mode"
 msgstr "Переве�ти Evolution в режим �оединени� � �етью"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1642
 msgid "Lay_out"
 msgstr "Панели _ин�трументов"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_New"
 msgstr "_Создать"
 
-#: ../shell/e-shell-window-actions.c:1640
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Search"
 msgstr "П_ои�к"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Switcher Appearance"
 msgstr "Вид _переключател�"
 
-#: ../shell/e-shell-window-actions.c:1661
+#: ../shell/e-shell-window-actions.c:1677
 msgid "_Window"
 msgstr "_Окно"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show Side _Bar"
 msgstr "Показать _боковую панель"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show the side bar"
 msgstr "Показать боковую панель"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Buttons"
 msgstr "Показывать _кнопки"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show the switcher buttons"
 msgstr "Показывать кнопки переключател�"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show _Status Bar"
 msgstr "_Строка �о�то�ни�"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Show the status bar"
 msgstr "Показать панель �о�то�ни�"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Show _Tool Bar"
 msgstr "Показать панель _ин�трументов"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Show the tool bar"
 msgstr "Показать панель ин�трументов"
 
-#: ../shell/e-shell-window-actions.c:1738
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Icons Only"
 msgstr "Только _значки"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons only"
 msgstr "Отображать кнопки окна только �о значками"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Text Only"
 msgstr "_Только тек�т"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with text only"
 msgstr "Отображать кнопки окна только � тек�том"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Icons _and Text"
 msgstr "Зн_ачки и тек�т"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with icons and text"
 msgstr "Отображать кнопки окна �о значками и тек�том"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Tool_bar Style"
 msgstr "Сти_ль панели ин�трументов"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Отображать кнопки окна, и�пользу� �и�темные параметры"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Define Views..."
 msgstr "Режимы про�мотра..."
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Create or edit views"
 msgstr "Создать или на�троить обзор"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Save Custom View..."
 msgstr "Сохранить вид пользовател�..."
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Save current custom view"
-msgstr "Сохранить текущий обзор"
+msgstr "Сохранить текущий вид"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1801
 msgid "C_urrent View"
-msgstr "Тек_ущий вид"
+msgstr "Тек_ущий обзор"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1811
 msgid "Custom View"
 msgstr "Вид пользовател�"
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Current view is a customized view"
 msgstr "Текущий обзор на�троен пользователем"
 
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1823
 msgid "Change the page settings for your current printer"
 msgstr "Изменить ориентацию �траницы дл� вашего текущего принтера"
 
-#: ../shell/e-shell-window-actions.c:2127
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "Переключить�� в %s"
 
-#: ../shell/e-shell-window-actions.c:2337
+#: ../shell/e-shell-window-actions.c:2413
 msgid "Execute these search parameters"
 msgstr "Выполнить �ти параметры пои�ка"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:555
+#: ../shell/e-shell-window-private.c:567
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20408,115 +20282,106 @@ msgstr "Создать"
 
 #: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
-msgstr ""
+msgstr "Текущий вид оболочки"
 
 #: ../shell/e-shell-window.c:617
-#, fuzzy
 msgid "Name of the active shell view"
-msgstr "Им� нового обзора:"
+msgstr "Им� текущего вида оболочки"
 
 #: ../shell/e-shell-window.c:632
 msgid "The shell window's EFocusTracker"
-msgstr ""
+msgstr "EFocusTracker окна оболочки"
 
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
 msgid "Geometry"
 msgstr "Геометри�"
 
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
 msgid "Initial window geometry string"
 msgstr "Строка начальной геометрии окна"
 
 #: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
-msgstr "Защищенный режим"
+msgstr "Защищённый режим"
 
 #: ../shell/e-shell-window.c:663
-#, fuzzy
 msgid "Whether the shell window is in safe mode"
-msgstr "Включён ли модуль"
+msgstr "�аходит�� ли окно оболочки в безопа�ном режиме"
 
 #: ../shell/e-shell-window.c:694
 msgid "Sidebar Visible"
 msgstr "Бокова� панель видима"
 
 #: ../shell/e-shell-window.c:695
-#, fuzzy
 msgid "Whether the shell window's side bar is visible"
-msgstr "Должны ли быть видимыми кнопки окон."
+msgstr "Показывать ли боковую панель окна оболочки"
 
 #: ../shell/e-shell-window.c:709
 msgid "Switcher Visible"
 msgstr "Переключатель видимый"
 
 #: ../shell/e-shell-window.c:710
-#, fuzzy
 msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Должны ли быть видимыми кнопки окон."
+msgstr "Показывать ли кнопки переключател� окна оболочки"
 
 #: ../shell/e-shell-window.c:725
 msgid "Taskbar Visible"
 msgstr "Панель задач видима"
 
 #: ../shell/e-shell-window.c:726
-#, fuzzy
 msgid "Whether the shell window's task bar is visible"
-msgstr "Должна ли панель �о�то�ни� быть видимой."
+msgstr "Показывать ли панель задач окна оболочки"
 
 #: ../shell/e-shell-window.c:741
-#, fuzzy
 msgid "Whether the shell window's tool bar is visible"
-msgstr "Должны ли быть видимыми кнопки окон."
+msgstr "Показывать ли панель задач окна оболочки"
 
 #: ../shell/e-shell-window.c:755
 msgid "UI Manager"
-msgstr "Мeнеджер UI"
+msgstr "Мeнеджер интерфей�а"
 
 #: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
-msgstr ""
+msgstr "GtkUIManager окна оболочки"
 
-#: ../shell/e-shell.c:213
-#, fuzzy
+#: ../shell/e-shell.c:212
 msgid "Preparing to go offline..."
-msgstr "Подготовка учётной запи�и «%s» к автономной работе"
+msgstr "Подготовка к выходу из �ети…"
 
-#: ../shell/e-shell.c:267
-#, fuzzy
+#: ../shell/e-shell.c:262
 msgid "Preparing to go online..."
-msgstr "Подготовка учётной запи�и «%s» к автономной работе"
+msgstr "Подготовка к выходу в �еть…"
 
-#: ../shell/e-shell.c:339
+#: ../shell/e-shell.c:330
 msgid "Preparing to quit..."
 msgstr "Подготовка к выходу..."
 
-#: ../shell/e-shell.c:788
+#: ../shell/e-shell.c:819
 msgid "Module Directory"
 msgstr "Каталог модулей"
 
-#: ../shell/e-shell.c:789
+#: ../shell/e-shell.c:820
 msgid "The directory from which to load EModules"
 msgstr "Каталог, из которого загружать EModule"
 
-#: ../shell/e-shell.c:804
+#: ../shell/e-shell.c:835
 msgid "Network Available"
 msgstr "Сеть до�тупна"
 
-#: ../shell/e-shell.c:805
+#: ../shell/e-shell.c:836
 msgid "Whether the network is available"
-msgstr ""
+msgstr "До�тупна ли �еть"
 
-#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "В �ети"
 
-#: ../shell/e-shell.c:821
-#, fuzzy
+#: ../shell/e-shell.c:852
 msgid "Whether the shell is online"
-msgstr "Включён ли модуль"
+msgstr "�аходит�� ли оболочка в �ети"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:167
+#: ../shell/main.c:168
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20552,7 +20417,7 @@ msgstr ""
 "�адеем��, что вам понравит�� результат нашего труда,\n"
 "и � нетерпением ждем вашей помощи!\n"
 
-#: ../shell/main.c:191
+#: ../shell/main.c:192
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20560,56 +20425,59 @@ msgstr ""
 "С благодарно�тью\n"
 "команда Evolution\n"
 
-#: ../shell/main.c:198
+#: ../shell/main.c:199
 msgid "Do not tell me again"
 msgstr "�е напоминать больше"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Запу�к Evolution � активированием указанного компонента"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr "Применить данную геометрию к главному окну"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "Запу�к в режиме подключени� к интернету"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:330
+msgid "Start in \"express\" mode"
+msgstr "Запу�к в режиме \"�к�пре��\""
+
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
 msgstr "Принудительное завершение работы Evolution"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:337
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Принудительна� повторна� миграци� � Evolution 1.4"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "Запи�ывать отладочный вывод в�ех компонентов в файл."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "Запретить загрузку любых модулей."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Выключить обла�ть про�мотра почты, контактов и задач."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
-msgstr ""
+msgstr "Импортировать URI или имена файлов как о�тавшие�� аргументы."
 
-#: ../shell/main.c:344
-#, fuzzy
+#: ../shell/main.c:350
 msgid "Request a running Evolution process to quit"
-msgstr "Перезапу�к Evolution"
+msgstr "Запро� на завершение запущенного проце��а Evolution"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Почтовый клиент и ежедневник Evolution"
 
-#: ../shell/main.c:524
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20620,7 +20488,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Дей�твительно забыть в�е �охраненные пароли?"
+msgstr "Дей�твительно забыть в�е �охранённые пароли?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -20644,7 +20512,7 @@ msgstr "Ð�едоÑ�таточно меÑ�та на диÑ�ке длÑ� обновлÐ
 
 #: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
-msgstr "Вы дей�твительно хотите удалить �тарые данные?"
+msgstr "Дей�твительно удалить �тарые данные?"
 
 #: ../shell/shell.error.xml.h:8
 msgid ""
@@ -20713,16 +20581,16 @@ msgid "_Remind Me Later"
 msgstr "_�апомнить позже"
 
 #: ../shell/shell.error.xml.h:25
-#, fuzzy
 msgid ""
 "{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
-"Е�ли вы решите продолжить, вы утратите до�туп к некоторым �тарым данным.\n"
+"Е�ли вы решите продолжить, вы можете потер�ть до�туп к некоторым �тарым "
+"данным.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -20745,12 +20613,12 @@ msgstr "Создать новый те�товый и�точник"
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Файл не �вл�ет�� дей�твительным файлом .desktop"
 
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
+msgstr "�еопределённа� вер�и� файла .desktop «%s»"
 
 #: ../smclient/eggdesktopfile.c:958
 #, c-format
@@ -20770,7 +20638,7 @@ msgstr "�еизве�тный параметр запу�ка: %d"
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
+msgstr "�е удаёт�� передать URI документов �лементу рабочего �тола «Type=Link»"
 
 #: ../smclient/eggdesktopfile.c:1394
 #, c-format
@@ -20787,11 +20655,11 @@ msgstr "Укажите файл, Ñ�одержащий Ñ�охранённую кÐ
 
 #: ../smclient/eggsmclient.c:230
 msgid "FILE"
-msgstr ""
+msgstr "Ф�ЙЛ"
 
 #: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Указать ID управлени� �еан�ов"
 
 #: ../smclient/eggsmclient.c:233
 msgid "ID"
@@ -20838,7 +20706,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:382
 #: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
-msgstr "Выберите �ертификат дл� импорта..."
+msgstr "Выберите �ертификат дл� импортировани�…"
 
 #: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
@@ -21010,9 +20878,8 @@ msgid "Expires On"
 msgstr "Годен до"
 
 #: ../smime/gui/smime-ui.ui.h:21
-#, fuzzy
 msgid "Field Value"
-msgstr "Им� пол�"
+msgstr "Значение пол�"
 
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "Fingerprints"
@@ -21040,11 +20907,11 @@ msgstr "Отпечаток MD5"
 
 #: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
-msgstr "Организаци� (O)"
+msgstr "Организаци�"
 
 #: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
-msgstr "Подразделение организации (OU)"
+msgstr "Подразделение организации"
 
 #: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
@@ -21079,9 +20946,8 @@ msgid "Trust this CA to identify web sites."
 msgstr "Довер�ть �тому CA дл� идентификации разработчиков веб-�айтов"
 
 #: ../smime/gui/smime-ui.ui.h:40
-#, fuzzy
 msgid "Validity"
-msgstr "<b>Со�то�ние</b>"
+msgstr "Дей�твительно�ть"
 
 #: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
@@ -21089,7 +20955,7 @@ msgstr "Про�мотр"
 
 #: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
-msgstr "У ва� е�ть идентифицирующие ва� �ертификаты от �ледующих организаций:"
+msgstr "Имеют�� �ертификаты, идентифицирующие ва�, от �ледующих организаций:"
 
 #: ../smime/gui/smime-ui.ui.h:43
 msgid "You have certificates on file that identify these certificate authorities:"
@@ -21410,14 +21276,14 @@ msgstr "Определить обзоры дл� %s"
 #: ../widgets/menus/gal-define-views-dialog.c:335
 #: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
-msgstr "Определить обзоры"
+msgstr "Определить вилы"
 
 #: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Определить обзоры дл� «%s»"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "Таблица"
 
@@ -21427,7 +21293,7 @@ msgstr "Пример"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
-msgstr "Сохранить текущий обзор"
+msgstr "Сохранить текущий вид"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
@@ -21496,7 +21362,7 @@ msgstr "_Предполагать автоматичеÑ�кое отображеÐ
 
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
-msgstr "�е удаёт�� у�тановить как фон"
+msgstr "�е удало�ь у�тановить как фон"
 
 #: ../widgets/misc/e-attachment-handler-image.c:147
 msgid "Set as _Background"
@@ -21556,32 +21422,32 @@ msgstr[2] "Сохраненить вложени�"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "С_охранить в�е"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:326
 msgid "A_dd Attachment..."
 msgstr "_Добавить вложение..."
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_В�троенный про�мотр"
 
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:639
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Открыть в программе «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:642
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Открыть �то вложение в %s"
@@ -21594,13 +21460,13 @@ msgstr "Открыть �то вложение в %s"
 msgid "Attached message"
 msgstr "Вложенное �ообщение"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
 msgid "A load operation is already in progress"
-msgstr "Загрузка уже идёт"
+msgstr "Операци� загрузки уже выполн�ет��"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A save operation is already in progress"
-msgstr "Сохранение уже идёт"
+msgstr "Операци� �охранени� уже выполн�ет��"
 
 #: ../widgets/misc/e-attachment.c:1920
 #, c-format
@@ -21610,34 +21476,34 @@ msgstr "�е удало�ь загрузить «%s»"
 #: ../widgets/misc/e-attachment.c:1923
 #, c-format
 msgid "Could not load the attachment"
-msgstr "�е удаёт�� загрузить вложение"
+msgstr "�е удало�ь загрузить вложение"
 
-#: ../widgets/misc/e-attachment.c:2197
+#: ../widgets/misc/e-attachment.c:2199
 #, c-format
 msgid "Could not open '%s'"
-msgstr "�е удаёт�� открыть «%s»"
+msgstr "�е удало�ь открыть «%s»"
 
-#: ../widgets/misc/e-attachment.c:2200
+#: ../widgets/misc/e-attachment.c:2202
 #, c-format
 msgid "Could not open the attachment"
-msgstr "�е удаёт�� открыть вложение"
+msgstr "�е удало�ь открыть вложение"
 
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2637
 msgid "Attachment contents not loaded"
 msgstr "Содержимое вложени� не загружено"
 
-#: ../widgets/misc/e-attachment.c:2711
+#: ../widgets/misc/e-attachment.c:2713
 #, c-format
 msgid "Could not save '%s'"
-msgstr "�е удаёт�� �охранить «%s»"
+msgstr "�е удало�ь �охранить «%s»"
 
-#: ../widgets/misc/e-attachment.c:2714
+#: ../widgets/misc/e-attachment.c:2716
 #, c-format
 msgid "Could not save the attachment"
-msgstr "�е удаёт�� �охранить вложение"
+msgstr "�е удало�ь �охранить вложение"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-щелчок, чтобы открыть ��ылку"
 
@@ -21650,64 +21516,64 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Календарь ме��ца"
 
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
-#: ../widgets/text/e-text.c:3388
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
+#: ../widgets/text/e-text.c:3400
 msgid "Fill color"
 msgstr "Цвет заполнени�"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
-#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
-#: ../widgets/text/e-text.c:3402
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
+#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
+#: ../widgets/text/e-text.c:3414
 msgid "GDK fill color"
-msgstr "Цвет заполнени�"
+msgstr "Цвет заполнени� GDK"
 
-#: ../widgets/misc/e-canvas-background.c:488
-#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
-#: ../widgets/text/e-text.c:3409
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
+#: ../widgets/text/e-text.c:3421
 msgid "Fill stipple"
 msgstr "Пунктир заполнени�"
 
-#: ../widgets/misc/e-canvas-background.c:495
-#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:502
-#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:509
-#: ../widgets/misc/e-canvas-background.c:510
+#: ../widgets/misc/e-canvas-background.c:513
+#: ../widgets/misc/e-canvas-background.c:514
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:516
-#: ../widgets/misc/e-canvas-background.c:517
+#: ../widgets/misc/e-canvas-background.c:520
+#: ../widgets/misc/e-canvas-background.c:521
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2872
+#: ../widgets/table/e-table-item.c:2884
 msgid "Minimum width"
 msgstr "Минимальна� ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2873
+#: ../widgets/table/e-table-item.c:2885
 msgid "Minimum Width"
 msgstr "Минимальна� ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
-msgstr "Про�тран�тво"
+msgstr "Ра��то�ние"
 
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
@@ -21727,7 +21593,7 @@ msgstr "Дата и врем�"
 
 #: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
-msgstr "Поле дл� тек�тового ввода даты"
+msgstr "Тек�товое поле дл� ввода даты"
 
 #: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
@@ -21753,16 +21619,16 @@ msgstr "_�ет"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
 msgctxt "date"
 msgid "None"
 msgstr "�ет"
 
-#: ../widgets/misc/e-dateedit.c:1830
+#: ../widgets/misc/e-dateedit.c:1834
 msgid "Invalid Date Value"
 msgstr "�еверное значение даты"
 
-#: ../widgets/misc/e-dateedit.c:1874
+#: ../widgets/misc/e-dateedit.c:1878
 msgid "Invalid Time Value"
 msgstr "�еверное значение времени"
 
@@ -21803,7 +21669,7 @@ msgstr "Импорт _одного файла"
 
 #: ../widgets/misc/e-import-assistant.c:439
 msgid "Select what type of file you want to import from the list."
-msgstr ""
+msgstr "Выберите тип файла из �пи�ка дл� импортировани�"
 
 #: ../widgets/misc/e-import-assistant.c:516
 msgid ""
@@ -21811,13 +21677,14 @@ msgid ""
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
-"Программа Evolution проверила параметры дл� импорта из "
-"�ледующих приложений: Pine, Netscape, Elm, iCalendar. �е найдено параметров, которые можно было бы импортировать. Е�ли вы хотите попробовать еще раз, нажмите клавишу «�азад»."
+"Программа Evolution проверила параметры дл� импорта из �ледующих приложений: "
+"Pine, Netscape, Elm, iCalendar. �е найдено параметров, которые можно было бы "
+"импортировать. Е�ли вы хотите попробовать еще раз, нажмите клавишу «�азад»."
 
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
 msgid "Evolution Import Assistant"
-msgstr "Помощник по импорту Evolution"
+msgstr "Ма�тер импорта Evolution"
 
 #: ../widgets/misc/e-import-assistant.c:1196
 #: ../widgets/misc/e-import-assistant.c:1248
@@ -21830,8 +21697,8 @@ msgid ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 msgstr ""
-"Ва� привет�твует помощник по импорту Evolution.\n"
-"Этот помощник проведёт ва� через проце�� импорта внешних файлов в Evolution."
+"Добро пожаловать в ма�тер импорта Evolution.\n"
+"Этот ма�тер проведёт ва� через проце�� импорта внешних файлов в Evolution."
 
 #: ../widgets/misc/e-import-assistant.c:1223
 msgid "Importer Type"
@@ -21854,11 +21721,11 @@ msgstr "�ажмите «Применить» дл� начала импорта
 msgid "Import Data"
 msgstr "Импорт данных"
 
-#: ../widgets/misc/e-map.c:621
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "Карта мира"
 
-#: ../widgets/misc/e-map.c:623
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21882,13 +21749,13 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution �ейча� работает в автономном режиме, потому что �еть недо�тупна."
 
-#: ../widgets/misc/e-online-button.c:131
+#: ../widgets/misc/e-online-button.c:135
 msgid "The button state is online"
 msgstr "Со�то�ние кнопки - «в �ети»"
 
 #: ../widgets/misc/e-paned.c:306
 msgid "Horizontal Position"
-msgstr "Позици� горизонтальной панели"
+msgstr "Горизонтальное положение"
 
 #: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
@@ -21896,7 +21763,7 @@ msgstr "Позици� панели при горизонтальной орие
 
 #: ../widgets/misc/e-paned.c:318
 msgid "Vertical Position"
-msgstr "Позици� вертикальной панели"
+msgstr "Вертикальное положение"
 
 #: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
@@ -21908,7 +21775,7 @@ msgstr "Пропорции"
 
 #: ../widgets/misc/e-paned.c:331
 msgid "Proportion of the 2nd pane size"
-msgstr "Пропорции 2й панели"
+msgstr "Пропорции размеров 2-й панели"
 
 #: ../widgets/misc/e-paned.c:342
 msgid "Fixed Resize"
@@ -21916,7 +21783,7 @@ msgstr "Фик�ированное изменение размера"
 
 #: ../widgets/misc/e-paned.c:343
 msgid "Keep the 2nd pane fixed during resize"
-msgstr "Сохран�ть размер 2й панели при изменении размера окна"
+msgstr "Сохран�ть размеры 2-й панели при изменении размера окна"
 
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
@@ -21928,7 +21795,7 @@ msgstr "Синхронизировать личные запи�и:"
 
 #: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
-msgstr "Категории:"
+msgstr "Синхронизировать категории:"
 
 #: ../widgets/misc/e-preferences-window.c:218
 msgid "Evolution Preferences"
@@ -21939,43 +21806,43 @@ msgstr "Параметры Evolution"
 msgid "Matches: %d"
 msgstr "Совпадени�: %d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:558
 msgid "Close the find bar"
 msgstr "Закрыть панель пои�ка"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:566
 msgid "Fin_d:"
 msgstr "_�айти:"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:578
 msgid "Clear the search"
 msgstr "Очи�тить пои�к"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "_Предыдущее"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "�айти предыдущее �овпадение � фразой"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Next"
 msgstr "_Следующее"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:623
 msgid "Find the next occurrence of the phrase"
 msgstr "�айти �ледующее �овпадение � фразой"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:633
 msgid "Mat_ch case"
 msgstr "_Учитывать реги�тр"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:661
 msgid "Reached bottom of page, continued from top"
 msgstr "До�тигнут конец �траницы, продолжено � начала"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:683
 msgid "Reached top of page, continued from bottom"
 msgstr "До�тигнут верх �траницы, продолжено �низу"
 
@@ -22034,9 +21901,8 @@ msgid "Mail Receipt"
 msgstr "Сообщение о до�тавке"
 
 #: ../widgets/misc/e-send-options.ui.h:14
-#, fuzzy
 msgid "Proprietary"
-msgstr "Приоритет"
+msgstr "Личный"
 
 #: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
@@ -22051,18 +21917,16 @@ msgid "Sta_tus Tracking"
 msgstr "О_т�леживание �о�то�ни�"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-#, fuzzy
 msgid "Standard"
-msgstr "С_тандартный шрифт:"
+msgstr "Стандартный"
 
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Status Tracking"
 msgstr "От�леживание �о�то�ни�"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-#, fuzzy
 msgid "Top Secret"
-msgstr "Совершенно �екретное"
+msgstr "Совершенно �екретно"
 
 #: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
@@ -22129,7 +21993,7 @@ msgstr "Со_хранить и закрыть"
 
 #: ../widgets/misc/e-signature-editor.c:389
 msgid "Edit Signature"
-msgstr "Редактировать подпи�и"
+msgstr "Изменить подпи�ь"
 
 #: ../widgets/misc/e-signature-editor.c:404
 msgid "_Signature Name:"
@@ -22238,9 +22102,9 @@ msgstr "�ет"
 
 #: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
-msgstr "Ок"
+msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:862
+#: ../widgets/table/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Врем� должно быть в формате: %s"
@@ -22261,23 +22125,23 @@ msgstr "Столбец, имеющий фоку�"
 msgid "Unselected Column"
 msgstr "�евыделенный �толбец"
 
-#: ../widgets/table/e-cell-text.c:1627
+#: ../widgets/table/e-cell-text.c:1631
 msgid "Strikeout Column"
 msgstr "Перечёркнутый �толбец"
 
-#: ../widgets/table/e-cell-text.c:1634
+#: ../widgets/table/e-cell-text.c:1638
 msgid "Underline Column"
 msgstr "Подчёркнутый �толбец"
 
-#: ../widgets/table/e-cell-text.c:1641
+#: ../widgets/table/e-cell-text.c:1645
 msgid "Bold Column"
 msgstr "Столбец � жирным тек�том"
 
-#: ../widgets/table/e-cell-text.c:1648
+#: ../widgets/table/e-cell-text.c:1652
 msgid "Color Column"
 msgstr "Цветной �толбец"
 
-#: ../widgets/table/e-cell-text.c:1662
+#: ../widgets/table/e-cell-text.c:1666
 msgid "BG Color Column"
 msgstr "Цвет фона �толбца"
 
@@ -22293,11 +22157,11 @@ msgstr "Со�то�ние"
 
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
-msgstr "(Возра�тающа�)"
+msgstr "(по возра�танию)"
 
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
-msgstr "(Убывающа�)"
+msgstr "(по убыванию)"
 
 #: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
@@ -22310,7 +22174,7 @@ msgstr "Без группировани�"
 #: ../widgets/table/e-table-config.c:638
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
-msgstr "Отображать пол�"
+msgstr "Показывать пол�"
 
 #: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
@@ -22321,9 +22185,9 @@ msgid "A_vailable Fields:"
 msgstr "_До�тупные пол�:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1637
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Ascending"
-msgstr "Возра�тающа�"
+msgstr "По возра�танию"
 
 #: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
@@ -22334,9 +22198,9 @@ msgid "Clear _All"
 msgstr "Очи�тить _в�е"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1637
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Descending"
-msgstr "Убывающа�"
+msgstr "По убыванию"
 
 #: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
@@ -22396,14 +22260,14 @@ msgstr "_Сортировать..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a Column"
-msgstr "Добавление �толбца"
+msgstr "Добавить �толбец"
 
 #: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
-"Чтобы добавить �толбец в вашу таблицу,\n"
+"Чтобы добавить �толбец в таблицу,\n"
 "перетащите его в нужное ме�то."
 
 #: ../widgets/table/e-table-group-container.c:342
@@ -22426,7 +22290,7 @@ msgstr[2] "%s (%d �лементов)"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
+#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
 msgid "Alternating Row Colors"
 msgstr "�льтернативные цвета �троки"
 
@@ -22434,8 +22298,8 @@ msgstr "�льтернативные цвета �троки"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
-#: ../widgets/table/e-tree.c:3369 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
+#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
 msgid "Horizontal Draw Grid"
 msgstr "Горизонтальна� таблица дл� ри�овани�"
 
@@ -22443,8 +22307,8 @@ msgstr "Горизонтальна� таблица дл� ри�овани�"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
-#: ../widgets/table/e-tree.c:3375 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
+#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
 msgid "Vertical Draw Grid"
 msgstr "Вертикальна� таблица дл� ри�овани�"
 
@@ -22452,8 +22316,8 @@ msgstr "Вертикальна� таблица дл� ри�овани�"
 #: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
-#: ../widgets/table/e-tree.c:3381 ../widgets/table/e-tree.c:3382
+#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
+#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
 msgid "Draw focus"
 msgstr "Фоку� ри�овани�"
 
@@ -22461,7 +22325,7 @@ msgstr "Фоку� ри�овани�"
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
+#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
 msgid "Cursor mode"
 msgstr "Режим кур�ора"
 
@@ -22469,7 +22333,7 @@ msgstr "Режим кур�ора"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
+#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
 msgid "Selection model"
 msgstr "Модель выделени�"
 
@@ -22477,9 +22341,9 @@ msgstr "Модель выделени�"
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3363
-#: ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
+#: ../widgets/table/e-tree.c:3368
 msgid "Length Threshold"
 msgstr "Порог длины"
 
@@ -22487,9 +22351,9 @@ msgstr "Порог длины"
 #: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3395
-#: ../widgets/table/e-tree.c:3396
+#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
+#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
+#: ../widgets/table/e-tree.c:3400
 msgid "Uniform row height"
 msgstr "Обща� вы�ота �троки"
 
@@ -22500,72 +22364,72 @@ msgstr "Обща� вы�ота �троки"
 msgid "Frozen"
 msgstr "Заморожена"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "�а�троить текущий вид"
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "Sort _Ascending"
-msgstr "Возра�_тающа� �ортировка"
+msgstr "Упор�дочить по возра�_танию"
 
-#: ../widgets/table/e-table-header-item.c:1505
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Sort _Descending"
-msgstr "Убыв_ающа� �ортировка"
+msgstr "Упор�дочить по убыв_анию"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "_Unsort"
 msgstr "_Без �ортировки"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1517
 msgid "Group By This _Field"
 msgstr "Группировать по �тому _полю"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1520
 msgid "Group By _Box"
 msgstr "_Группировать по �щику"
 
-#: ../widgets/table/e-table-header-item.c:1518
+#: ../widgets/table/e-table-header-item.c:1524
 msgid "Remove This _Column"
 msgstr "Убрать �тот �тол_бец"
 
-#: ../widgets/table/e-table-header-item.c:1521
+#: ../widgets/table/e-table-header-item.c:1527
 msgid "Add a C_olumn..."
 msgstr "Добавить �толб_ец..."
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "A_lignment"
 msgstr "Выр_авнивание"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "B_est Fit"
 msgstr "Луч_шее заполнение"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Format Column_s..."
 msgstr "Формат �толбцо_в..."
 
-#: ../widgets/table/e-table-header-item.c:1535
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Custo_mize Current View..."
 msgstr "�а�троить те_кущий вид..."
 
-#: ../widgets/table/e-table-header-item.c:1594
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "_Sort By"
 msgstr "_Сортировать по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1618
 msgid "_Custom"
 msgstr "_Другой"
 
-#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
+#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "Заголовок таблицы"
 
-#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
+#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "Модель таблицы"
 
-#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
+#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "Строка � кур�ором"
 
@@ -22573,41 +22437,40 @@ msgstr "Строка � кур�ором"
 msgid "Sort Info"
 msgstr "Информаци� по �ортировке"
 
-#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3402
-#: ../widgets/table/e-tree.c:3403
+#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
+#: ../widgets/table/e-tree.c:3407
 msgid "Always search"
 msgstr "В�егда и�кать"
 
-#: ../widgets/table/e-table.c:3352
+#: ../widgets/table/e-table.c:3360
 msgid "Use click to add"
 msgstr "И�пользовать щелчок дл� добавлени�"
 
-#: ../widgets/table/e-table.c:3366
-#, fuzzy
+#: ../widgets/table/e-table.c:3374
 msgid "Vertical Row Spacing"
-msgstr "Вертикальна� таблица дл� ри�овани�"
+msgstr "Интервал между �троками"
 
-#: ../widgets/table/e-table.c:3367
+#: ../widgets/table/e-table.c:3375
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
 msgstr "Про�тран�тво между �троками. Добавл�ет�� �верху и �низу каждой �троки"
 
-#: ../widgets/table/e-tree.c:3388 ../widgets/table/e-tree.c:3389
+#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
 msgstr "�даптер таблиц ETree"
 
-#: ../widgets/table/e-tree.c:3409
+#: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
 msgstr "Ретро-вид"
 
-#: ../widgets/table/e-tree.c:3410
+#: ../widgets/table/e-tree.c:3414
 msgid "Draw lines and +/- expanders."
 msgstr "Отображать линии и ра�ширители +/-."
 
-#: ../widgets/table/e-tree.c:3416
+#: ../widgets/table/e-tree.c:3420
 msgid "Expander Size"
 msgstr "Размер ра�ширител�"
 
-#: ../widgets/table/e-tree.c:3417
+#: ../widgets/table/e-tree.c:3421
 msgid "Size of the expander arrow"
 msgstr "Размер �трелки ра�ширител�"
 
@@ -22665,116 +22528,116 @@ msgstr "нажмите"
 msgid "sort"
 msgstr "�ортировка"
 
-#: ../widgets/text/e-text.c:2474
+#: ../widgets/text/e-text.c:2486
 msgid "Select All"
 msgstr "Выделить в�е"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2498
 msgid "Input Methods"
 msgstr "Методы ввода"
 
-#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
+#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "Проце��ор �обытий"
 
-#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
 msgid "Text"
 msgstr "Тек�т"
 
-#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
+#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "Жирный"
 
-#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
+#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "Перечёркнутый"
 
-#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
+#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "Якорь"
 
-#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
+#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "Выравнивание"
 
-#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
+#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "Ширина от�ечени�"
 
-#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
+#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "Вы�ота от�ечени�"
 
-#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
+#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "От�ечение"
 
-#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
+#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "Заполн�ть обла�ть от�ечени�"
 
-#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
+#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "Смещение по о�и X"
 
-#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
+#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "Смещение по о�и Y"
 
-#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
+#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "Ширина тек�та"
 
-#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
+#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "Вы�ота тек�та"
 
-#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "И�пользовать многоточие"
 
-#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "Многоточие"
 
-#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
+#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "Перено� �трок"
 
-#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "Символы разрыва"
 
-#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "Мак�имальное чи�ло �трок"
 
-#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "Ри�овать границы"
 
-#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "Допу�кать �имволы новой �троки"
 
-#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "Ри�овать фон"
 
-#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "Ри�овать кнопки"
 
-#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "Позици� кур�ора"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr "Контек�т метода ввода (IM)"
 
-#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "Обрабатывать в�плывающие окна"
 
diff --git a/po/sv.po b/po/sv.po
index 403d166efb..98a66b5caa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-14 09:07+0100\n"
-"PO-Revision-Date: 2010-03-14 10:16+0100\n"
+"POT-Creation-Date: 2010-03-30 08:42+0200\n"
+"PO-Revision-Date: 2010-03-30 17:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -232,7 +232,7 @@ msgstr "Jubileum"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:1986
-#: ../capplet/anjal-settings-main.c:112
+#: ../capplet/anjal-settings-main.c:119
 #: ../shell/main.c:112
 msgid "Birthday"
 msgstr "Födelsedag"
@@ -631,13 +631,13 @@ msgstr "_Välj adressbok"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
 #: ../shell/e-shell-backend.c:218
-#: ../shell/e-shell-window.c:679
+#: ../shell/e-shell-window.c:678
 msgid "Shell"
 msgstr "Skal"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
 #: ../shell/e-shell-backend.c:219
-#: ../shell/e-shell-window.c:680
+#: ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
 msgstr ""
 
@@ -874,19 +874,16 @@ msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:616
-#, fuzzy
 msgid "Cut selected contacts to the clipboard"
-msgstr "Klipp ut markerad text till urklipp"
+msgstr "Klipp ut markerad kontakter till urklipp"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:622
-#, fuzzy
 msgid "Copy selected contacts to the clipboard"
-msgstr "Kopiera markerad text till urklipp"
+msgstr "Kopiera markerade kontakter till urklipp"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:628
-#, fuzzy
 msgid "Paste contacts from the clipboard"
-msgstr "Klistra in uppgifter från urklipp"
+msgstr "Klistra in kontakter från urklipp"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
 #: ../modules/addressbook/e-book-shell-view-actions.c:727
@@ -935,13 +932,13 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Är du säker på att du vill ta bort kontakten (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1460
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
-"Att öppna %d kontakt kommer även att öppna %d nytt fönster.\n"
-"Vill du verkligen visa denna kontakt?"
+"Öppna %d kontakter kommer även att öppna %d nya fönster.\n"
+"Vill du verkligen visa alla dessa kontakter?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1465
 msgid "_Don't Display"
@@ -1107,7 +1104,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:818
+#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Titel"
 
@@ -1401,7 +1398,7 @@ msgstr "Webblogg"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:457
+#: ../capplet/settings/mail-capplet-shell.c:461
 #: ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
@@ -1829,9 +1826,8 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Är du säker på att du vill ta bort mötet med namnet \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Är du säker på att du vill ta bort mötet med namnet \"{0}\"?"
+msgstr "Är du säker på att du vill ta bort sammanträdet med namnet \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
@@ -2227,7 +2223,7 @@ msgstr "S_täng"
 #: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Redigera"
@@ -3704,7 +3700,7 @@ msgstr "Klicka här för att stänga aktuellt fönster"
 
 #: ../calendar/gui/dialogs/comp-editor.c:946
 #: ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115
 #: ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:387
@@ -3714,7 +3710,7 @@ msgstr "Kopiera markeringen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:953
 #: ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108
 #: ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:959
@@ -3722,7 +3718,7 @@ msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:129
 #: ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
@@ -3734,7 +3730,7 @@ msgstr "Klicka här för att visa tillgänglig hjälp"
 
 #: ../calendar/gui/dialogs/comp-editor.c:974
 #: ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122
 #: ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:971
@@ -3747,7 +3743,7 @@ msgstr "Klicka här för att spara aktuellt fönster"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1002
 #: ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1579
 #: ../widgets/misc/e-focus-tracker.c:136
 #: ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
@@ -3759,13 +3755,13 @@ msgstr "_Klassificering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1023
 #: ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1627
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Arkiv"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -3776,11 +3772,11 @@ msgstr "_Infoga"
 #: ../calendar/gui/dialogs/comp-editor.c:1044
 #: ../composer/e-composer-actions.c:351
 msgid "_Options"
-msgstr "_Alternativ"
+msgstr "A_lternativ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1051
 #: ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1669
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "_Visa"
 
@@ -4308,7 +4304,7 @@ msgstr "Sluttiden för upprepningen var före evenemangets starttid"
 #. * (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:962
 msgid "on"
-msgstr "vid"
+msgstr "på"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
@@ -4439,7 +4435,7 @@ msgstr "Undantag"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:3
 #: ../mail/mail-config.ui.h:84
 msgid "Preview"
-msgstr "Förhandsgranskning"
+msgstr "Förhandsvisning"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
@@ -4856,9 +4852,8 @@ msgstr "Skalinställningar"
 #: ../calendar/gui/e-cal-model.c:388
 #: ../calendar/gui/gnome-cal.c:519
 #: ../shell/e-shell.c:868
-#, fuzzy
 msgid "Application-wide settings"
-msgstr "Inställningar för automatisk ifyllning"
+msgstr "Programinställningar"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:562
@@ -4872,7 +4867,7 @@ msgstr "Inställningar för automatisk ifyllning"
 #: ../calendar/gui/print.c:972
 #: ../calendar/gui/print.c:989
 #: ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:931
+#: ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
@@ -5240,7 +5235,7 @@ msgstr "En okänd person"
 
 #: ../calendar/gui/e-itip-control.c:1132
 msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
+msgstr "<br> Granska följande information och välj sedan en åtgärd från menyn nedan."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
@@ -6226,11 +6221,11 @@ msgstr "iCalendar-information"
 
 #: ../calendar/gui/itip-utils.c:832
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "Kunde inte boka en resurs, det nya evenemanget kolliderar med något annat."
 
 #: ../calendar/gui/itip-utils.c:834
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "Kunde inte boka en resurs. Fel: "
 
 #: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
@@ -8300,7 +8295,7 @@ msgstr "Spara utkast"
 
 #. Check buttons
 #: ../composer/e-msg-composer.c:187
-#: ../mail/em-utils.c:150
+#: ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Visa _inte detta meddelande igen."
@@ -8430,24 +8425,24 @@ msgstr "_Återställ"
 msgid "_Save Draft"
 msgstr "_Spara utkast"
 
-#: ../capplet/anjal-settings-main.c:181
+#: ../capplet/anjal-settings-main.c:202
 msgid "Run Anjal in a window"
 msgstr "Kör Anjal i ett fönster"
 
-#: ../capplet/anjal-settings-main.c:182
+#: ../capplet/anjal-settings-main.c:203
 msgid "Make Anjal the default email client"
 msgstr "Gör Anjal till standardklient för e-post"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:189
+#: ../capplet/anjal-settings-main.c:210
 msgid "ID of the socket to embed in"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:190
+#: ../capplet/anjal-settings-main.c:211
 msgid "socket"
 msgstr "uttag"
 
-#: ../capplet/anjal-settings-main.c:204
+#: ../capplet/anjal-settings-main.c:225
 msgid "Anjal email client"
 msgstr "E-postklienten Anjal"
 
@@ -8464,13 +8459,12 @@ msgid "Please enter your email address."
 msgstr "Ange din e-postadress."
 
 #: ../capplet/settings/mail-account-view.c:58
-msgid "The email addres you have entered is invalid."
-msgstr ""
+msgid "The email address you have entered is invalid."
+msgstr "E-postadressen som du angav är ogiltig."
 
 #: ../capplet/settings/mail-account-view.c:224
-#, fuzzy
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span weight=\"bold\">Borttagning av e-post</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Personliga uppgifter:</span>"
 
 #: ../capplet/settings/mail-account-view.c:229
 msgid "Name:"
@@ -8481,9 +8475,8 @@ msgid "Email address:"
 msgstr "E-postadress:"
 
 #: ../capplet/settings/mail-account-view.c:248
-#, fuzzy
 msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span weight=\"bold\">Allmänt</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Mottagningsuppgifter:</span>"
 
 #: ../capplet/settings/mail-account-view.c:253
 #: ../capplet/settings/mail-account-view.c:303
@@ -8511,16 +8504,15 @@ msgid "never"
 msgstr "aldrig"
 
 #: ../capplet/settings/mail-account-view.c:298
-#, fuzzy
 msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span weight=\"bold\">Allmänt</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Sändningsuppgifter:</span>"
 
 #: ../capplet/settings/mail-account-view.c:355
 msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
 msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:357
-msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried  to make a start with the details you just entered but you may need to change them."
+msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
 msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:359
@@ -8533,7 +8525,7 @@ msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:362
 msgid "You can specify your default settings for your account."
-msgstr ""
+msgstr "Du kan ange dina standardinställningar för ditt konto."
 
 #: ../capplet/settings/mail-account-view.c:363
 msgid "Time to check things over before we try and connect to the server and fetch your mail."
@@ -8547,62 +8539,51 @@ msgid "Identity"
 msgstr "Identitet"
 
 #: ../capplet/settings/mail-account-view.c:378
-#, fuzzy
 msgid "Next - Receiving mail"
-msgstr "Mottagande av e-post"
+msgstr "Nästa- Mottagande av e-post"
 
 #: ../capplet/settings/mail-account-view.c:379
-#, fuzzy
 msgid "Receiving mail"
 msgstr "Mottagande av e-post"
 
 #: ../capplet/settings/mail-account-view.c:379
 #: ../capplet/settings/mail-account-view.c:380
-#, fuzzy
 msgid "Next - Sending mail"
-msgstr "Sändning av e-post"
+msgstr "Nästa - Sändning av e-post"
 
 #: ../capplet/settings/mail-account-view.c:379
-#, fuzzy
 msgid "Back - Identity"
-msgstr "Identitet"
+msgstr "Bakåt - Identitet"
 
 #: ../capplet/settings/mail-account-view.c:379
-#, fuzzy
 msgid "Next - Receiving options"
-msgstr "Alternativ för mottagning"
+msgstr "Nästa - Alternativ för mottagning"
 
 #: ../capplet/settings/mail-account-view.c:380
-#, fuzzy
 msgid "Receiving options"
 msgstr "Alternativ för mottagning"
 
 #: ../capplet/settings/mail-account-view.c:380
 #: ../capplet/settings/mail-account-view.c:382
-#, fuzzy
 msgid "Back - Receiving mail"
-msgstr "Mottagande av e-post"
+msgstr "Bakåt - Mottagande av e-post"
 
 #: ../capplet/settings/mail-account-view.c:382
-#, fuzzy
 msgid "Sending mail"
 msgstr "Sändning av e-post"
 
 #: ../capplet/settings/mail-account-view.c:382
 #: ../capplet/settings/mail-account-view.c:383
-#, fuzzy
 msgid "Next - Review account"
-msgstr "Ta bort kontot?"
+msgstr "Nästa - Granska kontot"
 
 #: ../capplet/settings/mail-account-view.c:382
-#, fuzzy
 msgid "Next - Defaults"
-msgstr "Standardvärden"
+msgstr "Nästa - Standardvärden"
 
 #: ../capplet/settings/mail-account-view.c:382
-#, fuzzy
 msgid "Back - Receiving options"
-msgstr "Alternativ för mottagning"
+msgstr "Bakåt - Alternativ för mottagning"
 
 #: ../capplet/settings/mail-account-view.c:383
 #: ../mail/em-account-editor.c:2774
@@ -8611,24 +8592,20 @@ msgid "Defaults"
 msgstr "Standardvärden"
 
 #: ../capplet/settings/mail-account-view.c:383
-#, fuzzy
 msgid "Back - Sending mail"
-msgstr "Sändning av e-post"
+msgstr "Bakåt - Sändning av e-post"
 
 #: ../capplet/settings/mail-account-view.c:385
-#, fuzzy
 msgid "Review account"
-msgstr "Ta bort kontot?"
+msgstr "Granska kontot"
 
 #: ../capplet/settings/mail-account-view.c:385
-#, fuzzy
 msgid "Finish"
-msgstr "Fiji"
+msgstr "Färdigställ"
 
 #: ../capplet/settings/mail-account-view.c:385
-#, fuzzy
 msgid "Back - Sending"
-msgstr "Stigande"
+msgstr "Bakåt - Sändning"
 
 #: ../capplet/settings/mail-account-view.c:719
 #: ../capplet/settings/mail-settings-view.c:266
@@ -8639,22 +8616,22 @@ msgstr "Stäng flik"
 msgid "Account Wizard"
 msgstr "Kontoguide"
 
-#: ../capplet/settings/mail-capplet-shell.c:280
+#: ../capplet/settings/mail-capplet-shell.c:284
 #, fuzzy
 msgid "Evolution account assistant"
 msgstr "Evolutions kontoguide"
 
-#: ../capplet/settings/mail-capplet-shell.c:316
+#: ../capplet/settings/mail-capplet-shell.c:320
 #: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Email Settings"
 msgstr "E-postinställningar"
 
-#: ../capplet/settings/mail-capplet-shell.c:330
+#: ../capplet/settings/mail-capplet-shell.c:334
 msgid "Quit"
 msgstr "Avsluta"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:449
+#: ../capplet/settings/mail-capplet-shell.c:453
 #: ../mail/e-mail-migrate.c:2949
 #: ../mail/e-mail-store.c:229
 #: ../mail/em-folder-tree-model.c:150
@@ -8714,7 +8691,7 @@ msgid "Evolution Mail and Calendar"
 msgstr "Evolutions e-post och kalender"
 
 #: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:653
+#: ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
@@ -8947,7 +8924,7 @@ msgstr "Meddelanden"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306
 #: ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
@@ -9332,12 +9309,12 @@ msgstr "I_nkludera trådar"
 
 #: ../filter/e-filter-rule.c:1141
 #: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "Inkommande"
 
 #: ../filter/e-filter-rule.c:1141
-#: ../mail/em-utils.c:302
+#: ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -9488,7 +9465,7 @@ msgid "List View"
 msgstr "Listvy"
 
 #: ../mail/e-mail-browser.c:732
-#: ../shell/e-shell-window.c:632
+#: ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
 msgstr ""
 
@@ -9563,11 +9540,12 @@ msgid "Edit Label"
 msgstr "Redigera etikett"
 
 #: ../mail/e-mail-label-manager.c:349
-#, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
-msgstr "Observera: Understreck i etikettnamnet används som identifierare i menyn."
+msgstr ""
+"Observera: Understreck i etikettnamnet\n"
+"används som snabbtangent i menyn."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
@@ -9841,27 +9819,24 @@ msgid "_Clear Flag"
 msgstr "_Ta bort flagga"
 
 #: ../mail/e-mail-reader.c:1215
-#, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "Skapa en ny uppgift från markerat meddelande"
+msgstr "Ta bort uppföljningsflaggan från de markerade meddelandena"
 
 #: ../mail/e-mail-reader.c:1220
 msgid "_Flag Completed"
 msgstr "_Flagga som färdig"
 
 #: ../mail/e-mail-reader.c:1222
-#, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Markera alla meddelanden i samma tråd som det markerade meddelandet"
+msgstr "Ställ in uppföljningsflaggan till färdig på alla markerade meddelanden"
 
 #: ../mail/e-mail-reader.c:1227
 msgid "Follow _Up..."
 msgstr "Följ _upp..."
 
 #: ../mail/e-mail-reader.c:1229
-#, fuzzy
 msgid "Flag the selected messages for follow-up"
-msgstr "Markera markerade meddelanden för uppföljning"
+msgstr "Flagga de markerade meddelandena för uppföljning"
 
 #: ../mail/e-mail-reader.c:1234
 msgid "_Attached"
@@ -10070,9 +10045,8 @@ msgid "Reply to _All"
 msgstr "Svara till _alla"
 
 #: ../mail/e-mail-reader.c:1425
-#, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Skriv ett svar till alla mottagare av det markerade meddelandet"
+msgstr "Skriv ett svar till alla mottagare i det markerade meddelandet"
 
 #: ../mail/e-mail-reader.c:1430
 msgid "Reply to _List"
@@ -10096,9 +10070,8 @@ msgid "_Save as mbox..."
 msgstr "_Spara som mbox..."
 
 #: ../mail/e-mail-reader.c:1446
-#, fuzzy
 msgid "Save selected messages as an mbox file"
-msgstr "Spara de markerade meddelandena som en textfil"
+msgstr "Spara markerade meddelanden som en mbox-fil"
 
 #: ../mail/e-mail-reader.c:1451
 msgid "Search Folder from Mailing _List..."
@@ -10299,7 +10272,7 @@ msgstr "Svara"
 
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
-msgstr "Flagga att följa upp"
+msgstr "Flagga för uppföljning"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
@@ -10412,11 +10385,12 @@ msgid "Account Management"
 msgstr "Kontohantering"
 
 #: ../mail/em-account-editor.c:2074
-#, fuzzy
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
-msgstr "Ange ett beskrivande namn för detta konto i fältet nedan. Detta namn kommer endast att användas för visningsändamål."
+msgstr ""
+"Ange ett beskrivande namn för detta konto i fältet nedan.\n"
+"Detta namn kommer endast att användas för visningsändamål."
 
 #: ../mail/em-account-editor.c:2078
 msgid "Done"
@@ -11114,12 +11088,12 @@ msgstr "Välj en server."
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
@@ -11259,9 +11233,8 @@ msgid "Default height of the Composer Window."
 msgstr "Standardhöjd för redigerarfönstret."
 
 #: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
 msgid "Default height of the mail browser window."
-msgstr "Standardhöjd för redigerarfönstret."
+msgstr "Standardhöjd för e-postbläddrarfönstret."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
@@ -12350,9 +12323,8 @@ msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:85
-#, fuzzy
 msgid "Printed Fonts"
-msgstr "Skriv ut markerade kontakter"
+msgstr "Utskrivna typsnitt"
 
 #: ../mail/mail-config.ui.h:86
 msgid "Proxy Settings"
@@ -12488,15 +12460,14 @@ msgid "The list of languages here reflects only the languages for which you have
 msgstr "Listan med språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
 #: ../mail/mail-config.ui.h:123
-#, fuzzy
 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 ""
-"Utdata från detta skript kommer att användas som\n"
-"din signatur. Namnet du anger kommer endast att\n"
-"användas för visning."
+"Utdata från detta skript kommer att användas\n"
+"som din signatur. Namnet du anger kommer\n"
+"endast att användas för visning."
 
 #: ../mail/mail-config.ui.h:126
 msgid ""
@@ -13133,14 +13104,12 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Är du säker på att du vill skicka ett meddelande i HTML-format?"
 
 #: ../mail/mail.error.xml.h:16
-#, fuzzy
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr "Är du säker på att du vill skicka ett meddelande med endast blindkopiemottagare?"
+msgstr "Är du säker på att du vill skicka ett meddelande med ogiltig adress?"
 
 #: ../mail/mail.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "Är du säker på att du vill skicka ett meddelande med endast blindkopiemottagare?"
+msgstr "Är du säker på att du vill skicka ett meddelande med ogiltiga adresser?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -13313,9 +13282,8 @@ msgid "If you delete the folder, all of its contents and its subfolders contents
 msgstr "Om du tar bort denna mapp kommer hela dess innehåll och innehållet i alla dess undermappar att tas bort permanent."
 
 #: ../mail/mail.error.xml.h:61
-#, fuzzy
 msgid "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "Om du tar bort denna mapp kommer hela dess innehåll och innehållet i alla dess undermappar att tas bort permanent."
+msgstr "Om du tar bort mappen så kommer allt dess innehåll att tas bort permanent."
 
 #: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -13492,12 +13460,16 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
+"Följande mottagare kunde inte identifieras som en giltig e-postadress:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
+"Följande mottagare kunde inte identifieras som giltiga e-postadresser:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
@@ -13693,7 +13665,7 @@ msgid "Select all visible messages"
 msgstr "Markera alla synliga meddelanden"
 
 #: ../mail/message-list.c:2588
-#: ../shell/e-shell-view.c:722
+#: ../shell/e-shell-view.c:723
 msgid "Shell Backend"
 msgstr ""
 
@@ -13808,7 +13780,7 @@ msgstr "Detta är den metod som Evolution kommer att använda för att autentise
 
 #: ../modules/addressbook/addressbook-config.c:885
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-msgstr "Sökomfattningen anger hur djupt du vill att sökningen ska gå ner i katalogträdet. En sökomfattning som är \"sub\" kommer att inkludera alla poster under din sökbas. En sökomfattning som är \"one\" kommer endast att inkludera de poster som är en nivå under din sökbas."
+msgstr "Sökomfattningen anger hur djupt du vill att sökningen ska gå ner i katalogträdet. En sökomfattning som är \"under\" kommer att inkludera alla poster under din sökbas. En sökomfattning som är \"en\" kommer endast att inkludera de poster som är en nivå under din sökbas."
 
 #: ../modules/addressbook/addressbook-config.c:991
 msgid "Server Information"
@@ -13876,7 +13848,7 @@ msgstr "Visa automatiskt kompletterat namn med en adress"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
-msgstr "Visa förhandsgranskningspanelen"
+msgstr "Visa förhandsvisningspanelen"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
@@ -13900,7 +13872,7 @@ msgstr "Huruvida visning ska tvingas av e-postadressen med namnet för den autom
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
-msgstr "Huruvida förhandsgranskningspanelen ska visas."
+msgstr "Huruvida förhandsvisningspanelen ska visas."
 
 #: ../modules/addressbook/autocompletion-config.c:159
 msgid "Table column:"
@@ -13983,25 +13955,22 @@ msgid "Previewed Contact"
 msgstr "Ny kontakt"
 
 #: ../modules/addressbook/e-book-shell-content.c:375
-#, fuzzy
 msgid "The contact being shown in the preview pane"
-msgstr "Huruvida förhandsgranskningspanelen ska visas."
+msgstr "Kontakten som visas i förhandsvisningspanelen"
 
 #: ../modules/addressbook/e-book-shell-content.c:384
 #: ../modules/calendar/e-memo-shell-content.c:617
 #: ../modules/calendar/e-task-shell-content.c:639
 #: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
 msgid "Preview is Visible"
-msgstr "Sidoraden är synlig"
+msgstr "Förhandsvisning är synlig"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
 #: ../modules/calendar/e-memo-shell-content.c:618
 #: ../modules/calendar/e-task-shell-content.c:640
 #: ../modules/mail/e-mail-shell-content.c:690
-#, fuzzy
 msgid "Whether the preview pane is visible"
-msgstr "Huruvida förhandsgranskningspanelen ska visas."
+msgstr "Huruvida förhandsvisningspanelen är synlig"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
@@ -14060,9 +14029,8 @@ msgid "Source Selector Widget"
 msgstr "Väljare för memokälla"
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
 msgid "This widget displays groups of address books"
-msgstr "Kunde inte hämta lista med adressböcker"
+msgstr "Denna widget visar grupper av adressböcker"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:262
 #: ../modules/addressbook/e-book-shell-view-actions.c:539
@@ -14074,9 +14042,8 @@ msgid "Co_py All Contacts To..."
 msgstr "Ko_piera alla kontakter till..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:664
-#, fuzzy
 msgid "Copy the contacts of the selected address book to another"
-msgstr "Kopiera kontakterna i den markerade mappen till en annan mapp"
+msgstr "Kopiera kontakterna i den markerade adressboken till en annan"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:669
 msgid "D_elete Address Book"
@@ -14091,9 +14058,8 @@ msgid "Mo_ve All Contacts To..."
 msgstr "Flyt_ta alla kontakter till..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:678
-#, fuzzy
 msgid "Move the contacts of the selected address book to another"
-msgstr "Flytta kontakterna i den markerade mappen till en annan mapp"
+msgstr "Flytta kontakterna i den markerade adressboken till en annan"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
@@ -14104,9 +14070,8 @@ msgid "Address _Book Properties"
 msgstr "Egenskaper för adress_boken"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:692
-#, fuzzy
 msgid "Show properties of the selected address book"
-msgstr "Ändra egenskaperna för den markerade mappen"
+msgstr "Visa egenskaper för den markerade adressboken"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:697
 #: ../modules/calendar/e-cal-shell-view-actions.c:1300
@@ -14117,18 +14082,16 @@ msgid "_Rename..."
 msgstr "_Byt namn..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:699
-#, fuzzy
 msgid "Rename the selected address book"
-msgstr "Byt namn på vald mapp"
+msgstr "Byt namn på markerad adressbok"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
 msgstr "S_para adressbok som vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:706
-#, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Spara kontakterna i den markerade mappen som VCard"
+msgstr "Spara kontakterna i den markerade adressboken som ett vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
@@ -14139,9 +14102,8 @@ msgid "_Copy Contact To..."
 msgstr "_Kopiera kontakt till..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:720
-#, fuzzy
 msgid "Copy selected contacts to another address book"
-msgstr "Kopiera markerade kontakter till en annan mapp"
+msgstr "Kopiera markerade kontakter till en annan adressbok"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
@@ -14152,9 +14114,8 @@ msgid "_Find in Contact..."
 msgstr "_Sök i kontakt..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:734
-#, fuzzy
 msgid "Search for text in the displayed contact"
-msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
+msgstr "Sök efter text i den visade kontakten"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
@@ -14169,9 +14130,8 @@ msgid "_Move Contact To..."
 msgstr "_Flytta kontakt till..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:748
-#, fuzzy
 msgid "Move selected contacts to another address book"
-msgstr "Flytta markerade kontakter till en annan mapp"
+msgstr "Flytta markerade kontakter till en annan adressbok"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
@@ -14231,7 +14191,7 @@ msgstr "Förhandsgranskning av _kontakt"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
-msgstr "Visa förhandsgranskningsfönster för kontakter"
+msgstr "Visa förhandsvisningsfönster för kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:860
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
@@ -14241,9 +14201,8 @@ msgid "_Classic View"
 msgstr "_Klassisk vy"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:862
-#, fuzzy
 msgid "Show contact preview below the contact list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsvisning av kontakter nedanför kontaktlistan"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:867
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
@@ -14253,9 +14212,8 @@ msgid "_Vertical View"
 msgstr "_Vertikal vy"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:869
-#, fuzzy
 msgid "Show contact preview alongside the contact list"
-msgstr "Visa förhandsgranskningsfönster för kontakter"
+msgstr "Visa förhandsvisning av kontakter bredvid kontaktlistan"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
 #: ../modules/calendar/e-cal-shell-view-actions.c:1595
@@ -14285,9 +14243,8 @@ msgid "Print all shown contacts"
 msgstr "Skriv ut alla visade kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:934
-#, fuzzy
 msgid "Preview the contacts to be printed"
-msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
+msgstr "Förhandsgranska kontakterna som ska skrivas ut"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
@@ -14376,9 +14333,8 @@ msgstr "Inlo_ggning:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:12
-#, fuzzy
 msgid "One"
-msgstr "Ansluten"
+msgstr "En"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
@@ -14400,7 +14356,7 @@ msgstr "Sökfilter är den typ av objekt som ska sökas efter. Om det inte ändr
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Sub"
-msgstr "Pren"
+msgstr "Under"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
@@ -14582,20 +14538,19 @@ msgstr ""
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:742
 msgid "This widget displays a miniature calendar"
-msgstr ""
+msgstr "Denna widget visar en miniatyrkalender"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:751
-#, fuzzy
 msgid "Default Calendar Client"
-msgstr "Standardklient för e-post"
+msgstr "Standardklient för kalendrar"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:752
 msgid "Default client for calendar operations"
-msgstr ""
+msgstr "Standardklient för kalenderåtgärder"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:762
 msgid "This widget displays groups of calendars"
-msgstr ""
+msgstr "Denna widget visar grupper av kalendrar"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:950
@@ -14870,9 +14825,8 @@ msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1659
-#, fuzzy
 msgid "Preview the calendar to be printed"
-msgstr "Förhandsgranskar kalendern som ska skrivas ut"
+msgstr "Förhandsgranska kalendern som ska skrivas ut"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Go To"
@@ -15034,7 +14988,7 @@ msgstr "Standardklient för memoåtgärder"
 
 #: ../modules/calendar/e-memo-shell-sidebar.c:688
 msgid "This widget displays groups of memo lists"
-msgstr ""
+msgstr "Denna widget visar grupper av memolistor"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-memo-shell-sidebar.c:868
@@ -15089,28 +15043,24 @@ msgid "Memo _Preview"
 msgstr "F_örhandsgranskning"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:698
-#, fuzzy
 msgid "Show memo preview pane"
-msgstr "Visa förhandsgranskningspanelen"
+msgstr "Visa förvisningspanel för memon"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:719
-#, fuzzy
 msgid "Show memo preview below the memo list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsvisning av memon nedanför memolistan"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
-#, fuzzy
 msgid "Show memo preview alongside the memo list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsvisning av memon bredvid memolistan"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:784
 msgid "Print the list of memos"
 msgstr "Skriv ut memolistan"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:791
-#, fuzzy
 msgid "Preview the list of memos to be printed"
-msgstr "Förhandsgranskar memolistan som ska skrivas ut"
+msgstr "Förhandsgranska memolistan som ska skrivas ut"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
@@ -15148,10 +15098,9 @@ msgid "Create a new assigned task"
 msgstr "Skapa en ny tilldelad uppgift"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#, fuzzy
 msgctxt "New"
 msgid "Tas_k List"
-msgstr "Uppgiftslista"
+msgstr "Upp_giftslista"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
 #: ../modules/calendar/e-task-shell-view-actions.c:715
@@ -15194,18 +15143,16 @@ msgid "Task List Selector"
 msgstr "Väljare för uppgiftskälla"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:677
-#, fuzzy
 msgid "Default Task Client"
-msgstr "Standardklient för e-post"
+msgstr "Standardklient för uppgifter"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:678
-#, fuzzy
 msgid "Default client for task operations"
-msgstr "Standardvärde för trådexpandering"
+msgstr "Standardklient för uppgiftsåtgärder"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:688
 msgid "This widget displays groups of task lists"
-msgstr ""
+msgstr "Denna widget visar grupper av uppgiftslistor"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-task-shell-sidebar.c:868
@@ -15285,14 +15232,12 @@ msgid "Show task preview pane"
 msgstr "Visa förhandsvisningspanel för uppgifter"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:883
-#, fuzzy
 msgid "Show task preview below the task list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsvisning av uppgifter nedanför uppgiftslistan"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:890
-#, fuzzy
 msgid "Show task preview alongside the task list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsvisning av uppgifter bredvid uppgiftslistan"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:898
 msgid "Active Tasks"
@@ -15319,9 +15264,8 @@ msgid "Print the list of tasks"
 msgstr "Skriv ut listan med uppgifter"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:990
-#, fuzzy
 msgid "Preview the list of tasks to be printed"
-msgstr "Förhandsgranskar listan med uppgifter som ska skrivas ut"
+msgstr "Förhandsgranska listan med uppgifter som ska skrivas ut"
 
 #: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
@@ -15504,9 +15448,8 @@ msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:969
-#, fuzzy
 msgid "Unsubscribe from the selected folder"
-msgstr "Byt namn på vald mapp"
+msgstr "Säg upp prenumeration på vald mapp"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:974
 msgid "Empty _Trash"
@@ -15582,9 +15525,8 @@ msgid "Search F_olders"
 msgstr "Sök_mappar"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1062
-#, fuzzy
 msgid "Create or edit search folder definitions"
-msgstr "Skapa eller redigera definitioner för virtuella mappar"
+msgstr "Skapa eller redigera definitioner för sökmappar"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_Subscriptions..."
@@ -15627,7 +15569,6 @@ msgid "_Group By Threads"
 msgstr "_Gruppera efter trådar"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1166
-#, fuzzy
 msgid "Threaded message list"
 msgstr "Trådad meddelandelista"
 
@@ -15636,9 +15577,8 @@ msgid "Show message preview below the message list"
 msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1194
-#, fuzzy
 msgid "Show message preview alongside the message list"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa förhandsgranskning av meddelanden bredvid meddelandelistan"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1202
 msgid "All Messages"
@@ -15897,14 +15837,12 @@ msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Påminner dig när du glömmer att lägga till en bilaga till ett e-postmeddelande."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid "Inline Audio"
-msgstr "Inuti"
+msgstr "Inbäddat ljud"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#, fuzzy
 msgid "Play audio attachments directly in mail messages."
-msgstr "Spela upp ljudbilagor direkt från Evolution."
+msgstr "Spela upp ljudbilagor direkt i e-postmeddelanden."
 
 #: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
@@ -15947,18 +15885,16 @@ msgid "_Backup Settings..."
 msgstr "Inst_ällningar för säkerhetskopiering..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
-#, fuzzy
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "Säkerhetskopiera och återställ data och inställningar i Evolution"
+msgstr "Säkerhetskopiera data och inställningar i Evolution till en arkivfil"
 
 #: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "Åters_täll inställningar..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
-#, fuzzy
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "Säkerhetskopiera och återställ data och inställningar i Evolution"
+msgstr "Återställ data och inställningar i Evolution från en arkivfil"
 
 #: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
@@ -16226,9 +16162,8 @@ msgstr "Okänt fel"
 
 #: ../plugins/caldav/caldav-browse-server.c:334
 #: ../plugins/caldav/caldav-browse-server.c:585
-#, fuzzy
 msgid "Failed to parse server response."
-msgstr "Misslyckades med att uppdatera delegater:"
+msgstr "Misslyckades med att tolka serverns svar."
 
 #: ../plugins/caldav/caldav-browse-server.c:428
 msgid "Events"
@@ -16458,23 +16393,20 @@ msgstr "Väderkalendrar"
 
 #: ../plugins/contacts-map/contacts-map.c:55
 #: ../plugins/contacts-map/contacts-map.c:201
-#, fuzzy
 msgid "Contacts map"
-msgstr "Kontakter: "
+msgstr "Kontaktkarta "
 
 #: ../plugins/contacts-map/contacts-map.c:56
-#, fuzzy
 msgid "Show a map of all the contacts"
-msgstr "Visa förhandsgranskning av meddelanden nedan i meddelandelistan"
+msgstr "Visa en karta över alla kontakter"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
 msgstr ""
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#, fuzzy
 msgid "Map for contacts"
-msgstr "Inga kontakter"
+msgstr "Karta för kontakter"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16501,9 +16433,8 @@ msgid "Mark as _default address book"
 msgstr "Markera som _standardadressbok"
 
 #: ../plugins/default-source/default-source.c:88
-#, fuzzy
 msgid "A_utocomplete with this address book"
-msgstr "Visa automatiskt kompletterat namn med en adress"
+msgstr "Ko_mplettera automatiskt med denna adressbok"
 
 #: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
@@ -16684,7 +16615,7 @@ msgstr ""
 
 #: ../plugins/face/face.c:366
 msgid "Load new _Face picture"
-msgstr ""
+msgstr "Läs in ny ans_iktsbild"
 
 #: ../plugins/face/face.c:415
 msgid "Include _Face"
@@ -16692,7 +16623,7 @@ msgstr "Inkludera a_nsikte"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Attach a small picture of your face to outgoing messages."
-msgstr ""
+msgstr "Bifoga en liten bild av ditt ansikte till utgående meddelanden."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
@@ -16716,7 +16647,7 @@ msgstr "Filen kan inte läsas"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr ""
+msgstr "Filen som du valde verkar inte vara en giltig .png-bild. Fel: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:82
@@ -16875,7 +16806,6 @@ msgid "Message Retract"
 msgstr "Ã…terkalla meddelande"
 
 #: ../plugins/groupwise-features/mail-retract.c:86
-#, fuzzy
 msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
 msgstr "Återkalla ett meddelande kan ta bort det från mottagarens brevlåda. Är du säker på att du vill göra det?"
 
@@ -17771,7 +17701,7 @@ msgstr "<b>%s</b> har avbrutit följande delat memo:"
 
 #: ../plugins/itip-formatter/itip-view.c:676
 msgid "All day:"
-msgstr ""
+msgstr "Hela dagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:686
 msgid "Start day:"
@@ -18243,7 +18173,6 @@ msgid "_Unsubscribe from List"
 msgstr "Av_sluta prenumerationen på listan"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:320
-#, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Säg upp prenumerationen på sändlistan som detta meddelande tillhör"
 
@@ -18809,19 +18738,16 @@ msgid "Select destination file"
 msgstr "Välj målfil"
 
 #: ../plugins/save-calendar/save-calendar.c:325
-#, fuzzy
 msgid "Save the selected calendar to disk"
-msgstr "Spara de markerade meddelandena som en textfil"
+msgstr "Spara den markerade kalendern till disk"
 
 #: ../plugins/save-calendar/save-calendar.c:356
-#, fuzzy
 msgid "Save the selected memo list to disk"
-msgstr "Spara de markerade meddelandena som en textfil"
+msgstr "Spara den markerade memolistan till disk"
 
 #: ../plugins/save-calendar/save-calendar.c:387
-#, fuzzy
 msgid "Save the selected task list to disk"
-msgstr "Spara en kalender eller uppgiftslista till disk."
+msgstr "Spara den markerade uppgiftslistan till disk"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -18841,11 +18767,11 @@ msgstr "Välkommen"
 
 #: ../plugins/startup-wizard/startup-wizard.c:118
 msgid ""
-"ZZZ ! Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"ZZZ ! Välkommen till Evolution. De följande skärmarna kommer att låta Evolution ansluta till dina e-postkonton samt importera filer från andra program. \n"
+"Välkommen till Evolution. De följande skärmarna kommer att låta Evolution ansluta till dina e-postkonton samt importera filer från andra program. \n"
 "\n"
 "Klicka på knappen \"Framåt\" för att fortsätta. "
 
@@ -18986,14 +18912,12 @@ msgid "Default sidebar width"
 msgstr "Standardbredd på sidopanel"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-#, fuzzy
 msgid "Default window X coordinate"
-msgstr "Standardfönstertillstånd"
+msgstr "Fönstrets X-koordinat som standard"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-#, fuzzy
 msgid "Default window Y coordinate"
-msgstr "Standardfönstertillstånd"
+msgstr "Fönstrets Y-koordinat som standard"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
@@ -19017,7 +18941,7 @@ msgstr "Aktiverar proxyinställningarna vid åtkomst via HTTP/HTTPS över Intern
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
-msgstr ""
+msgstr "Flagga som aktiverar ett mycket enklare användargränssnitt."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
@@ -19108,7 +19032,7 @@ msgid "Skip development warning dialog"
 msgstr "Hoppa över varningsdialogen för utveckling"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:323
+#: ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
@@ -19121,14 +19045,12 @@ msgid "The configuration version of Evolution, with major/minor/configuration le
 msgstr "Evolutions konfigurationsversion, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-#, fuzzy
 msgid "The default X coordinate for the main window."
-msgstr "Standardbredd för huvudfönstret, i bildpunkter."
+msgstr "X-koordinat som standard för huvudfönstret."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-#, fuzzy
 msgid "The default Y coordinate for the main window."
-msgstr "Standardbredd för huvudfönstret, i bildpunkter."
+msgstr "Y-koordinat som standard för huvudfönstret."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
@@ -19274,7 +19196,7 @@ msgid "The switcher's toolbar style"
 msgstr ""
 
 #: ../shell/e-shell-switcher.c:465
-#: ../shell/e-shell-window.c:741
+#: ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
 msgstr "Verktygsraden är synlig"
 
@@ -19294,82 +19216,81 @@ msgstr "iCalendar-filer (.ics)"
 msgid "All Files (*)"
 msgstr "Alla filer (*)"
 
-#: ../shell/e-shell-view.c:674
+#: ../shell/e-shell-view.c:675
 msgid "Switcher Action"
 msgstr "Växlaråtgärd"
 
-#: ../shell/e-shell-view.c:675
+#: ../shell/e-shell-view.c:676
 msgid "The switcher action for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:690
+#: ../shell/e-shell-view.c:691
 msgid "Page Number"
 msgstr "Sidnummer"
 
-#: ../shell/e-shell-view.c:691
+#: ../shell/e-shell-view.c:692
 msgid "The notebook page number of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:707
+#: ../shell/e-shell-view.c:708
 msgid "Search Rule"
 msgstr "Sökregel"
 
-#: ../shell/e-shell-view.c:708
-#, fuzzy
+#: ../shell/e-shell-view.c:709
 msgid "Criteria for the current search results"
-msgstr "Töm sökfältet"
+msgstr "Kriterium för det aktuella sökresultatet"
 
-#: ../shell/e-shell-view.c:723
+#: ../shell/e-shell-view.c:724
 msgid "The EShellBackend for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:738
+#: ../shell/e-shell-view.c:739
 msgid "Shell Content Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:739
+#: ../shell/e-shell-view.c:740
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:755
+#: ../shell/e-shell-view.c:756
 #, fuzzy
 msgid "Shell Sidebar Widget"
 msgstr "Standardbredd på sidopanel"
 
-#: ../shell/e-shell-view.c:756
+#: ../shell/e-shell-view.c:757
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:771
+#: ../shell/e-shell-view.c:772
 msgid "Shell Taskbar Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:772
+#: ../shell/e-shell-view.c:773
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 
-#: ../shell/e-shell-view.c:787
+#: ../shell/e-shell-view.c:788
 msgid "Shell Window"
 msgstr "Skalfönster"
 
-#: ../shell/e-shell-view.c:788
+#: ../shell/e-shell-view.c:789
 msgid "The window to which the shell view belongs"
 msgstr ""
 
-#: ../shell/e-shell-view.c:804
+#: ../shell/e-shell-view.c:805
 msgid "The key file holding widget state data"
 msgstr ""
 
-#: ../shell/e-shell-view.c:819
+#: ../shell/e-shell-view.c:820
 msgid "The title of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:833
+#: ../shell/e-shell-view.c:834
 #, fuzzy
 msgid "Current View ID"
 msgstr "_Aktuell vy"
 
-#: ../shell/e-shell-view.c:834
+#: ../shell/e-shell-view.c:835
 #, fuzzy
 msgid "The current GAL view ID"
 msgstr "aktuell tid"
@@ -19377,7 +19298,7 @@ msgstr "aktuell tid"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -19390,302 +19311,299 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolutions webbplats"
 
-#: ../shell/e-shell-window-actions.c:1223
+#: ../shell/e-shell-window-actions.c:1224
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy är inte installerat."
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunde inte köras."
 
-#: ../shell/e-shell-window-actions.c:1342
+#: ../shell/e-shell-window-actions.c:1343
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME-pilot är inte installerat."
 
-#: ../shell/e-shell-window-actions.c:1344
+#: ../shell/e-shell-window-actions.c:1345
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME-pilot kunde inte köras."
 
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Close Window"
 msgstr "S_täng fönster"
 
-#: ../shell/e-shell-window-actions.c:1450
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Open the Evolution User Guide"
 msgstr "Öppna användarguiden för Evolution"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Evolution _FAQ"
 msgstr "Vanliga fr_Ã¥gor om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Öppna webbsidan för frågor och svar"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "Glöm lös_enord"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "Glöm alla ihågkomna lösenord"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "I_mportera..."
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr "Importera data från andra program"
 
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "Nytt _fönster"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
 msgstr "Skapa ett nytt fönster som visar denna vy"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Configure Evolution"
 msgstr "Konfigurera Evolution"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1521
 msgid "_Quick Reference"
 msgstr "_Snabbreferens"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Show Evolution's shortcut keys"
 msgstr "Visa snabbtangenter i Evolution"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Exit the program"
 msgstr "Avsluta programmet"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1535
 msgid "_Advanced Search..."
 msgstr "_Avancerad sökning..."
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Construct a more advanced search"
 msgstr "Skapa en mer avancerad sökning"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Clear the current search parameters"
 msgstr "Töm de aktuella sökparametrarna"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Edit Saved Searches..."
 msgstr "_Redigera sparade sökningar..."
 
-#: ../shell/e-shell-window-actions.c:1550
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Manage your saved searches"
 msgstr "Hantera dina sparade sökningar"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Click here to change the search type"
 msgstr "Klicka här för att ändra söktypen"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Find Now"
 msgstr "_Sök nu"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Execute the current search parameters"
 msgstr "Kör de aktuella sökparametrarna"
 
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Save Search..."
 msgstr "S_para sökning..."
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Save the current search parameters"
 msgstr "Spara de aktuella sökparametrarna"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Send / _Receive"
 msgstr "Ski_cka / Ta emot"
 
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagda objekt och hämta nya objekt"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
 msgstr "Skicka in f_elrapport..."
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ../shell/e-shell-window-actions.c:1597
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1598
 msgid "GNOME Pilot _Synchronization..."
-msgstr "iPod-synkronisering"
+msgstr "GNOME Pilot-s_ynkronisering..."
 
-#: ../shell/e-shell-window-actions.c:1599
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Set up GNOME Pilot configuration"
-msgstr "Konfigurera Pilotkonfiguration"
+msgstr "Konfigurera GNOME Pilot-konfiguration"
 
-#: ../shell/e-shell-window-actions.c:1604
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-actions.c:1606
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into offline mode"
 msgstr "Försätt Evolution i frånkopplat läge"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-actions.c:1613
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into online mode"
 msgstr "Försätt Evolution i anslutet läge"
 
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1642
 msgid "Lay_out"
 msgstr "La_yout"
 
-#: ../shell/e-shell-window-actions.c:1648
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_New"
 msgstr "_Nytt"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Search"
 msgstr "_Sök"
 
 # Osäker.
-#: ../shell/e-shell-window-actions.c:1662
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Switcher Appearance"
 msgstr "_Utseende för växlaren"
 
-#: ../shell/e-shell-window-actions.c:1676
+#: ../shell/e-shell-window-actions.c:1677
 msgid "_Window"
 msgstr "_Fönster"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show Side _Bar"
 msgstr "Visa sido_rad"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show the side bar"
 msgstr "Visa sidoraden"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Buttons"
 msgstr "Visa _knappar"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show the switcher buttons"
 msgstr "Visa växlarknapparna"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show _Status Bar"
 msgstr "Visa _statusrad"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Show the status bar"
 msgstr "Visa statusraden"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Show _Tool Bar"
 msgstr "Visa _verktygsrad"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Show the tool bar"
 msgstr "Visa verktygsraden"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Icons Only"
 msgstr "Endast _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons only"
 msgstr "Visa fönsterknappar med endast ikoner"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Text Only"
 msgstr "Endast _text"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with text only"
 msgstr "Visa fönsterknappar med endast text"
 
-#: ../shell/e-shell-window-actions.c:1767
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Icons _and Text"
 msgstr "Ikoner _och text"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with icons and text"
 msgstr "Visa fönsterknappar med ikoner och text"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Tool_bar Style"
 msgstr "Stil på verktygs_rad"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Visa fönsterknappar med skrivbordets verktygsradsinställning"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Define Views..."
 msgstr "Definiera vyer..."
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Create or edit views"
 msgstr "Skapa eller redigera vyer"
 
-#: ../shell/e-shell-window-actions.c:1791
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Save Custom View..."
 msgstr "Spara anpassad vy..."
 
-#: ../shell/e-shell-window-actions.c:1793
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Save current custom view"
 msgstr "Spara aktuell anpassad vy"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1801
 msgid "C_urrent View"
 msgstr "Aktu_ell vy"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1811
 msgid "Custom View"
 msgstr "Anpassad vy"
 
-#: ../shell/e-shell-window-actions.c:1812
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Current view is a customized view"
 msgstr "Aktuell vy är en anpassad vy"
 
-#: ../shell/e-shell-window-actions.c:1822
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1823
 msgid "Change the page settings for your current printer"
-msgstr "Ställ in sidinställningarna för din aktuella skrivare"
+msgstr "Ändra sidinställningarna för din aktuella skrivare"
 
-#: ../shell/e-shell-window-actions.c:2199
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
 
-#: ../shell/e-shell-window-actions.c:2412
+#: ../shell/e-shell-window-actions.c:2413
 msgid "Execute these search parameters"
-msgstr ""
+msgstr "Kör dessa sökparametrar"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:566
+#: ../shell/e-shell-window-private.c:567
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19694,79 +19612,70 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Nytt"
 
-#: ../shell/e-shell-window.c:617
+#: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
 msgstr ""
 
-#: ../shell/e-shell-window.c:618
+#: ../shell/e-shell-window.c:617
 #, fuzzy
 msgid "Name of the active shell view"
 msgstr "Namn på ny vy:"
 
-#: ../shell/e-shell-window.c:633
+#: ../shell/e-shell-window.c:632
 msgid "The shell window's EFocusTracker"
 msgstr ""
 
-#: ../shell/e-shell-window.c:647
+#: ../shell/e-shell-window.c:646
 #: ../shell/e-shell.c:803
 msgid "Geometry"
 msgstr "Geometri"
 
-#: ../shell/e-shell-window.c:648
+#: ../shell/e-shell-window.c:647
 #: ../shell/e-shell.c:804
 msgid "Initial window geometry string"
 msgstr ""
 
-#: ../shell/e-shell-window.c:663
+#: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
 msgstr "Säkert läge"
 
-#: ../shell/e-shell-window.c:664
-#, fuzzy
+#: ../shell/e-shell-window.c:663
 msgid "Whether the shell window is in safe mode"
-msgstr "Huruvida insticksmodulen är aktiverad"
+msgstr "Huruvida skalfönstret är i säkert läge"
 
-#: ../shell/e-shell-window.c:695
-#, fuzzy
+#: ../shell/e-shell-window.c:694
 msgid "Sidebar Visible"
 msgstr "Sidoraden är synlig"
 
-#: ../shell/e-shell-window.c:696
-#, fuzzy
+#: ../shell/e-shell-window.c:695
 msgid "Whether the shell window's side bar is visible"
-msgstr "Huruvida sidoraden ska vara synlig."
+msgstr "Huruvida skalfönstrets sidopanel är synlig"
 
-#: ../shell/e-shell-window.c:710
-#, fuzzy
+#: ../shell/e-shell-window.c:709
 msgid "Switcher Visible"
-msgstr "Sidoraden är synlig"
+msgstr "Växlare är synlig"
 
-#: ../shell/e-shell-window.c:711
-#, fuzzy
+#: ../shell/e-shell-window.c:710
 msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Huruvida fönsterknapparna ska vara synliga."
+msgstr "Huruvida skalfönstrets växlingsknappar är synliga"
 
-#: ../shell/e-shell-window.c:726
-#, fuzzy
+#: ../shell/e-shell-window.c:725
 msgid "Taskbar Visible"
-msgstr "Verktygsraden är synlig"
+msgstr "Åtgärdsraden är synlig"
 
-#: ../shell/e-shell-window.c:727
-#, fuzzy
+#: ../shell/e-shell-window.c:726
 msgid "Whether the shell window's task bar is visible"
-msgstr "Huruvida sidoraden ska vara synlig."
+msgstr "Huruvida skalfönstrets åtgärdsrad är synlig"
 
-#: ../shell/e-shell-window.c:742
-#, fuzzy
+#: ../shell/e-shell-window.c:741
 msgid "Whether the shell window's tool bar is visible"
-msgstr "Huruvida sidoraden ska vara synlig."
+msgstr "Huruvida skalfönstrets verktygsrad är synlig"
 
-#: ../shell/e-shell-window.c:756
-#, fuzzy
+#: ../shell/e-shell-window.c:755
 msgid "UI Manager"
-msgstr "Manager"
+msgstr "Gränssnittshanterare"
 
-#: ../shell/e-shell-window.c:757
+#: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
 msgstr ""
 
@@ -19788,7 +19697,7 @@ msgstr "Modulkatalog"
 
 #: ../shell/e-shell.c:820
 msgid "The directory from which to load EModules"
-msgstr ""
+msgstr "Katalogen från vilken EModules ska läsas in"
 
 #: ../shell/e-shell.c:835
 msgid "Network Available"
@@ -19804,9 +19713,8 @@ msgid "Online"
 msgstr "Ansluten"
 
 #: ../shell/e-shell.c:852
-#, fuzzy
 msgid "Whether the shell is online"
-msgstr "Huruvida insticksmodulen är aktiverad"
+msgstr "Huruvida skalet är anslutet"
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:168
@@ -19858,58 +19766,55 @@ msgstr ""
 msgid "Do not tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Starta Evolution och aktivera den angivna komponenten"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
-msgstr ""
+msgstr "Tillämpa angiven geometri på huvudfönstret"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: ../shell/main.c:327
-#, fuzzy
+#: ../shell/main.c:330
 msgid "Start in \"express\" mode"
-msgstr "Starta i anslutet läge"
+msgstr "Starta i \"express\"-läge"
 
-#: ../shell/main.c:330
-#, fuzzy
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
-msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
+msgstr "Tvinga avstängning av Evolution"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:337
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga fram ommigrering från Evolution 1.4"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: ../shell/main.c:339
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "Inaktivera inläsning av alla insticksmoduler."
 
-#: ../shell/main.c:341
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Inaktivera förhandsvisningspanelen för e-post, kontakter och uppgifter."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:347
-#, fuzzy
+#: ../shell/main.c:350
 msgid "Request a running Evolution process to quit"
-msgstr "Startar om Evolution"
+msgstr "Begär en körande Evolution-process att avsluta"
 
-#: ../shell/main.c:511
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Den personliga informationshanteraren och e-postklienten Evolution"
 
-#: ../shell/main.c:537
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19967,9 +19872,8 @@ msgstr ""
 "Om du väljer att ta bort detta data så kommer hela innehållet i &quot;evolution&quot;-katalogen att tas bort permanent. Om du väljer att behålla detta data så kan du manuellt ta bort innehållet i &quot;evolution&quot; när det passar dig.\n"
 
 #: ../shell/shell.error.xml.h:18
-#, fuzzy
 msgid "Upgrade from previous version failed:"
-msgstr "Uppgradering från tidigare version misslyckades: {0}"
+msgstr "Uppgradering från tidigare version misslyckades:"
 
 #: ../shell/shell.error.xml.h:19
 msgid ""
@@ -20025,7 +19929,7 @@ msgstr "Skapa en ny testkälla"
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Filen är inte en giltig .desktop-fil"
 
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
@@ -20040,12 +19944,12 @@ msgstr "Startar %s"
 #: ../smclient/eggdesktopfile.c:1100
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "Programmet accepterar inte dokument på kommandoraden"
 
 #: ../smclient/eggdesktopfile.c:1168
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "Okänd startflagga: %d"
 
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
@@ -20053,9 +19957,9 @@ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
 #: ../smclient/eggdesktopfile.c:1394
-#, fuzzy, c-format
+#, c-format
 msgid "Not a launchable item"
-msgstr "Inte möjligt att köra redigeraren"
+msgstr "Inte ett körbart objekt"
 
 #: ../smclient/eggsmclient.c:227
 msgid "Disable connection to session manager"
@@ -20071,7 +19975,7 @@ msgstr "FIL"
 
 #: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Ange ID för sessionshantering"
 
 #: ../smclient/eggsmclient.c:233
 msgid "ID"
@@ -20804,7 +20708,7 @@ msgstr "Dölj _bilageraden"
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show _Attachment Bar"
 msgstr "Visa _bilageraden"
 
@@ -21079,16 +20983,11 @@ msgstr "Importera en _enda fil"
 
 #: ../widgets/misc/e-import-assistant.c:439
 msgid "Select what type of file you want to import from the list."
-msgstr ""
+msgstr "Välj vilken typ av fil från listan som du vill importera."
 
 #: ../widgets/misc/e-import-assistant.c:516
-#, fuzzy
 msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolution letade efter inställningar att importera från\n"
-"följande program: Pine, Netscape, Elm, iCalendar. Inga\n"
-"inställningar som kunde importeras hittades. Om du vill\n"
-"försöka igen bör du klicka på knappen \"Bakåt\".\n"
+msgstr "Evolution letade efter inställningar att importera från följande program: Pine, Netscape, Elm, iCalendar. Inga inställningar hittades som kunde importeras. Om du vill försöka igen bör du klicka på knappen \"Bakåt\"."
 
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
@@ -21159,7 +21058,7 @@ msgstr "Horisontell position"
 
 #: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
-msgstr ""
+msgstr "Panelens position när horisontellt justerad"
 
 #: ../widgets/misc/e-paned.c:318
 msgid "Vertical Position"
@@ -21167,7 +21066,7 @@ msgstr "Vertikal position"
 
 #: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
-msgstr ""
+msgstr "Panelens position när vertikalt justerad"
 
 #: ../widgets/misc/e-paned.c:330
 #, fuzzy
@@ -21414,15 +21313,14 @@ msgid "Add _Script"
 msgstr "Lägg till _skript"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
-#, fuzzy
 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 ""
-"Utdata från detta skript kommer att användas som\n"
-"din signatur. Namnet du anger kommer endast att\n"
-"användas för visning."
+"Utdata från detta skript kommer att användas\n"
+"som din signatur. Namnet du anger kommer\n"
+"endast att användas för visning."
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
 msgid "S_cript:"
@@ -21875,7 +21773,7 @@ msgstr "Vertikal panelposition"
 
 #: ../widgets/table/e-table.c:3375
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
+msgstr "Vertikalt utrymme mellan rader. Det läggs till överst och nederst för en rad"
 
 #: ../widgets/table/e-tree.c:3392
 #: ../widgets/table/e-tree.c:3393
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 33d0d7ee28..1a7e749259 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,15 +8,15 @@
 # Tao Wei <weitao1979@gmail.com>, 2009.
 # Andrew Zheng <andrew0zheng@gmail.com>, 2009.
 #
-#: ../shell/main.c:512
+#: ../shell/main.c:479
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-02-05 14:47+0000\n"
-"PO-Revision-Date: 2010-02-03 01:45+0800\n"
-"Last-Translator: Andrew Zheng <andrew0zheng@gmail.com>\n"
+"POT-Creation-Date: 2010-04-17 11:48+0000\n"
+"PO-Revision-Date: 2010-04-18 00:27+0800\n"
+"Last-Translator: Funda Wang <fundawang0zheng@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroup.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,7 +71,6 @@ msgid "Could not remove address book."
 msgstr "无法删除地�簿。"
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -222,7 +221,7 @@ msgid "_Use as it is"
 msgstr "原样使用(_U)"
 
 #. 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:42 ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
 msgid "{0}"
 msgstr "{0}"
 
@@ -258,7 +257,8 @@ msgstr "纪念日"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:112
 msgid "Birthday"
 msgstr "生日"
 
@@ -274,7 +274,7 @@ msgstr "日历："
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "�系人"
@@ -282,7 +282,7 @@ msgstr "�系人"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
 msgid "Contact Editor"
 msgstr "�系人编辑器"
 
@@ -380,7 +380,7 @@ msgstr "网络日志："
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:954
+#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "工作"
 
@@ -403,7 +403,7 @@ msgstr "生日(_B)："
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 #: ../calendar/gui/dialogs/event-page.c:823
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
@@ -490,7 +490,7 @@ msgstr "邮政编�(_Z)："
 #: ../plugins/caldav/caldav-browse-server.c:1159
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
+#: ../widgets/menus/gal-define-views-dialog.c:320
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
@@ -498,7 +498,7 @@ msgstr "姓�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
 #: ../addressbook/gui/widgets/e-addressbook-model.c:522
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -506,8 +506,8 @@ msgstr "姓�"
 #: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
-#: ../widgets/text/e-text.c:3430
+#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
+#: ../widgets/text/e-text.c:3442
 msgid "Editable"
 msgstr "�编辑"
 
@@ -552,7 +552,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
 msgid "Error adding contact"
 msgstr "添加�系人出错"
 
@@ -589,20 +589,20 @@ msgid "Changed"
 msgstr "已更改"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "Please select an image for this contact"
 msgstr "请选择此�系人的图�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
 msgid "_No image"
 msgstr "无图�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -610,23 +610,23 @@ msgstr ""
 "�系人数�无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s�的格�无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s�的格�无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s�为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
 msgid "Invalid contact."
 msgstr "无效的�系人。"
 
@@ -651,12 +651,12 @@ msgid "_Select Address Book"
 msgstr "选择地�簿(_S)"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:681
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
 msgid "Shell"
 msgstr "外壳"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:682
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
 msgstr "EShell 的一个"
 
@@ -726,7 +726,7 @@ msgid "_Suffix:"
 msgstr "�缀(_S)："
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "�系人列表编辑器"
 
@@ -751,28 +751,28 @@ msgstr "选择(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电�邮件地�或者把�系人拖放到下�的列表(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "�系人列表�员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "�员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 #: ../addressbook/gui/widgets/e-addressbook-model.c:512
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -780,7 +780,7 @@ msgstr "删除列表出错"
 msgid "Book"
 msgstr "地�簿"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "为新列表"
 
@@ -831,20 +831,20 @@ msgstr "�并�系人"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Any field contains"
 msgstr "任何域�有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "姓��有"
 
@@ -875,14 +875,14 @@ msgstr "�索中断了"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
 #: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
-#: ../modules/calendar/e-memo-shell-content.c:603
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3349
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
-#: ../widgets/text/e-text.c:3297
+#: ../widgets/table/e-table.c:3367
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
+#: ../widgets/text/e-text.c:3309
 msgid "Model"
 msgstr "模型"
 
@@ -903,7 +903,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "从剪贴�中粘贴�系人"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "Delete selected contacts"
 msgstr "删除选中的�系人"
 
@@ -912,7 +912,7 @@ msgid "Select all visible contacts"
 msgstr "选中全部���系人"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
 msgid "Shell View"
 msgstr "外壳视图"
 
@@ -1119,7 +1119,7 @@ msgid "Telex"
 msgstr "电传"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:748
+#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "头衔"
 
@@ -1140,8 +1140,8 @@ msgstr "网站"
 #: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
-#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
+#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Width"
 msgstr "宽度"
 
@@ -1153,8 +1153,8 @@ msgstr "宽度"
 #: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
-#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
+#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
+#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
 msgid "Height"
 msgstr "高度"
 
@@ -1290,15 +1290,15 @@ msgstr[0] "当�地�簿文件夹 %s 有 %d 张�片"
 msgid "Open"
 msgstr "打开"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "�系人列表："
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "�系人："
 
-#: ../addressbook/gui/widgets/ea-minicard.c:168
+#: ../addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "evolution 袖��"
 
@@ -1395,13 +1395,14 @@ msgstr "主页"
 msgid "Web Log"
 msgstr "Web 日志"
 
+#. Create the default Person addressbook
 #. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:955
+#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1486,9 +1487,9 @@ msgstr "�支�的�议"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "已�消"
 
@@ -1613,31 +1614,31 @@ msgstr "此查询未�功完�。"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:244
+#: ../addressbook/gui/widgets/eab-gui-util.c:247
 msgid "Select Address Book"
 msgstr "选择地�簿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:310
 msgid "list"
 msgstr "列表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contact to"
 msgstr "将�系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:434
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contact to"
 msgstr "将�系人�制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:442
 msgid "Move contacts to"
 msgstr "将�系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Copy contacts to"
 msgstr "将�系人�制到"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "�片视图"
 
@@ -2160,7 +2161,7 @@ msgid "_Save Changes"
 msgstr "�存更改(_S)"
 
 #: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "��(_S)"
@@ -2221,9 +2222,6 @@ msgid_plural "minutes"
 msgstr[0] "分钟"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#, fuzzy
-#| msgid "hours"
-#| msgid_plural "hours"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�时"
@@ -2243,10 +2241,10 @@ msgstr "全部错过(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1035
 msgid "Location:"
 msgstr "�置："
 
@@ -2259,11 +2257,11 @@ msgid "_Dismiss"
 msgstr "错过(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1025
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
+#: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
@@ -2274,12 +2272,9 @@ msgstr "��(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#, fuzzy
-#| msgid "hours"
-#| msgid_plural "hours"
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
 msgstr "�时"
 
@@ -2289,38 +2284,38 @@ msgstr "约会�置"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:421
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
 msgstr "分钟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
 msgid "No summary available."
 msgstr "没有�用的摘�。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
 msgid "No description available."
 msgstr "没有�述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
 msgid "No location information available."
 msgstr "没有�用的�置信�。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个�醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2332,7 +2327,7 @@ msgstr ""
 "��电�邮件。Evolution 将以\n"
 "显示普通�示会�框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2348,7 +2343,7 @@ msgstr ""
 "\n"
 "您确信您��行该程��？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 msgid "Do not ask me about this program again."
 msgstr "���次询问此问题。"
 
@@ -2408,332 +2403,328 @@ msgid "Calendars to run alarms for"
 msgstr "�行�醒的日历"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "选中这个�在 Evolution 中使用系统时区。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在时间�中绘制 Marcus Bains 线的颜色(默认为空)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "在月视图中压缩周末"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "确认销�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "一个新事件的默认�现次数。-1 代表永远�现。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "标为工作日的日�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "默认约会�醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "默认��计数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "默认�醒��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "默认�醒值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "�存�醒音频文件的目录"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "事件��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "事件�明度"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "忙/闲�务器 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "忙/闲模� URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "日历视图中事件的��。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "��已完�的任务"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "��任务��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "��任务值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "水平���置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日结�的�时，以 24 �时格�表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日开始的�时，以 24 �时格�表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "如果 “true�，在主窗�中显示备忘预览��。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "如果 “true�，在主窗�中显示任务预览��。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "日视图和工作日视图中显示的间隔，以分钟计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "上次�醒时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的消�会被记录。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 #, fuzzy
 msgid "List of recently used second time zones in a Day View."
 msgstr "列出在日视图中最近使用过的第二时区。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 #, fuzzy
 msgid "List of server URLs for free/busy publishing."
 msgstr "列出�表忙/闲的�务器 URL。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 线"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 线颜色 - 日视图"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 线颜色 - 日期�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 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:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "最近使用过的时区最大记忆数目"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "备忘外观风格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "备忘预览��的水平�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "备忘预览��的垂直�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日结�的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日开始的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "月视图水平��的�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "月视图中垂直��的�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "确定默认�醒的��数�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "决定何时��任务的数字��。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "�月视图中日期导航器日历和任务列表之间水平��的�置，以�素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历之间水平��的�置，以�素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "当垂直定�时，备忘预览��的�置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "当水平定�时，任务预览��的�置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "当垂直定�时，任务预览��的�置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "日历列表和日期导航器日历之间垂直��的�置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历�任务列表之间垂直��的�置，以�素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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."
 msgstr "�月视图中视图和日期导航器日历�任务列表之间垂直��的�置，以�素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "首选日历"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "首选备忘列表"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "首选任务列表"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "�许�醒�行的程�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "日视图中最近是用过的第二时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "�存�醒音频的目录"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "通过一个周�滚动月视图"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示请回�域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "在周视图和月视图中显示约会结�时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/会议/任务编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "在通知托盘中显示�醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示状�域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "显示“备忘预览���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "显示“任务预览���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr "在日和工作日视图中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "在日期导航器中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "任务外观风格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "任务预览��的水平�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "任务预览��的垂直�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "今天到期的任务颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2742,7 +2733,7 @@ msgstr ""
 "用作忙/闲数��布的 URL 模�，%u 将替�为电�邮件的用户部分，而 %d 将替�为域"
 "�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2750,206 +2741,206 @@ msgstr ""
 "日历中日期和时间所使用的默认时区，以未翻译的时区数�库�置表示，如“Asia/"
 "Shanghai�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "日视图的第二时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "此选项有三��能值：0�错误，1�警告，2�调试信�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "�醒上次�行的时间，以 time_t 格�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "日历视图中事件的�明度，应该介于 0(�明)和 1(��明)之间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "二�四�时时间格�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "默认�醒的��，�为“minutes�，“hours�或“days�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "决定是���任务的��，�为“minutes�，“hours�或“days�。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "使用系统时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "垂直��的�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "一周开始"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "一周开始的日�，从星期日(0)到星期六(6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是�使用通知托盘�显示�醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "删除约会或任务时是��求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "销�约会和任务时是��求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "在月视图中是�压缩周末；压缩时将把周六和周日用一个�元格显示。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是�在周视图和月视图中显示事件的结�时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是�在日历中绘制 Marcus Bains 线(当�时间线)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是�在任务视图中��已完�的任务。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "是�为约会设置默认�醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是�在事件/任务/会议编辑器中显示请回�域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是�在事件/会议编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是�在事件/任务/会议中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是�在事件/任务/会议编辑器中显示状�域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是以 24 �时格�还是以 12 �时格�显示时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是�在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是�在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "是�在日视图和工作日视图中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是�在日期导航器中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "工作日结��时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "工作日结�分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "工作日开始�时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "工作日开始分钟"
 
-#: ../calendar/gui/cal-editor-utils.c:102
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "无效的对象"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "日视图"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "工作日视图"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "周视图"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "月视图"
 
@@ -2979,7 +2970,7 @@ msgid "Classification"
 msgstr "分类"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3013,7 +3004,7 @@ msgstr "存在"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "�置"
 
@@ -3023,14 +3014,14 @@ msgid "Organizer"
 msgstr "组织者"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
+#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "�密"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
+#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "公开"
 
@@ -3045,7 +3036,7 @@ msgstr "�现"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:354
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "概�"
 
@@ -3165,9 +3156,9 @@ msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
@@ -3211,34 +3202,32 @@ msgstr "�醒"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
 #: ../calendar/gui/e-day-view-time-item.c:797
-#, fuzzy
-#| msgid "None"
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ— "
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-timezone-entry.c:343
 msgid "Select..."
 msgstr "选择..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于�醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
 msgid "Time and date:"
 msgstr "时间和日期："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
 msgid "Date only:"
 msgstr "�有日期："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "<i>%u 和 %d 将被替�为电�邮件地�中的用户和域�。</i>"
+msgstr "%u 和 %d 将被替�为电�邮件地�中的用户和域�。"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
@@ -3295,7 +3284,7 @@ msgid "Display alarms in _notification area only"
 msgstr "�在通知区域显示�醒(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "星期五"
@@ -3306,7 +3295,7 @@ msgstr "星期五"
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3321,7 +3310,7 @@ msgid "Minutes"
 msgstr "分钟"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "星期一"
@@ -3344,7 +3333,7 @@ msgid "S_un"
 msgstr "周日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "星期六"
@@ -3378,7 +3367,7 @@ msgid "Show week n_umber in Day and Work Week View"
 msgstr "在日视图和工作日视图中显示周数(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "星期日"
@@ -3401,7 +3390,7 @@ msgid "Template:"
 msgstr "模�："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "星期四"
@@ -3422,7 +3411,7 @@ msgid "Time format:"
 msgstr "时间格�："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "星期二"
@@ -3432,7 +3421,7 @@ msgid "Use s_ystem time zone"
 msgstr "显示系统时区(_Y)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "星期三"
@@ -3442,7 +3431,7 @@ msgid "Wee_k starts on:"
 msgstr "一周开始于(_K)："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
 msgid "Work Week"
 msgstr "工作日"
 
@@ -3624,254 +3613,252 @@ msgstr "%s  您还没有进行修改，更新编辑器�？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "已完� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:247
 msgid "Could not save attachments"
 msgstr "�能�存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:509
+#: ../calendar/gui/dialogs/comp-editor.c:515
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:614
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:623
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:619
+#: ../calendar/gui/dialogs/comp-editor.c:629
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分�的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:631
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:636
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:652
 msgid "No Summary"
 msgstr "没有概�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:751
+#: ../calendar/gui/dialogs/comp-editor.c:761
 msgid "Keep original item?"
 msgstr "�留原始�目？"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:948
 msgid "Click here to close the current window"
 msgstr "�击此处�关闭当�窗�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
 msgid "Copy the selection"
 msgstr "�制选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1451
+#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:959
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:969
+#: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
-#, fuzzy
-#| msgid "Cut the selection"
 msgid "Delete the selection"
-msgstr "剪切选中内容"
+msgstr "删除选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:976
 msgid "Click here to view help available"
 msgstr "�击此处�查看�用的帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:971
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:1004
 msgid "Click here to save the current window"
 msgstr "�击此处��存当�窗�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1563
+#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1579
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1018
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1612
+#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1619
+#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1046
 msgid "_Insert"
 msgstr "�入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 #: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1654
+#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 #: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Click here to attach a file"
 msgstr "�击此处�便附加文件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "Toggles whether to display categories"
 msgstr "切�是�显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "Toggles whether the time zone is displayed"
 msgstr "切�是�显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1099
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1108
 msgid "Classify as private"
 msgstr "分类为�人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the Role field is displayed"
 msgstr "切�是�显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "_RSVP"
 msgstr "请回�(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1133
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切�是�显示请回�域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "_Status Field"
 msgstr "状�域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Toggles whether the Status field is displayed"
 msgstr "切�是�显示状�域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切�是�显示出席者类型域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "最近文档(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../calendar/gui/dialogs/comp-editor.c:1693
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
+#: ../calendar/gui/dialogs/comp-editor.c:1748
 msgid "Save"
 msgstr "�存"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2015
-#: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2955
+#: ../calendar/gui/dialogs/comp-editor.c:2025
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2965
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的�，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../calendar/gui/dialogs/comp-editor.c:2933
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2995
 msgid "Unable to use current version!"
 msgstr "无法使用当�版本�"
 
@@ -4016,7 +4003,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "您并�组织者，因此无法编辑全部事件。"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:2722
 msgid "This event has alarms"
 msgstr "此事件有�醒"
 
@@ -4077,7 +4064,7 @@ msgstr "需�一�组织者。"
 msgid "At least one attendee is required."
 msgstr "需�至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2595
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s�。"
@@ -4088,39 +4075,37 @@ msgstr "无法打开日历“%s�。"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2639
 #: ../calendar/gui/dialogs/memo-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2941
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天�"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
+#: ../calendar/gui/dialogs/event-page.c:2947
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d �时�"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2953
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟�"
 
-#: ../calendar/gui/dialogs/event-page.c:2962
+#: ../calendar/gui/dialogs/event-page.c:2966
 msgid "Customize"
 msgstr "自定义"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2964
-#, fuzzy
-#| msgid "None"
+#: ../calendar/gui/dialogs/event-page.c:2968
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ— "
@@ -4190,7 +4175,7 @@ msgstr "�续时间"
 msgid "until"
 msgstr "直到"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "备忘"
 
@@ -4208,8 +4193,8 @@ msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s�中的备忘。"
 
 #: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
+#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "收件人"
@@ -4269,17 +4254,17 @@ msgstr "所有�次"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会�有 Evolution 无法编辑的�现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "�现日期无效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 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:958
+#: ../calendar/gui/dialogs/recurrence-page.c:963
 msgid "on"
 msgstr "在"
 
@@ -4287,7 +4272,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:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "first"
 msgstr "第一个"
 
@@ -4296,7 +4281,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:1021
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "second"
 msgstr "第二"
 
@@ -4304,7 +4289,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "third"
 msgstr "第三个"
 
@@ -4312,7 +4297,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fourth"
 msgstr "第四个"
 
@@ -4320,7 +4305,7 @@ msgstr "第四个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "fifth"
 msgstr "第五个"
 
@@ -4328,13 +4313,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:1041
+#: ../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:1065
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -4342,7 +4327,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:1071
+#: ../calendar/gui/dialogs/recurrence-page.c:1076
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -4350,7 +4335,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:1077
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -4358,45 +4343,45 @@ 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:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 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:1237
+#: ../calendar/gui/dialogs/recurrence-page.c:1242
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2117
+#: ../calendar/gui/dialogs/recurrence-page.c:2122
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2158
+#: ../calendar/gui/dialogs/recurrence-page.c:2163
 msgid "Could not get a selection to modify."
 msgstr "无法获得�修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2213
 msgid "Could not get a selection to delete."
 msgstr "无法获得�删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2352
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -4405,9 +4390,8 @@ msgid "Every"
 msgstr "�"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#, fuzzy
 msgid "Exceptions"
-msgstr "<b>例外</b>"
+msgstr "例外"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
 msgid "Preview"
@@ -4438,9 +4422,9 @@ msgid "Send my alarms with this event"
 msgstr "在这个事件里��我的�醒"
 
 #: ../calendar/gui/dialogs/send-comp.c:162
-#, fuzzy
+######
 msgid "Notify new attendees _only"
-msgstr "�通知收件箱中的新信件(_I)"
+msgstr "�通知新的出席者(_O)"
 
 #: ../calendar/gui/dialogs/task-details-page.c:379
 #: ../calendar/gui/dialogs/task-details-page.c:399
@@ -4457,18 +4441,18 @@ msgstr "网页"
 #: ../calendar/gui/e-cal-model-tasks.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:737
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
-#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "已完�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "高"
 
@@ -4477,25 +4461,25 @@ msgstr "高"
 #: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2645
 msgid "In Progress"
 msgstr "进行中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "中"
@@ -4504,9 +4488,9 @@ msgstr "中"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -4532,7 +4516,7 @@ msgstr "状�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "未定义"
@@ -4559,7 +4543,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "�击�更改或查看任务的状�细节"
 
 #: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:198
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "��选项(_S)"
 
@@ -4576,9 +4560,8 @@ msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "任务�能被编辑，因为选择的任务列表是�读的"
 
 #: ../calendar/gui/dialogs/task-page.c:340
-#, fuzzy
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "无法��此信件，因为您没有指定任何收件人"
+msgstr "无法完全编辑任务，因为您�是组织者"
 
 #: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.ui.h:4
@@ -4689,9 +4672,8 @@ msgid "Untitled"
 msgstr "无标题"
 
 #: ../calendar/gui/e-cal-component-preview.c:198
-#, fuzzy
 msgid "Categories:"
-msgstr "类别"
+msgstr "类别："
 
 #: ../calendar/gui/e-cal-component-preview.c:237
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
@@ -4710,7 +4692,7 @@ msgstr "到期日期："
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "Status:"
 msgstr "状�："
 
@@ -4731,7 +4713,7 @@ msgstr "网页："
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "创建时间"
 
@@ -4751,12 +4733,12 @@ msgid "Start Date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/e-task-table.c:560
 msgid "Free"
 msgstr "空闲"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
 msgid "Busy"
 msgstr "�忙"
 
@@ -4772,13 +4754,11 @@ msgstr ""
 
 #. Translators: "None" for task's status
 #: ../calendar/gui/e-cal-model-tasks.c:731
-#, fuzzy
-#| msgid "None"
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ— "
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:856
@@ -4786,54 +4766,50 @@ msgstr "æ— "
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "�"
 
-#: ../calendar/gui/e-cal-model.c:377
-#, fuzzy
-#| msgid "Default Mail Client"
+#: ../calendar/gui/e-cal-model.c:378
 msgid "Default Client"
-msgstr "默认邮件客户端"
+msgstr "默认客户端"
 
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:836
-#, fuzzy
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
+#: ../shell/e-shell.c:868
 msgid "Shell Settings"
-msgstr "Exchange 设置"
+msgstr "外壳设置"
 
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:837
-#, fuzzy
+#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
+#: ../shell/e-shell.c:869
 msgid "Application-wide settings"
-msgstr "自动补全设置"
+msgstr "应用程�级设置"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
-#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1317
 msgid "Recurring"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1319
 msgid "Assigned"
 msgstr "已分�"
 
-#: ../calendar/gui/e-cal-model.c:2203
+#: ../calendar/gui/e-cal-model.c:2225
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
@@ -4861,7 +4837,7 @@ msgstr "到期日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "优先级"
 
@@ -4878,36 +4854,28 @@ msgid "Type"
 msgstr "类型"
 
 #: ../calendar/gui/e-calendar-view.c:392
-#, fuzzy
-#| msgid "Cut selected text to the clipboard"
 msgid "Cut selected events to the clipboard"
-msgstr "将选中文字剪切到剪贴�"
+msgstr "将选中事件剪切到剪贴�"
 
 #: ../calendar/gui/e-calendar-view.c:398
-#, fuzzy
-#| msgid "Copy selected text to the clipboard"
 msgid "Copy selected events to the clipboard"
-msgstr "将选中文字�制到剪贴�"
+msgstr "将选中事件�制到剪贴�"
 
 #: ../calendar/gui/e-calendar-view.c:404
-#, fuzzy
-#| msgid "Paste text from the clipboard"
 msgid "Paste events from the clipboard"
-msgstr "从剪贴�中粘贴文字"
+msgstr "从剪贴�中粘贴事件"
 
 #: ../calendar/gui/e-calendar-view.c:410
-#, fuzzy
-#| msgid "Delete selected memos"
 msgid "Delete selected events"
-msgstr "删除选中的备忘"
+msgstr "删除选中的事件"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
-#: ../calendar/gui/e-task-table.c:264
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
-#: ../calendar/gui/e-task-table.c:1062
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -4915,7 +4883,7 @@ msgstr "更新对象"
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "接�"
 
@@ -4923,7 +4891,7 @@ msgstr "接�"
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "拒�"
 
@@ -4937,7 +4905,7 @@ msgstr "暂时的"
 #: ../calendar/gui/e-calendar-view.c:1693
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -4947,22 +4915,22 @@ msgstr "需�动作"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
-#: ../calendar/gui/e-task-table.c:737
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:738
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者：%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
-#: ../calendar/gui/e-task-table.c:740
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:741
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者：%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "�置：%s"
@@ -5011,8 +4979,8 @@ msgstr "显示第二时区"
 #. 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:860 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1883
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%B%dæ—¥%A"
 
@@ -5022,10 +4990,10 @@ msgstr "%B%dæ—¥%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
+#: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:894
+#: ../modules/calendar/e-cal-shell-view-private.c:990
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
@@ -5034,27 +5002,27 @@ msgstr "%-m月%-d日%A"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
+#: ../calendar/gui/e-week-view-main-item.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:930
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%d %b"
 msgstr "%B%-dæ—¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:814
+#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "上�"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:816
+#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "下�"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2613
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
@@ -5130,7 +5098,7 @@ msgid "Ends"
 msgstr "结�"
 
 #: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "到期"
 
@@ -5161,15 +5129,13 @@ msgstr "<br> 请查看下列信æ�¯ï¼Œå¹¶ä»Žä¸‹é�¢çš„è�œå�•ä¸­é€‰æ‹©ä¸€ä¸ªåŠ¨ä½œã
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2300
-#, fuzzy
-#| msgid "None"
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ— "
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2316
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "暂时接�"
 
@@ -5386,7 +5352,7 @@ msgid "Attendee status updated\n"
 msgstr "更新出席者状�\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于�目��存在而无法更新出席者状�"
 
@@ -5440,7 +5406,7 @@ msgid "Send Latest Information"
 msgstr "��最新的信�"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "�消"
@@ -5491,49 +5457,49 @@ msgstr "资�"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "个人"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "组"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:965
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "资�"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:966
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "房间"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:980
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "必需的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "�选的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "��加"
 
@@ -5555,7 +5521,7 @@ 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2284
+#: ../calendar/gui/e-meeting-time-sel.c:2300
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -5564,7 +5530,7 @@ msgstr "%Y年%m月%d日%A"
 #. 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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2315
+#: ../calendar/gui/e-meeting-time-sel.c:2331
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -5662,8 +5628,8 @@ msgstr "语言"
 msgid "Member"
 msgstr "�员"
 
-#: ../calendar/gui/e-memo-table.c:410
-#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../calendar/gui/e-memo-table.c:411
+#: ../modules/calendar/e-cal-shell-content.c:456
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5671,101 +5637,93 @@ msgstr "�员"
 msgid "Memos"
 msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
 msgid "* No Summary *"
 msgstr "* 没有概� *"
 
-#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
 msgid "Start: "
 msgstr "开始："
 
-#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
 msgid "Due: "
 msgstr "到期："
 
-#: ../calendar/gui/e-memo-table.c:706
-#, fuzzy
-#| msgid "Cut selected text to the clipboard"
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Cut selected memos to the clipboard"
-msgstr "将选中文字剪切到剪贴�"
+msgstr "将选中备忘剪切到剪贴�"
 
-#: ../calendar/gui/e-memo-table.c:712
-#, fuzzy
-#| msgid "Copy selected messages to the clipboard"
+#: ../calendar/gui/e-memo-table.c:713
 msgid "Copy selected memos to the clipboard"
-msgstr "将选中信件�制到剪贴�"
+msgstr "将选中备忘�制到剪贴�"
 
-#: ../calendar/gui/e-memo-table.c:718
-#, fuzzy
-#| msgid "Paste memo from the clipboard"
+#: ../calendar/gui/e-memo-table.c:719
 msgid "Paste memos from the clipboard"
 msgstr "从剪贴�中粘贴备忘"
 
-#: ../calendar/gui/e-memo-table.c:724
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../calendar/gui/e-memo-table.c:725
+#: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "删除选中的备忘"
 
-#: ../calendar/gui/e-memo-table.c:730
-#, fuzzy
-#| msgid "Select all visible messages"
+#: ../calendar/gui/e-memo-table.c:731
 msgid "Select all visible memos"
-msgstr "选中所有��的信件"
+msgstr "选中所有��的备忘"
 
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�击以添加备忘"
 
-#: ../calendar/gui/e-task-table.c:529
+#: ../calendar/gui/e-task-table.c:530
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-task-table.c:530
+#: ../calendar/gui/e-task-table.c:531
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-task-table.c:531
+#: ../calendar/gui/e-task-table.c:532
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-task-table.c:532
+#: ../calendar/gui/e-task-table.c:533
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-task-table.c:533
+#: ../calendar/gui/e-task-table.c:534
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-task-table.c:534
+#: ../calendar/gui/e-task-table.c:535
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-task-table.c:535
+#: ../calendar/gui/e-task-table.c:536
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-task-table.c:536
+#: ../calendar/gui/e-task-table.c:537
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-task-table.c:537
+#: ../calendar/gui/e-task-table.c:538
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-task-table.c:538
+#: ../calendar/gui/e-task-table.c:539
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:540
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2006
+#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
 #: ../plugins/caldav/caldav-browse-server.c:430
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
@@ -5774,70 +5732,64 @@ msgstr "100%"
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/e-task-table.c:927
-#, fuzzy
-#| msgid "Cut selected text to the clipboard"
+#: ../calendar/gui/e-task-table.c:928
 msgid "Cut selected tasks to the clipboard"
-msgstr "将选中文字剪切到剪贴�"
+msgstr "将选中任务剪切到剪贴�"
 
-#: ../calendar/gui/e-task-table.c:933
-#, fuzzy
-#| msgid "Copy selected text to the clipboard"
+#: ../calendar/gui/e-task-table.c:934
 msgid "Copy selected tasks to the clipboard"
-msgstr "将选中文字�制到剪贴�"
+msgstr "将选中任务�制到剪贴�"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:940
 msgid "Paste tasks from the clipboard"
 msgstr "从剪贴�中粘贴任务"
 
-#: ../calendar/gui/e-task-table.c:945
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../calendar/gui/e-task-table.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:680
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
-#: ../calendar/gui/e-task-table.c:951
-#, fuzzy
-#| msgid "Select all visible messages"
+#: ../calendar/gui/e-task-table.c:952
 msgid "Select all visible tasks"
-msgstr "选中所有��的信件"
+msgstr "选中所有��的任务"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:354
 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:235 ../calendar/gui/print.c:1679
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "有�醒。"
 
-#: ../calendar/gui/ea-cal-view-event.c:266
+#: ../calendar/gui/ea-cal-view-event.c:279
 msgid "It has recurrences."
 msgstr "有�现。"
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "为会议。"
 
-#: ../calendar/gui/ea-cal-view-event.c:275
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "日历事件：摘�为 %s。"
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "日历事件：无摘�。"
 
-#: ../calendar/gui/ea-cal-view-event.c:299
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:527
+#: ../calendar/gui/ea-cal-view-event.c:540
 msgid "Grab Focus"
 msgstr "获得焦点"
 
@@ -5861,12 +5813,12 @@ msgstr "转到今天"
 msgid "Go to Date"
 msgstr "转到日期"
 
-#: ../calendar/gui/ea-day-view-main-item.c:305
-#: ../calendar/gui/ea-week-view-main-item.c:302
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 msgid "a table to view and select the current time range"
 msgstr "�查看并选择当�时间范围的表"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5874,14 +5826,14 @@ msgstr[0] "有 %d 个事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
 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."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "工作日视图：%s。%s"
@@ -5889,16 +5841,16 @@ 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."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图：%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:201
 msgid "calendar view for a work week"
 msgstr "工作日的日历视图"
 
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
@@ -5909,16 +5861,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:890
+#: ../modules/calendar/e-cal-shell-view-private.c:986
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:897
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../modules/calendar/e-cal-shell-view-private.c:993
+#: ../modules/calendar/e-cal-shell-view-private.c:999
+#: ../modules/calendar/e-cal-shell-view-private.c:1002
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -5926,10 +5878,10 @@ msgstr "%Y年%-m月%-d日%A"
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../calendar/gui/ea-gnome-calendar.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:923
-#: ../modules/calendar/e-cal-shell-view-private.c:934
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:944
+#: ../modules/calendar/e-cal-shell-view-private.c:1019
+#: ../modules/calendar/e-cal-shell-view-private.c:1030
+#: ../modules/calendar/e-cal-shell-view-private.c:1037
+#: ../modules/calendar/e-cal-shell-view-private.c:1040
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -5941,25 +5893,25 @@ msgstr "跳转按钮"
 msgid "Click here, you can find more events."
 msgstr "�击此处�查找更多事件。"
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月视图：%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "周视图：%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "月日历视图"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../calendar/gui/gnome-cal.c:2144
+#: ../calendar/gui/gnome-cal.c:2299
 msgid "Purging"
 msgstr "销�"
 
@@ -6028,23 +5980,23 @@ msgstr "必须设定组织者。"
 msgid "At least one attendee is necessary"
 msgstr "至少需�一个�加者"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "事件信�"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "任务信�"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "备忘信�"
 
-#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
+#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "忙闲信�"
 
-#: ../calendar/gui/itip-utils.c:646
+#: ../calendar/gui/itip-utils.c:645
 msgid "Calendar information"
 msgstr "日历信�"
 
@@ -6052,7 +6004,7 @@ msgstr "日历信�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:680
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接�"
@@ -6061,7 +6013,7 @@ msgstr "接�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:687
+#: ../calendar/gui/itip-utils.c:686
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接�"
@@ -6073,7 +6025,7 @@ 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".
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒�"
@@ -6082,7 +6034,7 @@ msgstr "拒�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:701
+#: ../calendar/gui/itip-utils.c:700
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -6090,7 +6042,7 @@ 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:714
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "æ›´æ–°"
@@ -6098,7 +6050,7 @@ msgstr "æ›´æ–°"
 #. 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:721
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "�消"
@@ -6106,7 +6058,7 @@ 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:728
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -6114,29 +6066,29 @@ msgstr "刷新"
 #. 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:735
+#: ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信� (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:812
 msgid "iCalendar information"
 msgstr "iCalendar 信�"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:832
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "无法预约资�，新事件与其它事件冲�。"
 
-#: ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:834
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "无法预约资�，错误："
 
-#: ../calendar/gui/itip-utils.c:988
+#: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
@@ -6264,77 +6216,77 @@ msgstr "30æ—¥"
 msgid "31st"
 msgstr "31æ—¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "æ—¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "å››"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "å…­"
 
-#: ../calendar/gui/print.c:2525
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2527
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "概�：%s"
 
-#: ../calendar/gui/print.c:2575
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "出席者："
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "状�：%s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2644
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完�率：%i"
 
-#: ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2668
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2679
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "�系人："
 
@@ -6365,7 +6317,7 @@ msgstr "约会和会议"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1820
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "打开日历"
 
@@ -7996,7 +7948,7 @@ msgstr "�存为�稿(_D)"
 msgid "Save as draft"
 msgstr "�存为�稿"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "��(_E)"
 
@@ -8101,16 +8053,12 @@ msgid "Save Draft"
 msgstr "�存�稿"
 
 #: ../composer/e-composer-header.c:129
-#, fuzzy
-#| msgid "Sho_w:"
 msgid "Show"
-msgstr "显示(_W)："
+msgstr "显示"
 
 #: ../composer/e-composer-header.c:137
-#, fuzzy
-#| msgid "_Hide"
 msgid "Hide"
-msgstr "��(_H)"
+msgstr "��"
 
 #: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
@@ -8181,13 +8129,28 @@ msgstr "�击此处以使用地�簿"
 msgid "Click here to select folders to post to"
 msgstr "�击此处以选择�投递到的文件夹"
 
-#: ../composer/e-composer-private.c:284
-#, fuzzy
+#: ../composer/e-composer-private.c:199
+msgid "Undo the last action"
+msgstr "撤消上次�作"
+
+#: ../composer/e-composer-private.c:203
+msgid "Redo the last undone action"
+msgstr "��上次�作"
+
+#: ../composer/e-composer-private.c:207
+msgid "Search for text"
+msgstr "�索文本"
+
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
+msgstr "�索和替�文本"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "�存�稿"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "��显示此信�(_D)。"
@@ -8203,16 +8166,16 @@ msgid ""
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密�书"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1381
 #, fuzzy
 msgid "Unable to reconstruct message from autosave file"
 msgstr "无法从编辑器获�信件"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
 msgid "Compose Message"
 msgstr "撰写新信件"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3312
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8331,17 +8294,316 @@ msgstr "��(_R)"
 msgid "_Save Draft"
 msgstr "�存�稿(_S)"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr "在新窗�中�行 Anjal"
+
+#: ../capplet/anjal-settings-main.c:200
+#, fuzzy
+#| msgid "Mark as _default memo list"
+msgid "Make Anjal the default email client"
+msgstr "标为默认备忘列表(_D)"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:208
+#, fuzzy
+#| msgid "sort"
+msgid "socket"
+msgstr "排�"
+
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr "Anjal 邮件客户端"
+
+#: ../capplet/settings/mail-account-view.c:56
+#, fuzzy
+#| msgid "Please choose another name."
+msgid "Please enter your full name."
+msgstr "请�选一个�称。"
+
+#: ../capplet/settings/mail-account-view.c:57
+#, fuzzy
+#| msgid "Using email address"
+msgid "Please enter your email address."
+msgstr "使用电�邮件地�"
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:181
+#, fuzzy
+#| msgid "<span weight=\"bold\">Delete Mail</span>"
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span weight=\"bold\">删除邮件</span>"
+
+#: ../capplet/settings/mail-account-view.c:186
+#, fuzzy
+#| msgid "_Name:"
+msgid "Name:"
+msgstr "�称(_N)："
+
+#: ../capplet/settings/mail-account-view.c:195
+#, fuzzy
+#| msgid "Email address"
+msgid "Email address:"
+msgstr "电�邮件地�"
+
+#: ../capplet/settings/mail-account-view.c:205
+#, fuzzy
+#| msgid "<span weight=\"bold\">General</span>"
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span weight=\"bold\">常规</span>"
+
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
+#, fuzzy
+#| msgid "Server _Type:"
+msgid "Server type:"
+msgstr "�务器类型(_T)："
+
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
+#, fuzzy
+#| msgid "Server Message:"
+msgid "Server address:"
+msgstr "�务器消�："
+
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
+#, fuzzy
+#| msgid "Us_ername:"
+msgid "Username:"
+msgstr "用户�(_E)："
+
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
+#, fuzzy
+#| msgid "No encryption"
+msgid "Use encryption:"
+msgstr "�加密"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
+#, fuzzy
+#| msgid "Never"
+msgid "never"
+msgstr "从�"
+
+#: ../capplet/settings/mail-account-view.c:253
+#, fuzzy
+#| msgid "<span weight=\"bold\">General</span>"
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span weight=\"bold\">常规</span>"
+
+#: ../capplet/settings/mail-account-view.c:309
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:311
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:313
+msgid "You can specify more options to configure the account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:315
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:317
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
+#: ../mail/mail-config.ui.h:58
+msgid "Identity"
+msgstr "标识"
+
+#: ../capplet/settings/mail-account-view.c:332
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Next - Receiving mail"
+msgstr "接收电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Receiving mail"
+msgstr "接收电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Next - Sending mail"
+msgstr "��电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+#| msgid "Identity"
+msgid "Back - Identity"
+msgstr "标识"
+
+#: ../capplet/settings/mail-account-view.c:333
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Next - Receiving options"
+msgstr "接收选项"
+
+#: ../capplet/settings/mail-account-view.c:334
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Receiving options"
+msgstr "接收选项"
+
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+#| msgid "Receiving Email"
+msgid "Back - Receiving mail"
+msgstr "接收电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending mail"
+msgstr "��电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
+#, fuzzy
+#| msgid "Delete account?"
+msgid "Next - Review account"
+msgstr "删除账户�？"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+#| msgid "Defaults"
+msgid "Next - Defaults"
+msgstr "默认"
+
+#: ../capplet/settings/mail-account-view.c:336
+#, fuzzy
+#| msgid "Receiving Options"
+msgid "Back - Receiving options"
+msgstr "接收选项"
+
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+msgid "Defaults"
+msgstr "默认"
+
+#: ../capplet/settings/mail-account-view.c:337
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Back - Sending mail"
+msgstr "��电�邮件"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+#| msgid "Delete account?"
+msgid "Review account"
+msgstr "删除账户�？"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+#| msgid "Fiji"
+msgid "Finish"
+msgstr "�济"
+
+#: ../capplet/settings/mail-account-view.c:339
+#, fuzzy
+#| msgid "Ascending"
+msgid "Back - Sending"
+msgstr "��"
+
+#: ../capplet/settings/mail-account-view.c:671
+#: ../capplet/settings/mail-settings-view.c:262
+#, fuzzy
+#| msgid "_Close"
+msgid "Close Tab"
+msgstr "关闭(_C)"
+
+#: ../capplet/settings/mail-account-view.c:681
+#, fuzzy
+#| msgid "Account Editor"
+msgid "Account Wizard"
+msgstr "账户编辑器"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
 #, fuzzy
+#| msgid "Evolution Account Assistant"
+msgid "Evolution account assistant"
+msgstr "Evolution 账户助手"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
+#: ../mail/message-list.c:1614
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "在此计算机中"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "修改"
+
+#: ../capplet/settings/mail-settings-view.c:148
+msgid "Add a new account"
+msgstr "添加新账户"
+
+#: ../capplet/settings/mail-settings-view.c:183
+#, fuzzy
+#| msgid "<span weight=\"bold\">Account Information</span>"
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span weight=\"bold\">账户信�</span>"
+
+#: ../capplet/settings/mail-settings-view.c:272
+msgid "Settings"
+msgstr "设置"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
-msgstr "日历信�"
+msgstr "日历事件信�"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
 msgstr "Evolution �醒通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
-#: ../shell/e-shell-window-private.c:255
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8349,7 +8611,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 邮件�日历"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -8357,6 +8619,14 @@ msgstr "Groupwise 套件"
 msgid "Manage your email, contacts and schedule"
 msgstr "�置您的电�邮件，�系人和日程表"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "�置电�邮件账户"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "电�邮件设置"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "地��"
@@ -8476,45 +8746,44 @@ msgid "Visual"
 msgstr "�视"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 #: ../plugins/itip-formatter/itip-view.c:195
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "明天"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:210
 #, c-format
 msgid "%d days from now"
 msgstr "�现在有 %d 天"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 #, c-format
 msgid "%d days ago"
 msgstr "%d 天�"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
+#: ../e-util/e-datetime-format.c:305
 msgid "Use locale default"
 msgstr "使用本地默认值"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:499
 msgid "Format:"
 msgstr "格�："
 
 #: ../e-util/e-file-utils.c:136
-#, fuzzy
 msgid "(Unknown Filename)"
-msgstr "未知类型"
+msgstr "(未知文件�)"
 
 #. Translators: The string value is the basename of a file.
 #: ../e-util/e-file-utils.c:140
@@ -8565,13 +8834,13 @@ msgstr "日志消�："
 msgid "Log Level"
 msgstr "日志级别"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "信件"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1430
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "关闭此窗�"
 
@@ -8606,8 +8875,8 @@ msgstr "已�用"
 msgid "Whether the plugin is enabled"
 msgstr "�件是�已�用"
 
-#: ../e-util/e-plugin-util.c:424 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "周"
@@ -8625,7 +8894,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "打�系统未报告关于错误的任何�外细节。"
 
-#: ../e-util/e-signature.c:699
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "自动生�的"
 
@@ -8649,7 +8918,7 @@ msgstr "您打算覆盖它�？"
 msgid "File exists \"{0}\"."
 msgstr "文件已存在“{0}�。"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
@@ -8661,12 +8930,12 @@ msgstr "无法打开链接。"
 msgid "Could not display help for Evolution."
 msgstr "无法显示 Evolution 的帮助。"
 
-#: ../e-util/gconf-bridge.c:1276
+#: ../e-util/gconf-bridge.c:1307
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf 错误：%s"
 
-#: ../e-util/gconf-bridge.c:1287
+#: ../e-util/gconf-bridge.c:1318
 msgid "All further errors shown only on terminal."
 msgstr "�续所有的错误都�显示在终端。"
 
@@ -8676,14 +8945,14 @@ msgid "Reply-To"
 msgstr "回�至"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "抄�"
 
 #: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
-#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
+#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "密件抄�"
 
@@ -8695,7 +8964,7 @@ msgid "Subject"
 msgstr "主题"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "邮件程�"
@@ -8917,11 +9186,11 @@ msgid "I_nclude threads"
 msgstr "包�线索(_N)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -8953,7 +9222,7 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少文件�。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "缺少�称。"
 
@@ -9041,41 +9310,41 @@ msgid "years"
 msgstr "å¹´"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../mail/e-mail-attachment-bar.c:617
+#: ../mail/e-mail-attachment-bar.c:621
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "图标视图"
 
-#: ../mail/e-mail-attachment-bar.c:618
+#: ../mail/e-mail-attachment-bar.c:622
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "列表视图"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:634
+#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
 msgstr ""
 
-#: ../mail/e-mail-browser.c:739
+#: ../mail/e-mail-browser.c:779
 #, fuzzy
 msgid "Shell Module"
 msgstr "选择模�"
 
-#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
 msgid "The mail shell backend"
 msgstr ""
 
-#: ../mail/e-mail-browser.c:750
+#: ../mail/e-mail-browser.c:790
 msgid "Show Deleted"
 msgstr "显示删除的"
 
-#: ../mail/e-mail-browser.c:751
+#: ../mail/e-mail-browser.c:791
 msgid "Show deleted messages"
 msgstr "显示删除的信件"
 
@@ -9125,7 +9394,7 @@ msgid "_Later"
 msgstr "�候(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:519
 msgid "Add Label"
 msgstr "添加标签"
 
@@ -9145,55 +9414,55 @@ msgid "Color"
 msgstr "颜色"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
-#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
+#: ../modules/mail/e-mail-shell-view-private.c:963
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
 msgid "Drafts"
 msgstr "�稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
 msgid "Outbox"
 msgstr "�件箱"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
 msgid "Sent"
 msgstr "已�箱"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "模�"
 
-#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "��"
 
 #. green
-#: ../mail/e-mail-migrate.c:956
+#: ../mail/e-mail-migrate.c:963
 msgid "To Do"
 msgstr "待办"
 
 #. blue
-#: ../mail/e-mail-migrate.c:957
+#: ../mail/e-mail-migrate.c:964
 msgid "Later"
 msgstr "�候"
 
-#: ../mail/e-mail-migrate.c:1103
+#: ../mail/e-mail-migrate.c:1110
 #: ../modules/addressbook/e-book-shell-migrate.c:76
 #: ../modules/calendar/e-cal-shell-migrate.c:123
 #: ../modules/calendar/e-task-shell-migrate.c:90
 msgid "Migrating..."
 msgstr "正在��..."
 
-#: ../mail/e-mail-migrate.c:1136
+#: ../mail/e-mail-migrate.c:1143
 msgid "Migration"
 msgstr "�移"
 
-#: ../mail/e-mail-migrate.c:1176
+#: ../mail/e-mail-migrate.c:1183
 #: ../modules/addressbook/e-book-shell-migrate.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:165
 #: ../modules/calendar/e-task-shell-migrate.c:132
@@ -9201,26 +9470,26 @@ msgstr "�移"
 msgid "Migrating '%s':"
 msgstr "��“%s�："
 
-#: ../mail/e-mail-migrate.c:1586
+#: ../mail/e-mail-migrate.c:1594
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "无法创建新文件夹“%s�：%s"
 
-#: ../mail/e-mail-migrate.c:1614
+#: ../mail/e-mail-migrate.c:1622
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "无法将文件夹“%s��制为“%s�：%s"
 
-#: ../mail/e-mail-migrate.c:1809
+#: ../mail/e-mail-migrate.c:1817
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "无法扫��于“%s�的已有邮箱：%s"
 
-#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
 msgid "Migrating Folders"
 msgstr "�移文件夹"
 
-#: ../mail/e-mail-migrate.c:1816
+#: ../mail/e-mail-migrate.c:1824
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -9231,27 +9500,27 @@ msgstr ""
 "\n"
 "请�候，Evolution 正在��您的文件夹..."
 
-#: ../mail/e-mail-migrate.c:2019
+#: ../mail/e-mail-migrate.c:2027
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "无法打开旧的 POP �留在�务器上的数�“%s�：%s"
 
-#: ../mail/e-mail-migrate.c:2035
+#: ../mail/e-mail-migrate.c:2043
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "无法创建 POP3 �留在�务器上的数�目录“%s�：%s"
 
-#: ../mail/e-mail-migrate.c:2067
+#: ../mail/e-mail-migrate.c:2075
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "无法�制 POP3 在�务器上�留的数�“%s�：%s"
 
-#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "创建本地邮件存储“%s�失败：%s"
 
-#: ../mail/e-mail-migrate.c:2913
+#: ../mail/e-mail-migrate.c:2933
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9262,29 +9531,12 @@ msgstr ""
 "\n"
 "请�候，Evolution 正在��您的文件夹..."
 
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
-#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
-msgid "On This Computer"
-msgstr "在此计算机中"
-
-#: ../mail/e-mail-migrate.c:3008
+#: ../mail/e-mail-migrate.c:3030
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "无法在“%s�创建本地邮件文件夹：%s"
 
-#: ../mail/e-mail-migrate.c:3026
+#: ../mail/e-mail-migrate.c:3048
 #, c-format
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -9297,27 +9549,27 @@ msgstr ""
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:580
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid "Do not ask me again"
 msgstr "���次询问"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "�制到文件夹"
 
-#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "�制(_O)"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:808
+#: ../mail/e-mail-reader.c:864
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "�存信�"
@@ -9328,7 +9580,7 @@ msgstr[0] "�存信�"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
 #: ../widgets/table/e-table-click-to-add.c:518
 #, fuzzy
 #| msgid "Message"
@@ -9336,510 +9588,511 @@ msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "消�"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1143
 msgid "A_dd Sender to Address Book"
 msgstr "将�件人添加到地�簿(_D)"
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1145
 msgid "Add sender to address book"
 msgstr "将�件人添加到地�簿"
 
-#: ../mail/e-mail-reader.c:1094
+#: ../mail/e-mail-reader.c:1150
 msgid "Check for _Junk"
 msgstr "检查垃圾信(_J)"
 
-#: ../mail/e-mail-reader.c:1096
+#: ../mail/e-mail-reader.c:1152
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信件标记为垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1101
+#: ../mail/e-mail-reader.c:1157
 msgid "_Copy to Folder..."
 msgstr "�制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1159
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信件�制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1164
 msgid "_Delete Message"
 msgstr "删除信件(_D)"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1166
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信件�删除标记"
 
-#: ../mail/e-mail-reader.c:1115
+#: ../mail/e-mail-reader.c:1171
 msgid "Filter on Mailing _List..."
 msgstr "根�邮件列表过滤(_L)..."
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1173
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建�过滤寄往此邮件列表的信件的规则"
 
-#: ../mail/e-mail-reader.c:1122
+#: ../mail/e-mail-reader.c:1178
 msgid "Filter on _Recipients..."
 msgstr "根�收件人过滤(_R)..."
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1180
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建�过滤寄往这些收件人的信件的规则"
 
-#: ../mail/e-mail-reader.c:1129
+#: ../mail/e-mail-reader.c:1185
 msgid "Filter on Se_nder..."
 msgstr "根��件人过滤(_N)..."
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1187
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建�过滤此人寄�的信件的规则"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1192
 msgid "Filter on _Subject..."
 msgstr "根�主题过滤(_S)..."
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1194
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建�过滤此主题信件的规则"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1199
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1201
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信件"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1206
 msgid "_Find in Message..."
 msgstr "在信件中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1208
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信件的主体中�索文本"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1213
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1215
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "�消选中信件的删除"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1220
 msgid "_Flag Completed"
 msgstr "标志为已完�(_F)"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1222
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "把�一线索中的所有信件选择为选中信件"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1227
 msgid "Follow _Up..."
 msgstr "跟�(_U)..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1229
 #, fuzzy
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信件�跟�标志"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1234
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信件作为附件转�给�人"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1241
 #, fuzzy
 msgid "Forward As _Attached"
 msgstr "作为 iCalendar 转�(_F)"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1248
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转�选中信件"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1255
 #, fuzzy
 msgid "Forward As _Inline"
 msgstr "转�方�(_F)："
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1262
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回�的引用方�转�选中的信件"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1269
 #, fuzzy
 msgid "Forward As _Quoted"
 msgstr "转�方�(_F)："
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1276
 msgid "_Load Images"
 msgstr "装入图�(_L)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1278
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制装入 HTML 邮件中的图�"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1283
 msgid "_Important"
 msgstr "��(_I)"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1285
 msgid "Mark the selected messages as important"
 msgstr "把选中信件标记为��邮件"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1290
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1292
 msgid "Mark the selected messages as junk"
 msgstr "把选中信件标记为垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1297
 msgid "_Not Junk"
 msgstr "�垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1299
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信件标记为�垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1304
 msgid "_Read"
 msgstr "读�(_R)"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1306
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信件标记为已读"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1311
 msgid "Uni_mportant"
 msgstr "���(_M)"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1313
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信件标记为���邮件"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1318
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1320
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信件标记为未读"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1325
 msgid "_Edit as New Message..."
 msgstr "作为新信件进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1327
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰写器中打开选中的信件以便编辑"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1332
 msgid "Compose _New Message"
 msgstr "撰写新信件(_N)"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1334
 msgid "Open a window for composing a mail message"
 msgstr "打开窗�以撰写信件"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1339
 msgid "_Open in New Window"
 msgstr "在新窗�中打开(_O)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1341
 msgid "Open the selected messages in a new window"
 msgstr "在新窗�中打开选中的信件"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1346
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1348
 msgid "Move selected messages to another folder"
 msgstr "把选中的信件移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1353
 msgid "_Next Message"
 msgstr "下一�信(_N)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1355
 msgid "Display the next message"
 msgstr "显示下一�信件"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1360
 msgid "Next _Important Message"
 msgstr "下一���信件(_I)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1362
 msgid "Display the next important message"
 msgstr "显示下一���信件"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1367
 msgid "Next _Thread"
 msgstr "下一�线索(_T)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1369
 msgid "Display the next thread"
 msgstr "显示下一�线索"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1374
 msgid "Next _Unread Message"
 msgstr "下一�未读信件(_U)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1376
 msgid "Display the next unread message"
 msgstr "显示下一�未读信件"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1381
 msgid "_Previous Message"
 msgstr "上一�信(_P)"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1383
 msgid "Display the previous message"
 msgstr "显示上一�信件"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1388
 msgid "Pr_evious Important Message"
 msgstr "上一���信件(_E)"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1390
 msgid "Display the previous important message"
 msgstr "显示上一���信件"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1395
 msgid "P_revious Unread Message"
 msgstr "上一�未读信件(_R)"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1397
 msgid "Display the previous unread message"
 msgstr "显示上一�未读信件"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1404
 msgid "Print this message"
 msgstr "打�该信件"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1411
 msgid "Preview the message to be printed"
 msgstr "预览�打�的信件"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1416
 msgid "Re_direct"
 msgstr "��(_D)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1418
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信件��(退回)给�人"
 
-#: ../mail/e-mail-reader.c:1367
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../mail/e-mail-reader.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "回�所有人(_A)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1425
 #, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信件的所有收件人撰写回�"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1430
 msgid "Reply to _List"
 msgstr "回�邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1432
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信件的邮件列表撰写回�"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1437
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "回��件人(_R)"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1439
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信件的�件人撰写回�"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1444
 #, fuzzy
 msgid "_Save as mbox..."
 msgstr "�存为..."
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1446
 #, fuzzy
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信件�存为文本文件"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1451
 msgid "Search Folder from Mailing _List..."
 msgstr "基于邮件列表的�索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1453
 #, fuzzy
 msgid "Create a search folder for this mailing list"
 msgstr "为该邮件列表创建�索文件夹"
 
-#: ../mail/e-mail-reader.c:1402
+#: ../mail/e-mail-reader.c:1458
 msgid "Search Folder from Recipien_ts..."
 msgstr "基于收件人的�索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1460
 #, fuzzy
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建�索文件夹"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1465
 msgid "Search Folder from Sen_der..."
 msgstr "基于�件人的�索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1467
 #, fuzzy
 msgid "Create a search folder for this sender"
 msgstr "为该�件人创建�索文件夹"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1472
 msgid "Search Folder from S_ubject..."
 msgstr "基于主题的�索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1474
 #, fuzzy
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建�索文件夹"
 
-#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1479
 msgid "_Message Source"
 msgstr "信件�代�(_M)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1481
 msgid "Show the raw email source of the message"
 msgstr "显示信件的原始邮件�代�"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1493
 msgid "_Undelete Message"
 msgstr "�消删除信件(_U)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1495
 msgid "Undelete the selected messages"
 msgstr "�消选中信件的删除"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1500
 msgid "_Normal Size"
 msgstr "普通大�(_N)"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1502
 msgid "Reset the text to its original size"
 msgstr "把文本�新设置为原�的大�"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1507
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1509
 msgid "Increase the text size"
 msgstr "增加文本大�"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1514
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1516
 msgid "Decrease the text size"
 msgstr "�少文本大�"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1523
 msgid "Create R_ule"
 msgstr "创建规则(_U)"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1530
 msgid "Ch_aracter Encoding"
 msgstr "字符编�(_A)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1537
 msgid "F_orward As"
 msgstr "转�为(_O)"
 
-#: ../mail/e-mail-reader.c:1488
+#: ../mail/e-mail-reader.c:1544
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1551
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1558
 msgid "_Message"
 msgstr "信件(_M)"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1565
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟�(_W)..."
 
-#: ../mail/e-mail-reader.c:1542
+#: ../mail/e-mail-reader.c:1598
 msgid "Mark as _Important"
 msgstr "标记为��(_I)"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1602
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1606
 msgid "Mark as _Not Junk"
 msgstr "标记为�垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1610
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1614
 msgid "Mark as Uni_mportant"
 msgstr "标记为���(_M)"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1654
 msgid "_Caret Mode"
 msgstr "光标模�(_C)"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1656
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信件的信体中显示闪�光标"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1662
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1664
 msgid "Show messages with all email headers"
 msgstr "显示邮件时显示所有信头"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1897
 msgid "Unable to retrieve message"
 msgstr "无法获�信件"
 
-#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
+#: ../mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Retrieving message '%s'"
 msgstr "收�信件 %s"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2471
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -9847,33 +10100,33 @@ msgstr "收�信件 %s"
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2592
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "转�(_F)"
 
-#: ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2593
 msgid "Forward the selected message to someone"
 msgstr "把选中信件转�给�人"
 
-#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:2538
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../mail/e-mail-reader.c:2641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:2542
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "回�"
 
@@ -9883,7 +10136,7 @@ msgstr "跟�的标志"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "�加密"
@@ -9891,7 +10144,7 @@ msgstr "�加密"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS 加密"
@@ -9899,17 +10152,17 @@ msgstr "TLS 加密"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
-#: ../mail/em-account-editor.c:595
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 许��议"
 
-#: ../mail/em-account-editor.c:602
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -9922,7 +10175,7 @@ msgstr ""
 "并选中�选框表明您接�该�议\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
 #, fuzzy
 #| msgid "None"
 msgctxt "mail-signature"
@@ -9942,18 +10195,18 @@ msgid "Ask for each message"
 msgstr "��信都询问"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
 #, fuzzy
 #| msgid "None"
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ— "
 
-#: ../mail/em-account-editor.c:2055
+#: ../mail/em-account-editor.c:2061
 msgid "Mail Configuration"
 msgstr "邮件�置"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2062
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9963,12 +10216,7 @@ msgstr ""
 "\n"
 "�击“�进�开始。"
 
-#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "标识"
-
-#: ../mail/em-account-editor.c:2059
+#: ../mail/em-account-editor.c:2065
 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 "
@@ -9977,20 +10225,20 @@ msgstr ""
 "请在下�输入您的姓�和电�邮件地�。下�的“�选�域�必填入，除�您想�在您�"
 "出的邮件中包�此信�。"
 
-#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
+#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "接收电�邮件"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2068
 msgid "Please configure the following account settings."
 msgstr "请�置下列�户设置。"
 
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
+#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
 msgid "Sending Email"
 msgstr "��电�邮件"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2071
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9998,11 +10246,11 @@ msgstr ""
 "请在下�输入您的�件�务器信�。如果您�太确定的�，请询问您的系统管�员或者"
 "互�网�务�供商ISP。"
 
-#: ../mail/em-account-editor.c:2067
+#: ../mail/em-account-editor.c:2073
 msgid "Account Management"
 msgstr "账户管�"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10010,11 +10258,11 @@ msgstr ""
 "请在下�的空白处输入此账户的�述性�称。\n"
 "此�称将�在显示时使用。"
 
-#: ../mail/em-account-editor.c:2072
+#: ../mail/em-account-editor.c:2078
 msgid "Done"
 msgstr "完�"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2079
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10028,48 +10276,57 @@ msgstr ""
 "\n"
 "�击“应用���存您的设置。"
 
-#: ../mail/em-account-editor.c:2518
+#: ../mail/em-account-editor.c:2520
 msgid "Check for _new messages every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2528
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "默认"
-
-#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "安全"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
+#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
 msgid "Checking for New Messages"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3418
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:3408
+#: ../mail/em-account-editor.c:3418
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
-#: ../mail/em-composer-utils.c:1954
+#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
+#: ../mail/em-composer-utils.c:1578
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
+
+#. Translators: %s is the subject of the email message
+#: ../mail/em-composer-utils.c:1626
+#, fuzzy, c-format
+#| msgid "Mail Notification Properties"
+msgid "Delivery Notification for: \"%s\""
+msgstr "邮件通知属性"
+
+#: ../mail/em-composer-utils.c:1950
 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:2001
+#: ../mail/em-composer-utils.c:1997
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10077,15 +10334,15 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender}写�："
 
-#: ../mail/em-composer-utils.c:2145
+#: ../mail/em-composer-utils.c:2141
 msgid "-----Original Message-----"
 msgstr "-------- 原始信件 --------"
 
-#: ../mail/em-composer-utils.c:2326
+#: ../mail/em-composer-utils.c:2322
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:2327
+#: ../mail/em-composer-utils.c:2323
 msgid "Choose folders to post the message to."
 msgstr "选择�将信件投递到哪个文件夹。"
 
@@ -10373,17 +10630,19 @@ msgid "Folder _name:"
 msgstr "文件夹�称(_N)："
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
+#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
 #: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "�索文件夹"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "�匹�"
 
-#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
+#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "正在装入..."
 
@@ -10392,7 +10651,7 @@ msgstr "正在装入..."
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s�中扫�文件夹"
 
-#: ../mail/em-folder-tree.c:589
+#: ../mail/em-folder-tree.c:601
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹��能�有字符“/�"
 
@@ -10414,37 +10673,37 @@ msgstr "文件夹��能�有字符“/�"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1071
+#: ../mail/em-folder-tree.c:1083
 #, fuzzy, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:1277
+#: ../mail/em-folder-tree.c:1289
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s�"
 
-#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "�制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件�制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1503
+#: ../mail/em-folder-tree.c:1515
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信件放到顶级文件夹存储"
 
@@ -10456,28 +10715,28 @@ msgstr "移动文件夹到"
 msgid "Copy Folder To"
 msgstr "�制文件夹到"
 
-#: ../mail/em-folder-utils.c:499
+#: ../mail/em-folder-utils.c:507
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s�"
 
-#: ../mail/em-folder-utils.c:662
+#: ../mail/em-folder-utils.c:670
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:663
+#: ../mail/em-folder-utils.c:671
 #: ../plugins/groupwise-features/install-shared.c:175
 #: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-utils.c:679
+#: ../mail/em-folder-utils.c:687
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "无法退订文件夹“%s�"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
 msgid "Unsigned"
 msgstr "未签�"
 
@@ -10487,7 +10746,7 @@ msgid ""
 "authentic."
 msgstr "此信件未签�。无法��这�信是�信的。"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
 msgid "Valid signature"
 msgstr "有效签�"
 
@@ -10497,7 +10756,7 @@ msgid ""
 "message is authentic."
 msgstr "此信件已签�，而且签�是有效的。这�味�这�信应该是�信的。"
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
 msgid "Invalid signature"
 msgstr "无效签�"
 
@@ -10507,7 +10766,7 @@ msgid ""
 "in transit."
 msgstr "无法校验这�信的签�，�能在传�的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
 msgid "Valid signature, but cannot verify sender"
 msgstr "签�有效，但是无法校验��者"
 
@@ -10517,7 +10776,7 @@ msgid ""
 "cannot be verified."
 msgstr "这�信的签�有效，但是无法校验邮件的��者。"
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
 msgid "Signature exists, but need public key"
 msgstr "签�已存在，但需�公钥"
 
@@ -10527,7 +10786,7 @@ msgid ""
 "public key."
 msgstr "这�信的签�有效，但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
 msgid "Unencrypted"
 msgstr "未加密"
 
@@ -10537,7 +10796,7 @@ msgid ""
 "the Internet."
 msgstr "这�信未加密。在 Internet 上传�时所有人都�以看到其内容。"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
@@ -10550,7 +10809,7 @@ msgstr ""
 "这�信已加密，但使用的是弱加密算法。如果外人想�查看这�信的内容，�能�花一"
 "定时间进行暴力破解，这很困难但并�是��能。"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
 msgid "Encrypted"
 msgstr "加密"
 
@@ -10560,7 +10819,7 @@ msgid ""
 "the content of this message."
 msgstr "这�信已加密。外人�想查看这�信的内容�分困难。"
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
 msgid "Encrypted, strong"
 msgstr "强加密"
 
@@ -10602,15 +10861,15 @@ msgstr "延期："
 msgid "by"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
 msgid "View _Unformatted"
 msgstr "无格�查看(_U)"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
 msgid "Hide _Unformatted"
 msgstr "无格���(_U)"
 
-#: ../mail/em-format-html-display.c:1017
+#: ../mail/em-format-html-display.c:1021
 msgid "O_pen With"
 msgstr "打开方�(_P)"
 
@@ -10632,35 +10891,35 @@ msgstr "正在格�化信件..."
 msgid "Retrieving `%s'"
 msgstr "收�“%s�"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1859
 msgid "Unknown external-body part."
 msgstr "未知的 external-body 部分。"
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1867
 msgid "Malformed external-body part."
 msgstr "格��正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1897
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指� FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1908
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s�指�本地文件 (%1$s) �法"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指�本地文件 (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1931
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指�远程数� (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1942
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指�未知的外部数� (“%s�类型)"
@@ -10668,7 +10927,7 @@ msgstr "指�未知的外部数� (“%s�类型)"
 #. 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:2595
+#: ../mail/em-format-html.c:2602
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "此消�由 <b>%s</b> 以 <b>%s</b> 的身份��"
@@ -10694,17 +10953,17 @@ msgstr "请选择�务器。"
 msgid "No server has been selected"
 msgstr "没有选中�务器"
 
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "�自 %s 的信件"
 
-#: ../mail/em-vfolder-editor.c:124
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "�索文件夹(_F)"
 
@@ -11684,7 +11943,7 @@ msgid "Importing Elm data"
 msgstr "导入 Elm 数�"
 
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:603
+#: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "邮件"
@@ -11713,7 +11972,7 @@ msgid "Select folder to import into"
 msgstr "选择�导入到哪个文件夹"
 
 #: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:245
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
@@ -12235,7 +12494,7 @@ msgid "Use Authe_ntication"
 msgstr "使用身份验�(_N)"
 
 #: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
@@ -12779,7 +13038,7 @@ msgstr "更新“%s�的�索文件夹"
 msgid "Edit Search Folder"
 msgstr "编辑�索文件夹"
 
-#: ../mail/mail-vfolder.c:1265
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "新建�索文件夹"
 
@@ -13044,42 +13303,51 @@ msgid ""
 msgstr "如果您删除文件夹，其中的全部内容�其�文件夹内容将被永久删除。"
 
 #: ../mail/mail.error.xml.h:61
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "如果您删除文件夹，其中的全部内容�其�文件夹内容将被永久删除。"
+
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果您继续的�，全部代��务器账户都将被永久删除。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "如果您继续的�，账户信��其全部代��务器信�将被永久删除。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果您继续的�，账户信�将被永久删除。"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果您退出，这些信件将会等到 Evolution 下次�动�会�出。"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Invalid authentication"
 msgstr "无效的身份验�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mail Deletion Failed"
 msgstr "邮件删除失败"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail filters automatically updated."
 msgstr "邮件过滤器已自动更新。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13090,27 +13358,27 @@ msgstr ""
 "个邮件头，将在您的信件中列出您的全部收件人。为了��这�情况，您应该至少填入"
 "一个 To: 或 CC: 收件人。"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
 msgstr "缺少文件夹。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "No sources selected."
 msgstr "没有选中�。"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次打开太多�信�能�花一点时间。"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
 msgstr "请检查您的账户设置，然��试一次。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Please enable the account or send using another account."
 msgstr "请�用账户或者使用其它账户��。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13118,7 +13386,7 @@ msgstr ""
 "请在 To: 中输入有效的电�邮件地�。您�以�击输入框�边的 To: 按钮��索电�"
 "邮件地�。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13127,65 +13395,71 @@ msgstr ""
 "请确定下列收件人愿�并且能够接收 HTML 邮件：\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please provide an unique name to identify this signature."
 msgstr "请�供此签�的唯一标识�称。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please wait."
 msgstr "请�候。"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "��旧的邮件文件夹“{0}�出现问题。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "查询�务器所支�的身份验�算法列表。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "阅读收�已请求。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "真的�删除文件夹“{0}��其全部�文件夹�？"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
+#, fuzzy
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Really delete folder \"{0}\"?"
+msgstr "无法删除文件夹“{0}�。"
+
+#: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
 msgstr "报告垃圾邮件失败"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Report Not Junk Failed"
 msgstr "报告�垃圾邮件失败"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "�索文件夹已自动更新。"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "��收�"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "签�已�存在"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize"
 msgstr "�步"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�步文件夹到本地以脱机使用�？"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "您无法�命��移动或删除�让 Evolution 正常�作所需的系统文件夹。"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13200,7 +13474,7 @@ msgstr ""
 "个邮件头，将在您的信件中列出您的全部收件人。为了��这�情况，您应该至少填入"
 "一个 To: 或 CC: 收件人。"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13214,7 +13488,7 @@ msgstr ""
 "   “{1}�\n"
 "已�更新。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13228,79 +13502,79 @@ msgstr ""
 "   “{1}�\n"
 "已�更新。"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "脚本文件必须存在且�执行。"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "此文件夹�能已���添加了。如果需�的�，请转到�索文件夹编辑器显�添加。"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "无法��此信件，因为您所选择用���的账户未�用"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "无法��此信件，因为您没有指定任何收件人"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此�务器�支�此类型的身份验�，也�能根本�支�身份验�。"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "签�已�更改，但尚未�存。"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "这将把选中文件夹�其�文件夹中的全部信件标记为已读。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "无法连接到 GroupWise �务器。"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "无法打开此账户的�稿文件夹。使用系统的�稿文件夹�？"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "无法读�许�文件。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "使用默认值(_D)"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "使用默认的�稿文件夹�？"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13310,31 +13584,31 @@ msgstr ""
 "件。\n"
 "您真的想�这么��？"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您没有足够的��删除此邮件。"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid "You have not filled in all of the required information."
 msgstr "您没有填入所需的全部信�。"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未�信件，您�然想�退出�？"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "您�能创建两个��账户。"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "您必须为此�索文件夹命�。"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "您必须指定文件夹。"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13343,127 +13617,127 @@ msgstr ""
 "您必须一次至少指定一个文件夹作为�。\n"
 "或者�一选择文件夹，或者选中全部本地文件夹和/或全部远程文件夹。"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "您以“{0}�的身份登录到�务器“{0}�失败。"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "_Append"
 msgstr "追加(_A)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "_Discard changes"
 msgstr "丢弃更改(_D)"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "_Do not Synchronize"
 msgstr "��步(_D)"
 
-#: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:930
+#: ../mail/mail.error.xml.h:140
+#: ../modules/mail/e-mail-shell-view-actions.c:866
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "_Expunge"
 msgstr "销�(_E)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1119
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1120
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1121
 msgid "Answered"
 msgstr "已答�"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1122
 msgid "Forwarded"
 msgstr "已转�"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1123
 msgid "Multiple Unseen Messages"
 msgstr "多�未看信件"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1124
 msgid "Multiple Messages"
 msgstr "多�信"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1128
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1129
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1133
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1134
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1760
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1772
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1780
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1782
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2528
 msgid "Select all visible messages"
 msgstr "选中所有��的信件"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
 msgid "Shell Backend"
 msgstr ""
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
+#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
 msgid "Generating message list"
 msgstr "生�信件列表"
 
-#: ../mail/message-list.c:4720
+#: ../mail/message-list.c:4763
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4722
+#: ../mail/message-list.c:4765
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr ""
 
-#: ../mail/message-list.c:4724
+#: ../mail/message-list.c:4767
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信件。"
 
@@ -13501,27 +13775,27 @@ msgid "Subject - Trimmed"
 msgstr "主题 - 被截断"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1341
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Body contains"
 msgstr "邮件体�有"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1348
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "Message contains"
 msgstr "信件�有"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1355
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "Recipients contain"
 msgstr "收件人�有"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1362
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "Sender contains"
 msgstr "�件人�有"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Subject contains"
 msgstr "主题�有"
 
@@ -13603,6 +13877,7 @@ msgid "Details"
 msgstr "细节"
 
 #: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "�索"
 
@@ -13716,7 +13991,7 @@ msgid "_Contact"
 msgstr "�系人(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:763
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "创建一个新�系人"
 
@@ -13726,7 +14001,7 @@ msgid "Contact _List"
 msgstr "�系人列表(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:770
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "创建一个新的�系人列表"
 
@@ -13736,7 +14011,7 @@ msgid "Address _Book"
 msgstr "地�簿(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:693
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
 msgstr "创建新地�簿"
 
@@ -13779,17 +14054,17 @@ msgid "The contact being shown in the preview pane"
 msgstr "是�显示预览��。"
 
 #: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:613
-#: ../modules/calendar/e-task-shell-content.c:635
-#: ../modules/mail/e-mail-shell-content.c:688
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:689
 #, fuzzy
 msgid "Preview is Visible"
 msgstr "侧边���"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:614
-#: ../modules/calendar/e-task-shell-content.c:636
-#: ../modules/mail/e-mail-shell-content.c:689
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:690
 #, fuzzy
 msgid "Whether the preview pane is visible"
 msgstr "是�显示预览��。"
@@ -13844,9 +14119,9 @@ msgstr ""
 "请�候，Evolution 正在��您的 Pilot �步数�..."
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
+#: ../modules/calendar/e-cal-shell-sidebar.c:763
+#: ../modules/calendar/e-memo-shell-sidebar.c:689
+#: ../modules/calendar/e-task-shell-sidebar.c:689
 #, fuzzy
 msgid "Source Selector Widget"
 msgstr "备忘��选择器"
@@ -13861,244 +14136,244 @@ msgstr "无法获得地�簿列表"
 msgid "Save as vCard"
 msgstr "�存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:670
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "将全部�系人�制到(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:672
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "把选中文件夹中的�系人�制到其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
 #, fuzzy
 #| msgid "Del_ete Address Book"
 msgid "D_elete Address Book"
 msgstr "删除地�簿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:679
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "删除选中的文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:684
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "将全部�系人移至(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:686
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "把选中文件夹中的�系人移至其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:691
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
 msgstr "新建地�簿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:698
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
 msgid "Address _Book Properties"
 msgstr "地�簿属性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "更改选中文件夹的属性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:705
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:755
-#: ../modules/mail/e-mail-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_Rename..."
 msgstr "�命�(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "�命�选中文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:712
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
 msgstr "�存地�簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 #, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "把选中文件夹中的的�系人�存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
 msgstr "�止载入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:726
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "将�系人�制到(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "把选中的�系人�制到其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:733
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "删除�系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
 #, fuzzy
 #| msgid "_Forward Contact..."
 msgid "_Find in Contact..."
 msgstr "转��系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed contact"
 msgstr "在显示信件的主体中�索文本"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:747
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
 msgstr "转��系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:749
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "Send selected contacts to another person"
 msgstr "把选中的�系人��给其他人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:754
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "将�系人移至(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:756
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "把选中的�系人移至其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
 msgstr "新建�系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
 msgid "New Contact _List..."
 msgstr "新建�系人列表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
 msgid "_Open Contact"
 msgstr "打开�系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:777
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
 msgstr "查看当��系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:782
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
 msgid "_Send Message to Contact..."
 msgstr "给�系人�信件(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "Send a message to the selected contacts"
 msgstr "给选中的�系人�信件"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:791
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "_Actions"
 msgstr "�作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:798
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
-#: ../modules/calendar/e-task-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Save as vCard..."
 msgstr "�存为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Contact _Preview"
 msgstr "�系人预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
 msgstr "显示�系人预览窗�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
-#: ../modules/calendar/e-memo-shell-view-actions.c:738
-#: ../modules/calendar/e-task-shell-view-actions.c:902
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
-#: ../modules/calendar/e-memo-shell-view-actions.c:745
-#: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "_Vertical View"
 msgstr "垂直视图(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "显示�系人预览窗�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:905
 msgid "Any Category"
 msgstr "任何类别"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
-#: ../modules/calendar/e-cal-shell-view-actions.c:1616
-#: ../modules/calendar/e-memo-shell-view-actions.c:762
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Unmatched"
 msgstr "无匹�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
 #: ../shell/e-shell-content.c:516
 msgid "Advanced Search"
 msgstr "高级�索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "打�选中的�系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "预览将�打�的�系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
 msgstr "打�选中的�系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Save as vCard..."
 msgstr "�存为 VCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 #, fuzzy
 msgid "Save selected contacts as a vCard"
 msgstr "把选中的�系人�存为 VCard"
@@ -14300,7 +14575,7 @@ msgid "_Appointment"
 msgstr "约会(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
@@ -14328,12 +14603,12 @@ msgid "Cale_ndar"
 msgstr "日历(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2644
+#: ../plugins/itip-formatter/itip-formatter.c:2657
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
@@ -14365,9 +14640,9 @@ msgstr "无法从 evolution/config.xmldb 中��旧设置"
 msgid "Unable to migrate calendar `%s'"
 msgstr "无法��日历“%s�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:162
-#: ../modules/calendar/e-memo-shell-sidebar.c:157
-#: ../modules/calendar/e-task-shell-sidebar.c:157
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14376,37 +14651,38 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "装入日历"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:527
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
+#: ../modules/calendar/e-cal-shell-sidebar.c:743
 msgid "Date Navigator Widget"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
+#: ../modules/calendar/e-cal-shell-sidebar.c:744
 msgid "This widget displays a miniature calendar"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
+#: ../modules/calendar/e-cal-shell-sidebar.c:753
 #, fuzzy
 #| msgid "Default Mail Client"
 msgid "Default Calendar Client"
 msgstr "默认邮件客户端"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
+#: ../modules/calendar/e-cal-shell-sidebar.c:754
 msgid "Default client for calendar operations"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
+#: ../modules/calendar/e-cal-shell-sidebar.c:764
 msgid "This widget displays groups of calendars"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:949
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "在 %s 打开日历"
@@ -14430,321 +14706,307 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "销�较早的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:540
+#: ../modules/calendar/e-cal-shell-view-actions.c:534
 msgid "Copying Items"
 msgstr "�制项目"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
 msgid "Moving Items"
 msgstr "移动项目"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1097
-#, fuzzy
-#| msgid "Sent"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1098
 msgid "event"
-msgstr "已�箱"
+msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-actions.c:1100
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:507
-#: ../modules/calendar/e-task-shell-view-actions.c:632
+#: ../modules/calendar/e-memo-shell-view-actions.c:494
+#: ../modules/calendar/e-task-shell-view-actions.c:611
 msgid "Save as iCalendar"
 msgstr "�存为 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "�制(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
-#, fuzzy
-#| msgid "Select a Calendar"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "D_elete Calendar"
-msgstr "选择一个日历"
+msgstr "删除日历(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1239
 #, fuzzy
 #| msgid "Rename the selected calendar"
 msgid "Delete the selected calendar"
 msgstr "�命�选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
 msgid "Go Back"
 msgstr "�退"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
 msgid "Go Forward"
 msgstr "�进"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
 msgid "Select today"
 msgstr "选择今天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select _Date"
 msgstr "选择日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "Select a specific date"
 msgstr "选择特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Purg_e"
 msgstr "销�(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Purge old appointments and meetings"
 msgstr "销�旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-task-shell-view-actions.c:727
 msgid "Re_fresh"
 msgstr "刷新(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Refresh the selected calendar"
-msgstr "�命�选中的日历"
+msgstr "刷新选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "Rename the selected calendar"
 msgstr "�命�选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Show _Only This Calendar"
 msgstr "�显示此日历(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Cop_y to Calendar..."
 msgstr "�制到日历(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "_Delegate Meeting..."
 msgstr "代�会议(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#, fuzzy
-#| msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "_Delete Appointment"
-msgstr "删除约会"
+msgstr "删除约会(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
-#, fuzzy
-#| msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "Delete selected appointments"
-msgstr "删除约会"
+msgstr "删除选中的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Delete This _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Delete this occurrence"
 msgstr "删除此次�生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#, fuzzy
-#| msgid "Delete _All Occurrences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Delete All Occ_urrences"
-msgstr "删除所有出现(_A)"
+msgstr "删除所有出现(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete all occurrences"
 msgstr "删除全部�生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "New All Day _Event..."
 msgstr "新建全天事件(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Create a new all day event"
 msgstr "创建一个新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#: ../modules/calendar/e-task-shell-view-actions.c:692
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转�(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "New _Meeting..."
 msgstr "新建会议(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Create a new meeting"
 msgstr "创建一个新的会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Make this Occurrence _Movable"
 msgstr "将此次�生�为�移动(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "View the current appointment"
 msgstr "查看当�约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "_Reply"
 msgstr "回�(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "�存为 iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "销�旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Conv_ert to Appointment..."
 msgstr "转�到约会(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "在约会结�时 %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1550
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Show one day"
 msgstr "显示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "List"
 msgstr "列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Show as list"
 msgstr "显示为列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Show one month"
 msgstr "显示一个月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Week"
 msgstr "周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 msgid "Show one week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 #, fuzzy
 msgid "Show one work week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:786
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Description contains"
 msgstr "�述�有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#: ../modules/calendar/e-memo-shell-view-actions.c:793
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Summary contains"
 msgstr "概��有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Print this calendar"
 msgstr "打�此日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Preview the calendar to be printed"
 msgstr "预览将�打�的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Go To"
 msgstr "转到"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:505
-#, fuzzy
-#| msgid "Memo"
+#: ../modules/calendar/e-memo-shell-view-actions.c:492
 msgid "memo"
 msgstr "备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "New _Memo"
 msgstr "新建备忘(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "_Open Memo"
 msgstr "打开备忘(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "View the selected memo"
 msgstr "查看选中的备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:776
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
 msgid "Print the selected memo"
 msgstr "打�选中的备忘"
 
@@ -14753,24 +15015,22 @@ msgstr "打�选中的备忘"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:630
-#, fuzzy
-#| msgid "Task"
+#: ../modules/calendar/e-task-shell-view-actions.c:609
 msgid "task"
 msgstr "任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:671
 msgid "_Assign Task"
 msgstr "分�任务(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "_Mark as Complete"
 msgstr "标记为完�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:750
 msgid "Mark selected tasks as complete"
 msgstr "把选中任务标记为完�"
 
@@ -14779,40 +15039,39 @@ msgid "_Mark as Incomplete"
 msgstr "标记为未完�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Mark selected tasks as incomplete"
-msgstr "把选中任务标记为完�"
+msgstr "把选中任务标记为未完�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "Create a new task"
 msgstr "创建新任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "_Open Task"
 msgstr "打开任务(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "View the selected task"
 msgstr "查看选中的任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:834
-#: ../modules/calendar/e-task-shell-view-actions.c:1033
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
 msgid "_Save as iCalendar..."
 msgstr "�存为 iCalendar(_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Print the selected task"
 msgstr "打�选中的任务"
 
@@ -14836,7 +15095,7 @@ msgid "Memo Li_st"
 msgstr "备忘列表(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
@@ -14845,34 +15104,35 @@ msgstr "创建新备忘列表"
 msgid "The registry of memo lists"
 msgstr "打�备忘列表"
 
-#: ../modules/calendar/e-memo-shell-content.c:604
+#: ../modules/calendar/e-memo-shell-content.c:608
 #, fuzzy
 msgid "The memo table model"
 msgstr "表格模型"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "装入备忘"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:492
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "备忘列表选择器"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
+#: ../modules/calendar/e-memo-shell-sidebar.c:679
 #, fuzzy
 #| msgid "Default Mail Client"
 msgid "Default Memo Client"
 msgstr "默认邮件客户端"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
+#: ../modules/calendar/e-memo-shell-sidebar.c:680
 msgid "Default client for memo operations"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
+#: ../modules/calendar/e-memo-shell-sidebar.c:690
 msgid "This widget displays groups of memo lists"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:867
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
@@ -14882,88 +15142,88 @@ msgstr "在 %s 打开备忘"
 msgid "Print Memos"
 msgstr "打�备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-memo-shell-view-actions.c:554
 msgid "_Delete Memo"
 msgstr "删除备忘(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:561
 #, fuzzy
 #| msgid "_Find in Message..."
 msgid "_Find in Memo..."
 msgstr "在信件中查找(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:563
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed memo"
 msgstr "在显示信件的主体中�索文本"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
 #, fuzzy
 #| msgid "Delete Memos"
 msgid "D_elete Memo List"
 msgstr "删除备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 #, fuzzy
 msgid "Delete the selected memo list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "_New Memo List"
 msgstr "新建备忘列表(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "�显示此备忘列表(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-memo-shell-view-actions.c:696
 msgid "Memo _Preview"
 msgstr "备忘预览(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:698
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "显示预览��"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
 msgid "Print the list of memos"
 msgstr "打�备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "预览�打�的备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:414
+#: ../modules/calendar/e-memo-shell-view-private.c:416
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:418
-#: ../modules/calendar/e-task-shell-view-private.c:567
+#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "，已选中 %d 个"
@@ -14999,7 +15259,7 @@ msgid "Tas_k List"
 msgstr "任务列表(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
@@ -15008,7 +15268,7 @@ msgstr "创建新任务列表"
 msgid "The registry of task lists"
 msgstr "打�任务列表"
 
-#: ../modules/calendar/e-task-shell-content.c:626
+#: ../modules/calendar/e-task-shell-content.c:630
 #, fuzzy
 msgid "The task table model"
 msgstr "表格模型"
@@ -15030,42 +15290,43 @@ msgstr ""
 msgid "Unable to migrate tasks `%s'"
 msgstr "无法��任务“%s�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:492
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 #, fuzzy
 msgid "Task List Selector"
 msgstr "任务��选择器"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
+#: ../modules/calendar/e-task-shell-sidebar.c:679
 #, fuzzy
 #| msgid "Default Mail Client"
 msgid "Default Task Client"
 msgstr "默认邮件客户端"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:678
+#: ../modules/calendar/e-task-shell-sidebar.c:680
 #, fuzzy
 #| msgid "Default value for thread expand state"
 msgid "Default client for task operations"
 msgstr "�题的默认展开状�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:688
+#: ../modules/calendar/e-task-shell-sidebar.c:690
 msgid "This widget displays groups of task lists"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-sidebar.c:867
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "打�任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:574
+#: ../modules/calendar/e-task-shell-view-actions.c:553
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15076,116 +15337,116 @@ msgstr ""
 "\n"
 "确实删除这些任务�？"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:678
 msgid "_Delete Task"
 msgstr "删除任务(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:685
 #, fuzzy
 #| msgid "_Find in Message..."
 msgid "_Find in Task..."
 msgstr "在信件中查找(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed task"
 msgstr "在显示信件的主体中�索文本"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:699
 msgid "Copy..."
 msgstr "�制..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:706
 #, fuzzy
 #| msgid "Delete Tasks"
 msgid "D_elete Task List"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "�命�选中文件夹"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Show _Only This Task List"
 msgstr "�显示此任务列表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:755
 msgid "Mar_k as Incomplete"
 msgstr "标记为未完�(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Delete completed tasks"
 msgstr "删除已完�的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/calendar/e-task-shell-view-actions.c:860
 msgid "Task _Preview"
 msgstr "任务预览(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:862
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "显示预览��"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/calendar/e-task-shell-view-actions.c:883
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:898
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:912
 msgid "Completed Tasks"
 msgstr "已完�任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:919
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-task-shell-view-actions.c:983
 msgid "Print the list of tasks"
 msgstr "打�任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "预览�打�的任务列表"
 
-#: ../modules/calendar/e-task-shell-view-private.c:461
+#: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
 msgstr "销�"
 
-#: ../modules/calendar/e-task-shell-view-private.c:563
+#: ../modules/calendar/e-task-shell-view-private.c:565
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15251,365 +15512,373 @@ msgstr "编写器首选项"
 msgid "Network Preferences"
 msgstr "网络首选项"
 
-#: ../modules/mail/e-mail-shell-content.c:678
+#: ../modules/mail/e-mail-shell-content.c:679
 #, fuzzy
 #| msgid "_Group By Threads"
 msgid "Group by Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-content.c:679
+#: ../modules/mail/e-mail-shell-content.c:680
 msgid "Whether to group messages by threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:923
-#: ../modules/mail/e-mail-shell-view.c:526
+#: ../modules/mail/e-mail-shell-view-actions.c:859
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "�用账户(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:861
 msgid "Disable this account"
 msgstr "�用这个账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
+#: ../modules/mail/e-mail-shell-view-actions.c:868
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:937
+#: ../modules/mail/e-mail-shell-view-actions.c:873
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建�索文件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:944
+#: ../modules/mail/e-mail-shell-view-actions.c:880
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信件以离线使用(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "为标记为脱机的�户/文件夹下载信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "Fl_ush Outbox"
 msgstr "清空�件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:958
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "_Copy Folder To..."
 msgstr "文件夹�制到(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:896
 msgid "Copy the selected folder into another folder"
 msgstr "把选中的文件夹�制到其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:972
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "E_xpunge"
 msgstr "销�(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:910
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "从该文件夹永久删除所有已删除的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:979
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "Mar_k All Messages as Read"
 msgstr "把全部信件标记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Mark all messages in the folder as read"
 msgstr "将此文件夹中的所有信件标记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:986
+#: ../modules/mail/e-mail-shell-view-actions.c:922
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:988
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Move the selected folder into another folder"
 msgstr "把选中的文件夹移至其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:993
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:995
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Create a new folder for storing mail"
 msgstr "创建存储邮件的新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1002
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Change the properties of this folder"
 msgstr "更改此文件夹的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1016
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的�称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:957
 msgid "Select Message _Thread"
 msgstr "选择信件线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1023
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Select all messages in the same thread as the selected message"
 msgstr "把�一线索中的所有信件选择为选中信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:964
 msgid "Select Message S_ubthread"
 msgstr "选择信件�线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1030
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Select all replies to the currently selected message"
 msgstr "选择当�选中信件的所有回�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1035
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 #, fuzzy
 msgid "Unsubscribe from the selected folder"
 msgstr "�命�选中文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Empty _Trash"
 msgstr "清空回收站(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久删除所有文件夹中的所有已删除的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "N_one"
 msgstr "æ— (_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1063
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Hide _Read Messages"
 msgstr "��已读的信件(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1065
+#: ../modules/mail/e-mail-shell-view-actions.c:1003
 msgid "Temporarily hide all messages that have already been read"
 msgstr "暂时��所有已读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:1008
 msgid "Hide S_elected Messages"
 msgstr "��选中的信件(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1072
+#: ../modules/mail/e-mail-shell-view-actions.c:1010
 msgid "Temporarily hide the selected messages"
 msgstr "暂时��选中信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1077
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "Show Hidde_n Messages"
 msgstr "显示��的信件(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1079
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
 msgid "Show messages that have been temporarily hidden"
 msgstr "显示暂时被��的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1100
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "�消当�邮件�作"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "折�全部线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
 msgstr "折�全部信件线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "展开全部线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
 msgstr "展开全部信件线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
 msgstr "信件过滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "�索文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 #, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "创建或编辑�索文件夹定义"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "订阅(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程�务器上的文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Hide _Deleted Messages"
 msgstr "��已删除的信件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "��已删除的信件而�是在上�显示一�线"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Show Message _Preview"
 msgstr "显示信件预览(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "显示信件预览窗�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 #, fuzzy
 msgid "Threaded message list"
 msgstr "按线索编排的信件列表"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Show message preview below the message list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "All Messages"
 msgstr "全部信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Important Messages"
 msgstr "��信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Last 5 Days' Messages"
 msgstr "�五天的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Messages Not Junk"
 msgstr "�是垃圾邮件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Messages with Attachments"
 msgstr "有附件的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "Read Messages"
 msgstr "已读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1255
 msgid "Recent Messages"
 msgstr "最近信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "Unread Messages"
 msgstr "未读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "主题或��者�有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "All Accounts"
 msgstr "全部账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Current Account"
 msgstr "当�账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Current Folder"
 msgstr "当�文件夹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:836
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:847
+#: ../modules/mail/e-mail-shell-view-private.c:902
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:853
-#: ../modules/mail/e-mail-shell-view-private.c:860
+#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:915
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:866
+#: ../modules/mail/e-mail-shell-view-private.c:921
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ��稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:872
+#: ../modules/mail/e-mail-shell-view-private.c:927
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d �未�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:878
+#: ../modules/mail/e-mail-shell-view-private.c:933
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d �已�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:890
+#: ../modules/mail/e-mail-shell-view-private.c:945
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "，%d �未读，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:893
+#: ../modules/mail/e-mail-shell-view-private.c:948
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d �"
 
-#: ../modules/mail/e-mail-shell-view.c:524
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "全部账户�索"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "账户�索"
+
+#: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
 msgstr "代��务器注销(_L)"
 
@@ -15829,118 +16098,116 @@ msgstr "��设置(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "备份��� Evolution 的数�和设置"
 
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
 msgid "Backup Evolution directory"
 msgstr "备份 Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
 msgid "Restore Evolution directory"
 msgstr "�� Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
 msgid "Check Evolution Backup"
 msgstr "检查 Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
 msgid "Restart Evolution"
 msgstr "�新�动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
 msgid "With Graphical User Interface"
 msgstr "带图形用户界�"
 
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
 msgid "Shutting down Evolution"
 msgstr "关闭 Evolution"
 
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
 msgid "Backing Evolution accounts and settings"
 msgstr "备份 Evolution 的账户�设置"
 
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "备份 Evolution 数�(邮件��系人�日历�任务�备忘)"
 
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
 msgstr "备份完�"
 
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:285
 msgid "Restarting Evolution"
 msgstr "�新�动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
 msgid "Backup current Evolution data"
 msgstr "备份当� Evolution 数�"
 
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
 msgstr "从备份中��文件"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
 msgid "Loading Evolution settings"
 msgstr "装入 Evolution 的设置"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:274
 msgid "Removing temporary backup files"
 msgstr "删除临时备份文件"
 
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:281
 msgid "Ensuring local sources"
 msgstr "确�本地�"
 
-#: ../plugins/backup-restore/backup.c:427
+#: ../plugins/backup-restore/backup.c:428
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:433
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "正在从文件夹 %s 中��"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Backup"
 msgstr "Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:452
+#: ../plugins/backup-restore/backup.c:453
 msgid "Evolution Restore"
 msgstr "Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:487
+#: ../plugins/backup-restore/backup.c:488
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数�"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:489
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请�候，Evolution 正在备份您的数�。"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:491
 msgid "Restoring Evolution Data"
 msgstr "正在�� Evolution 数�"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:492
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请�候，Evolution 正在��您的数�。"
 
-#: ../plugins/backup-restore/backup.c:509
+#: ../plugins/backup-restore/backup.c:510
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这�能�花一点时间，�决于您�户中的数�总�。"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#, fuzzy
 msgid "Backup and Restore"
-msgstr "备份����件"
+msgstr "备份���"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
 msgid "Backup and restore your Evolution data and settings."
-msgstr "备份��� Evolution 的数�和设置"
+msgstr "备份��� Evolution 的数�和设置。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16081,9 +16348,8 @@ msgstr ""
 "将信件文本转�到 Unicode UTF-8 以一致化�自于��字符集的垃圾信件特�。"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter 垃圾选项"
+msgstr "Bogofilter 垃圾过滤器"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
 msgid "Bogofilter Options"
@@ -16233,7 +16499,7 @@ msgid "_URL:"
 msgstr "_URL："
 
 #: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
@@ -16245,7 +16511,7 @@ msgstr ""
 #: ../plugins/calendar-file/calendar-file.c:178
 #: ../plugins/calendar-http/calendar-http.c:111
 #: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "刷新(_F)："
@@ -16664,12 +16930,12 @@ msgstr "这个文件�能被读�"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/google-account-setup/google-contacts-source.c:273
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>�务器</b>"
@@ -16830,7 +17096,7 @@ msgstr ""
 msgid "Message retracted successfully"
 msgstr "邮件�功收回"
 
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../plugins/groupwise-features/mail-send-options.c:202
 msgid "Insert Send options"
 msgstr "�入��选项"
 
@@ -17038,8 +17304,8 @@ msgstr "<b>账户�</b>"
 msgid "Proxy Login"
 msgstr "代��务器登录"
 
-#: ../plugins/groupwise-features/proxy-login.c:209
-#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy-login.c:210
+#: ../plugins/groupwise-features/proxy-login.c:253
 #: ../plugins/groupwise-features/proxy.c:495
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -17086,56 +17352,52 @@ msgstr "自定义通知"
 msgid "Add   "
 msgstr "添加"
 
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "修改"
-
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "信件状�"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "主题："
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "�件人："
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "创建日期："
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "收件人："
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "已投递："
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "已打开："
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "已接�："
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "已删除："
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "已拒�："
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "已完�："
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "未投递："
 
@@ -17208,196 +17470,195 @@ msgstr "调整您的 IMAP 账户。"
 msgid "IMAP Features"
 msgstr "IMAP 特性"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
-#: ../plugins/itip-formatter/itip-formatter.c:619
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%s�失败"
 
-#: ../plugins/itip-formatter/itip-formatter.c:639
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s�中的一个约会与此会议冲�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:675
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s�中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:774
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:781
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:785
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:873
 #, fuzzy
 msgid "Opening the calendar. Please wait.."
 msgstr "打开日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:863
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "�索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1044
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "无法分�项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目��到日历“%s�。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1143
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s���为已接�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s���为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1152
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s���为已拒�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s���为已�消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已�删除了代�人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代�人��了�消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代�人���消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状�无法更新，原因是状�无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1400
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "出席者状�已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1430
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "会议信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "任务信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "备忘信�已��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1445
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法��会议信�，会议�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法��任务信�，任务�存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法��备忘信�，备忘�存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Save Calendar"
 msgstr "�存日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1574
-#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包�日历，但日历�是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1626
-#: ../plugins/itip-formatter/itip-formatter.c:1654
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 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:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包�多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�处�这些全部项目，应该�存文件并导入日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2434
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "此会议�现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2437
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "此任务�现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2440
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "此备忘�现"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "�作�删除消�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2679
-#: ../plugins/itip-formatter/itip-formatter.c:2712
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "冲��索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择��索冲�会议的日历"
 
@@ -17758,7 +18019,7 @@ msgstr "<b>%s</b> �消了下列共享备忘："
 
 #: ../plugins/itip-formatter/itip-view.c:676
 msgid "All day:"
-msgstr ""
+msgstr "全天："
 
 #: ../plugins/itip-formatter/itip-view.c:686
 msgid "Start day:"
@@ -17766,7 +18027,7 @@ msgstr "开始日期："
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1041
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Start time:"
 msgstr "开始时间："
 
@@ -17776,7 +18037,7 @@ msgstr "结�日期："
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../plugins/itip-formatter/itip-view.c:1056
 msgid "End time:"
 msgstr "结�时间："
 
@@ -17835,41 +18096,41 @@ msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1072
-#: ../plugins/itip-formatter/itip-view.c:1126
+#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1130
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:1111
+#: ../plugins/itip-formatter/itip-view.c:1115
 msgid "Send _reply to sender"
 msgstr "回��件人(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
+#: ../plugins/itip-formatter/itip-view.c:1145
 msgid "Send _updates to attendees"
 msgstr "给出席者��更新(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1150
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Apply to all instances"
 msgstr "应用到全部实例(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1159
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "Show time as _free"
 msgstr "将时间显示为空闲(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1166
 msgid "_Preserve my reminder"
 msgstr "�留我的�醒(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1168
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "_Inherit reminder"
 msgstr "继承�示(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
+#: ../plugins/itip-formatter/itip-view.c:1915
 msgid "_Tasks:"
 msgstr "任务(_T)："
 
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../plugins/itip-formatter/itip-view.c:1917
 msgid "_Memos:"
 msgstr "备忘(_M)："
 
@@ -18366,7 +18627,7 @@ msgstr "在当�文件夹和�文件夹(_S)"
 msgid "In Current _Folder Only"
 msgstr "�在当�文件夹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:349
+#: ../plugins/mark-all-read/mark-all-read.c:402
 msgid "Mark Me_ssages as Read"
 msgstr "把信件标记为已读(_S)"
 
@@ -18505,14 +18766,12 @@ msgstr "任务(_T)"
 
 #. Journal
 #: ../plugins/pst-import/pst-importer.c:336
-#, fuzzy
 msgid "_Journal entries"
-msgstr "日记"
+msgstr "日记项(_J)"
 
 #: ../plugins/pst-import/pst-importer.c:351
-#, fuzzy
 msgid "Importing Outlook data"
-msgstr "导入 Elm 数�"
+msgstr "导入 Outlook 数�"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
@@ -18674,11 +18933,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "�能�布日历：日历�端已��存在了"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:474
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "新建�置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "编辑�置"
 
@@ -18745,75 +19004,75 @@ 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:157
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:353
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "�述列表"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "类别列表"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "注释列表"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "�系人列表"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "开始"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "结�"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "完�百分比"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "出席者列表"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../plugins/save-calendar/csv-format.c:520
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV 格�的高级选项(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:527
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "预置标头(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:536
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "数值分隔符(_V)："
 
-#: ../plugins/save-calendar/csv-format.c:543
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "记录分隔符(_R)："
 
-#: ../plugins/save-calendar/csv-format.c:550
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "�装数值使用(_E)："
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "逗�分隔的值格�(.csv)"
 
@@ -18873,15 +19132,15 @@ msgstr "指引您进行�始�户的设置。"
 msgid "Setup Assistant"
 msgstr "设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
@@ -18893,26 +19152,26 @@ msgstr ""
 "\n"
 "请�击“�进�按钮继续。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../widgets/misc/e-import-assistant.c:385
 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:168
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:185
 msgid "Importing files"
 msgstr "导入文件"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:248
 msgid "Importing data."
 msgstr "正在导入数�。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:250
 msgid "Please wait"
 msgstr "请�候"
 
@@ -19055,31 +19314,41 @@ msgid "Default window width"
 msgstr "默认窗�宽度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+#| msgid "Enable search folders"
+msgid "Enable express mode"
+msgstr "�用�索文件夹"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "在互�网上连接到 HTTP/HTTPS 时，�用代�设置。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "HTTP 代�主机�称"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "HTTP 代�密�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "HTTP 代�端�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "HTTP 代�用户�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "�动时默认显示的组件 ID 或别�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19087,62 +19356,62 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "�始附件视图"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "�始文件选择器文件夹"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 对�框的起始文件夹。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "上次�级的�置版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "列出脱机使用时��步到�盘的文件夹路径"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "�代�主机"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "用于 HTTP 代�认�的密�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "代��置模�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 代�主机�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "SOCKS 代�端�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "安全 HTTP 代�主机�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "安全 HTTP 代�端�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19150,87 +19419,87 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "侧边���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "跳过开�警告对�框"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "以脱机模��动"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "状����"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Evolution 的�置版本，带主/次/�置级别(如“2.6.0�)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 #, fuzzy
 msgid "The default X coordinate for the main window."
 msgstr "主窗�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 #, fuzzy
 msgid "The default Y coordinate for the main window."
 msgstr "主窗�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "主窗�的默认高度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "主窗�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "侧边�的默认宽度，以�素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "上次�级的 Evolution �置版本，带主/次/�置级别(如“2.6.0�)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
 msgstr "代� HTTP 的机器�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "代�安全 HTTP 的机器�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
 msgstr "代�套接字的机器�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19239,7 +19508,7 @@ msgstr ""
 "窗�按钮的样�。�以是“text�(文字)�“icon�(图标)�“both�(二者)�“toolbar�(工"
 "具�)。如果设置为“toolbar�(工具�)，则工具�的样�由 GNOME 设置决定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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 "
@@ -19247,57 +19516,57 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "工具���"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "上次�级的�置版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "使用 HTTP 代�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "用于 HTTP 代�认�的用户�。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "是�以脱机模�而��机模��动 Evolution。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
 msgstr "窗�是�应为最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "侧边�是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
 msgstr "状��是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
 msgstr "工具�是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是�跳过 Evoltuion 开�版本的警告。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
 msgstr "窗�按钮是���。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "窗�按钮样�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "窗�按钮��"
 
@@ -19318,19 +19587,19 @@ msgstr "%ld KB"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:687
+#: ../shell/e-shell-searchbar.c:883
 msgid "Sho_w:"
 msgstr "显示(_W)："
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:714
+#: ../shell/e-shell-searchbar.c:910
 msgid "Sear_ch:"
 msgstr "�索(_C)："
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:769
+#: ../shell/e-shell-searchbar.c:970
 msgid "i_n"
 msgstr "在(_N) "
 
@@ -19342,7 +19611,7 @@ msgstr "工具�样�"
 msgid "The switcher's toolbar style"
 msgstr ""
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:743
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
 msgstr "工具���"
 
@@ -19350,105 +19619,105 @@ msgstr "工具���"
 msgid "Whether the switcher is visible"
 msgstr "切�器是���"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:247
 #, fuzzy
 #| msgid "vCard (.vcf, .gcrd)"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../shell/e-shell-utils.c:222
+#: ../shell/e-shell-utils.c:249
 #, fuzzy
 #| msgid "iCalendar files (.ics)"
 msgid "iCalendar (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:270
 #, fuzzy
 #| msgid "All files"
 msgid "All Files (*)"
 msgstr "全部文件"
 
-#: ../shell/e-shell-view.c:604
+#: ../shell/e-shell-view.c:681
 #, fuzzy
 msgid "Switcher Action"
 msgstr "切�到 %s"
 
-#: ../shell/e-shell-view.c:605
+#: ../shell/e-shell-view.c:682
 msgid "The switcher action for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:620
+#: ../shell/e-shell-view.c:697
 msgid "Page Number"
 msgstr "页�"
 
-#: ../shell/e-shell-view.c:621
+#: ../shell/e-shell-view.c:698
 msgid "The notebook page number of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:637
+#: ../shell/e-shell-view.c:714
 #, fuzzy
 #| msgid "Search Filter"
 msgid "Search Rule"
 msgstr "�索过滤器"
 
-#: ../shell/e-shell-view.c:638
+#: ../shell/e-shell-view.c:715
 #, fuzzy
 msgid "Criteria for the current search results"
 msgstr "�消当�邮件�作"
 
-#: ../shell/e-shell-view.c:653
+#: ../shell/e-shell-view.c:730
 msgid "The EShellBackend for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:668
+#: ../shell/e-shell-view.c:745
 msgid "Shell Content Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:669
+#: ../shell/e-shell-view.c:746
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:685
+#: ../shell/e-shell-view.c:762
 #, fuzzy
 msgid "Shell Sidebar Widget"
 msgstr "默认侧边�宽度"
 
-#: ../shell/e-shell-view.c:686
+#: ../shell/e-shell-view.c:763
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:701
+#: ../shell/e-shell-view.c:778
 #, fuzzy
 msgid "Shell Taskbar Widget"
 msgstr "选择任务列表"
 
-#: ../shell/e-shell-view.c:702
+#: ../shell/e-shell-view.c:779
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 
-#: ../shell/e-shell-view.c:717
+#: ../shell/e-shell-view.c:794
 #, fuzzy
 msgid "Shell Window"
 msgstr "新建窗�(_W)"
 
-#: ../shell/e-shell-view.c:718
+#: ../shell/e-shell-view.c:795
 msgid "The window to which the shell view belongs"
 msgstr ""
 
-#: ../shell/e-shell-view.c:734
+#: ../shell/e-shell-view.c:811
 msgid "The key file holding widget state data"
 msgstr ""
 
-#: ../shell/e-shell-view.c:749
+#: ../shell/e-shell-view.c:826
 msgid "The title of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:763
+#: ../shell/e-shell-view.c:840
 #, fuzzy
 msgid "Current View ID"
 msgstr "当�视图(_C)"
 
-#: ../shell/e-shell-view.c:764
+#: ../shell/e-shell-view.c:841
 #, fuzzy
 msgid "The current GAL view ID"
 msgstr "当�时间"
@@ -19456,321 +19725,306 @@ msgstr "当�时间"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "开�软件国际化之简体中文组\n"
 "http://i18n.linux.net.cn"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-actions.c:1223
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1224
 msgid "Bug Buddy is not installed."
-msgstr "未安装 Bug buddy。"
+msgstr "未安装 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1225
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Bug Buddy could not be run."
-msgstr "无法�行 Bug buddy。"
+msgstr "无法�行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1327
+#: ../shell/e-shell-window-actions.c:1343
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot 没有安装。"
 
-#: ../shell/e-shell-window-actions.c:1329
+#: ../shell/e-shell-window-actions.c:1345
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot �能�行。"
 
-#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信�"
 
-#: ../shell/e-shell-window-actions.c:1428
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Close Window"
 msgstr "关闭窗�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1435
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1451
 msgid "_Contents"
-msgstr "�系人"
+msgstr "目录(_C)"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指�"
 
-#: ../shell/e-shell-window-actions.c:1463
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "打开 FAQ 网页"
 
-#: ../shell/e-shell-window-actions.c:1470
+#: ../shell/e-shell-window-actions.c:1486
 msgid "_Forget Passwords"
 msgstr "丢弃密�(_F)"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Forget all remembered passwords"
 msgstr "忘记所有记�的密�"
 
-#: ../shell/e-shell-window-actions.c:1477
+#: ../shell/e-shell-window-actions.c:1493
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Import data from other programs"
 msgstr "从其它程�导入数�"
 
-#: ../shell/e-shell-window-actions.c:1484
+#: ../shell/e-shell-window-actions.c:1500
 msgid "New _Window"
 msgstr "新建窗�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗��显示这个视图"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Configure Evolution"
 msgstr "�置 Evolution"
 
-#: ../shell/e-shell-window-actions.c:1505
+#: ../shell/e-shell-window-actions.c:1521
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1507
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Show Evolution's shortcut keys"
-msgstr "更改 Evolution 的设置"
+msgstr "显示 Evolution 的快�键"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Exit the program"
 msgstr "退出程�"
 
-#: ../shell/e-shell-window-actions.c:1519
+#: ../shell/e-shell-window-actions.c:1535
 msgid "_Advanced Search..."
 msgstr "高级�索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1544
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "�消当�邮件�作"
 
-#: ../shell/e-shell-window-actions.c:1533
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Edit Saved Searches..."
 msgstr "编辑�存的�索(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Manage your saved searches"
 msgstr "管�您�存的�索"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Click here to change the search type"
 msgstr "�击此处更改�索类型"
 
-#: ../shell/e-shell-window-actions.c:1547
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Find Now"
 msgstr "立�查找(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1549
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Execute the current search parameters"
-msgstr "�消当�邮件�作"
+msgstr "执行当��索�数"
 
-#: ../shell/e-shell-window-actions.c:1554
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Save Search..."
 msgstr "�存�索(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1556
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Save the current search parameters"
-msgstr "�存当�文件"
+msgstr "�存当��索�数"
 
-#: ../shell/e-shell-window-actions.c:1568
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Send / _Receive"
 msgstr "��/接收(_R)"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Send queued items and retrieve new items"
 msgstr "��队列中的的邮件并收�新邮件"
 
-#: ../shell/e-shell-window-actions.c:1575
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Submit _Bug Report..."
-msgstr "�交错误报告(_B)"
+msgstr "�交错误报告(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy �交错误报告"
 
-#: ../shell/e-shell-window-actions.c:1582
-#, fuzzy
-#| msgid "_Synchronization Options..."
+#: ../shell/e-shell-window-actions.c:1598
 msgid "GNOME Pilot _Synchronization..."
-msgstr "�步选项(_S)..."
+msgstr "GNOME Pilot �步(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1584
-#, fuzzy
-#| msgid "Set up Pilot configuration"
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Set up GNOME Pilot configuration"
-msgstr "�置 Pilot"
+msgstr "设置 GNOME Pilot �置"
 
-#: ../shell/e-shell-window-actions.c:1589
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1591
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Put Evolution into offline mode"
-msgstr "以脱机模��动"
+msgstr "将 Evolution 转入脱机模�"
 
-#: ../shell/e-shell-window-actions.c:1596
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Online"
 msgstr "�机工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1598
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into online mode"
-msgstr "以�机模��动"
+msgstr "将 Evolution 转入�机模�"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1642
 msgid "Lay_out"
 msgstr "布局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1640
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Search"
 msgstr "�索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Switcher Appearance"
 msgstr "切�器外观(_S)"
 
-#: ../shell/e-shell-window-actions.c:1661
+#: ../shell/e-shell-window-actions.c:1677
 msgid "_Window"
 msgstr "窗�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show Side _Bar"
 msgstr "显示侧边�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show the side bar"
 msgstr "显示侧边�"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show the switcher buttons"
 msgstr "显示切�器按钮"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Show _Status Bar"
 msgstr "显示状��(_S)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Show the status bar"
 msgstr "显示状��"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Show _Tool Bar"
 msgstr "显示工具�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1716
-#, fuzzy
-#| msgid "Show the toolbar"
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Show the tool bar"
 msgstr "显示工具�"
 
-#: ../shell/e-shell-window-actions.c:1738
+#: ../shell/e-shell-window-actions.c:1754
 msgid "_Icons Only"
 msgstr "�有图标(_I)"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons only"
 msgstr "显示�有图标的窗�按钮"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Text Only"
 msgstr "�有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with text only"
 msgstr "显示�有文字的窗�按钮"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗�按钮"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Tool_bar Style"
 msgstr "工具�样�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌�工具�设置显示窗�按钮"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Define Views..."
 msgstr "定义视图..."
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Create or edit views"
 msgstr "创建或编辑视图"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Save Custom View..."
 msgstr "�存当�视图..."
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Save current custom view"
 msgstr "�存当�自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1801
 msgid "C_urrent View"
 msgstr "当�视图(_U)"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1811
 msgid "Custom View"
 msgstr "当�视图"
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1813
 msgid "Current view is a customized view"
 msgstr "当�视图为自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1823
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "设定您当�打�机的页�设置"
 
-#: ../shell/e-shell-window-actions.c:2127
+#: ../shell/e-shell-window-actions.c:2200
 #, c-format
 msgid "Switch to %s"
 msgstr "切�到 %s"
 
-#: ../shell/e-shell-window-actions.c:2337
+#: ../shell/e-shell-window-actions.c:2413
 msgid "Execute these search parameters"
 msgstr ""
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:552
+#: ../shell/e-shell-window-private.c:571
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19779,127 +20033,123 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "新建"
 
-#: ../shell/e-shell-window.c:619
+#: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
 msgstr ""
 
-#: ../shell/e-shell-window.c:620
+#: ../shell/e-shell-window.c:617
 #, fuzzy
 msgid "Name of the active shell view"
 msgstr "新视图的�称："
 
-#: ../shell/e-shell-window.c:635
+#: ../shell/e-shell-window.c:632
 msgid "The shell window's EFocusTracker"
 msgstr ""
 
-#: ../shell/e-shell-window.c:649 ../shell/e-shell.c:772
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
 msgid "Geometry"
 msgstr ""
 
-#: ../shell/e-shell-window.c:650 ../shell/e-shell.c:773
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
 msgid "Initial window geometry string"
 msgstr ""
 
-#: ../shell/e-shell-window.c:665
+#: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
 msgstr "安全模�"
 
-#: ../shell/e-shell-window.c:666
+#: ../shell/e-shell-window.c:663
 #, fuzzy
 msgid "Whether the shell window is in safe mode"
 msgstr "�件是�已�用"
 
-#: ../shell/e-shell-window.c:697
+#: ../shell/e-shell-window.c:694
 #, fuzzy
 #| msgid "Sidebar is visible"
 msgid "Sidebar Visible"
 msgstr "侧边���"
 
-#: ../shell/e-shell-window.c:698
+#: ../shell/e-shell-window.c:695
 #, fuzzy
 #| msgid "Whether the switcher is visible"
 msgid "Whether the shell window's side bar is visible"
 msgstr "切�器是���"
 
-#: ../shell/e-shell-window.c:712
+#: ../shell/e-shell-window.c:709
 #, fuzzy
 #| msgid "Sidebar is visible"
 msgid "Switcher Visible"
 msgstr "侧边���"
 
-#: ../shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:710
 #, fuzzy
 #| msgid "Whether the window buttons should be visible."
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr "窗�按钮是���。"
 
-#: ../shell/e-shell-window.c:728
-#, fuzzy
-#| msgid "Toolbar Visible"
+#: ../shell/e-shell-window.c:725
 msgid "Taskbar Visible"
-msgstr "工具���"
+msgstr "任务���"
 
-#: ../shell/e-shell-window.c:729
+#: ../shell/e-shell-window.c:726
 #, fuzzy
 #| msgid "Whether the switcher is visible"
 msgid "Whether the shell window's task bar is visible"
 msgstr "切�器是���"
 
-#: ../shell/e-shell-window.c:744
+#: ../shell/e-shell-window.c:741
 #, fuzzy
 #| msgid "Whether the switcher is visible"
 msgid "Whether the shell window's tool bar is visible"
 msgstr "切�器是���"
 
-#: ../shell/e-shell-window.c:758
+#: ../shell/e-shell-window.c:755
 msgid "UI Manager"
 msgstr "UI 管�器"
 
-#: ../shell/e-shell-window.c:759
+#: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
 msgstr ""
 
-#: ../shell/e-shell.c:213
+#: ../shell/e-shell.c:212
 msgid "Preparing to go offline..."
 msgstr "正在准备离线..."
 
-#: ../shell/e-shell.c:267
+#: ../shell/e-shell.c:262
 msgid "Preparing to go online..."
 msgstr "正在准备上线..."
 
-#: ../shell/e-shell.c:339
+#: ../shell/e-shell.c:330
 msgid "Preparing to quit..."
-msgstr ""
+msgstr "正在准备退出..."
 
-#: ../shell/e-shell.c:788
-#, fuzzy
-#| msgid "Save directory"
+#: ../shell/e-shell.c:820
 msgid "Module Directory"
-msgstr "�存目录"
+msgstr "模�目录"
 
-#: ../shell/e-shell.c:789
+#: ../shell/e-shell.c:821
 msgid "The directory from which to load EModules"
 msgstr ""
 
-#: ../shell/e-shell.c:804
+#: ../shell/e-shell.c:836
 msgid "Network Available"
 msgstr "网络�用"
 
-#: ../shell/e-shell.c:805
+#: ../shell/e-shell.c:837
 msgid "Whether the network is available"
 msgstr "网络是��用"
 
-#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
 msgid "Online"
 msgstr "在线"
 
-#: ../shell/e-shell.c:821
+#: ../shell/e-shell.c:853
 #, fuzzy
 msgid "Whether the shell is online"
 msgstr "�件是�已�用"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:167
+#: ../shell/main.c:168
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19931,7 +20181,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享�我们努力工作的�果，我们也热切盼望�您的���\n"
 
-#: ../shell/main.c:191
+#: ../shell/main.c:192
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19939,57 +20189,59 @@ msgstr ""
 "æ„Ÿè°¢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:198
+#: ../shell/main.c:199
 msgid "Do not tell me again"
 msgstr "���通知我"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "�动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:324
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "以�机模��动"
 
-#: ../shell/main.c:327
-#, fuzzy
+#: ../shell/main.c:330
+msgid "Start in \"express\" mode"
+msgstr "以“快速�模��动"
+
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
-msgstr "强制关闭所有 Evolution 组件"
+msgstr "强制关闭所有 Evolution"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:337
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 �新��"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有�员的调试输出��到一个文件中。"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "�止装入任何�件。"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "�用邮件��系人和任务的预览��。"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:344
-#, fuzzy
+#: ../shell/main.c:350
 msgid "Request a running Evolution process to quit"
-msgstr "�新�动 Evolution"
+msgstr "请求正在�行的 Evolution 进程退出"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:465
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信�管�和邮件客户"
 
-#: ../shell/main.c:524
+#: ../shell/main.c:491
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20124,7 +20376,7 @@ msgstr "文件�是一个有效的 .desktop 文件"
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
+msgstr "无法识别的桌�文件版本“%s�"
 
 #: ../smclient/eggdesktopfile.c:958
 #, c-format
@@ -20134,12 +20386,12 @@ msgstr "�动 %s"
 #: ../smclient/eggdesktopfile.c:1100
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "应用程�在命令行上�接�文档"
 
 #: ../smclient/eggdesktopfile.c:1168
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "无法识别的调用选项：%d"
 
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
@@ -20178,9 +20430,8 @@ msgid "Session management options:"
 msgstr ""
 
 #: ../smclient/eggsmclient.c:255
-#, fuzzy
 msgid "Show session management options"
-msgstr "显示图�动画(_S)"
+msgstr "显示会�管�选项"
 
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
@@ -20332,14 +20583,12 @@ msgid "Certificate Authority Trust"
 msgstr "�书��机构信任"
 
 #: ../smime/gui/smime-ui.ui.h:8
-#, fuzzy
 msgid "Certificate Fields"
-msgstr "<b>�书域</b>"
+msgstr "�书域"
 
 #: ../smime/gui/smime-ui.ui.h:9
-#, fuzzy
 msgid "Certificate Hierarchy"
-msgstr "<b>�书层次</b>"
+msgstr "�书层次"
 
 #: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
@@ -20382,9 +20631,8 @@ msgid "Expires On"
 msgstr "到期"
 
 #: ../smime/gui/smime-ui.ui.h:21
-#, fuzzy
 msgid "Field Value"
-msgstr "域�"
+msgstr "域值"
 
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "Fingerprints"
@@ -20770,14 +21018,14 @@ msgstr "选择(_S)"
 msgid "Collection"
 msgstr "收�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:332
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定义 %s 的视图"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:340
+#: ../widgets/menus/gal-define-views-dialog.c:342
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -20786,7 +21034,7 @@ msgstr "定义视图"
 msgid "Define Views for \"%s\""
 msgstr "定义“%s�的视图"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "表格"
 
@@ -20903,7 +21151,7 @@ msgstr "��附件�(_B)"
 msgid "Show Attachment _Bar"
 msgstr "显示附件�(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show _Attachment Bar"
 msgstr "显示附件�(_A)"
 
@@ -20922,7 +21170,7 @@ msgstr[0] "�存附件"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20942,12 +21190,12 @@ msgstr "��(_H)"
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:639
 #, c-format
 msgid "Open with \"%s\""
 msgstr "使用“%s�打开"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:642
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "在 %s 中打开附件"
@@ -20960,11 +21208,11 @@ msgstr "在 %s 中打开附件"
 msgid "Attached message"
 msgstr "附加的信�"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
 msgid "A load operation is already in progress"
 msgstr "一个已�加载的�作正在进行"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A save operation is already in progress"
 msgstr "个已��存的�作正在进行"
 
@@ -20978,33 +21226,32 @@ msgstr "�能加载“%s�"
 msgid "Could not load the attachment"
 msgstr "�能加载附件"
 
-#: ../widgets/misc/e-attachment.c:2197
+#: ../widgets/misc/e-attachment.c:2199
 #, c-format
 msgid "Could not open '%s'"
 msgstr "�能打开“%s�"
 
-#: ../widgets/misc/e-attachment.c:2200
+#: ../widgets/misc/e-attachment.c:2202
 #, c-format
 msgid "Could not open the attachment"
 msgstr "�能打开附件"
 
-#: ../widgets/misc/e-attachment.c:2635
-#, fuzzy
+#: ../widgets/misc/e-attachment.c:2637
 msgid "Attachment contents not loaded"
-msgstr "附件�醒"
+msgstr "附件内容未装入"
 
-#: ../widgets/misc/e-attachment.c:2711
+#: ../widgets/misc/e-attachment.c:2713
 #, c-format
 msgid "Could not save '%s'"
 msgstr "�能�存“%s�"
 
-#: ../widgets/misc/e-attachment.c:2714
-#, fuzzy, c-format
+#: ../widgets/misc/e-attachment.c:2716
+#, c-format
 msgid "Could not save the attachment"
-msgstr "选择�存全部附件的文件夹..."
+msgstr "无法�存附件"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl 加�击�打开一个链接"
 
@@ -21017,58 +21264,58 @@ msgstr "%Yå¹´%B"
 msgid "Month Calendar"
 msgstr "月历"
 
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
-#: ../widgets/text/e-text.c:3388
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
+#: ../widgets/text/e-text.c:3400
 msgid "Fill color"
 msgstr "填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
-#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
-#: ../widgets/text/e-text.c:3402
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
+#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
+#: ../widgets/text/e-text.c:3414
 msgid "GDK fill color"
 msgstr "GDK 填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:488
-#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
-#: ../widgets/text/e-text.c:3409
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
+#: ../widgets/text/e-text.c:3421
 msgid "Fill stipple"
 msgstr "点绘填充"
 
-#: ../widgets/misc/e-canvas-background.c:495
-#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:502
-#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:509
-#: ../widgets/misc/e-canvas-background.c:510
+#: ../widgets/misc/e-canvas-background.c:513
+#: ../widgets/misc/e-canvas-background.c:514
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:516
-#: ../widgets/misc/e-canvas-background.c:517
+#: ../widgets/misc/e-canvas-background.c:520
+#: ../widgets/misc/e-canvas-background.c:521
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2872
+#: ../widgets/table/e-table-item.c:2884
 msgid "Minimum width"
 msgstr "最�宽度"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2873
+#: ../widgets/table/e-table-item.c:2885
 msgid "Minimum Width"
 msgstr "最�宽度"
 
@@ -21120,18 +21367,16 @@ msgstr "æ— (_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
-#, fuzzy
-#| msgid "None"
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
 msgctxt "date"
 msgid "None"
 msgstr "æ— "
 
-#: ../widgets/misc/e-dateedit.c:1830
+#: ../widgets/misc/e-dateedit.c:1834
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1874
+#: ../widgets/misc/e-dateedit.c:1878
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
@@ -21196,7 +21441,6 @@ msgid "Import Location"
 msgstr "导入�置"
 
 #: ../widgets/misc/e-import-assistant.c:1207
-#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21218,20 +21462,19 @@ msgid "Select a File"
 msgstr "选择一个文件"
 
 #: ../widgets/misc/e-import-assistant.c:1255
-#, fuzzy
 msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "�击“导入�以便开始将文件导入到 Evolution。"
+msgstr "�击“应用�以便开始将文件导入到 Evolution。"
 
 #: ../widgets/misc/e-import-assistant.c:1261
 #: ../widgets/misc/e-import-assistant.c:1271
 msgid "Import Data"
 msgstr "导入数�"
 
-#: ../widgets/misc/e-map.c:621
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "世界地图"
 
-#: ../widgets/misc/e-map.c:623
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21251,7 +21494,7 @@ msgstr "Evolution 目�脱机。�击该按钮��机工作。"
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "因为网络��用，所以 Evolution 目�脱机。"
 
-#: ../widgets/misc/e-online-button.c:131
+#: ../widgets/misc/e-online-button.c:135
 msgid "The button state is online"
 msgstr "按钮状�为在线"
 
@@ -21314,43 +21557,43 @@ msgstr "Evolution 首选项"
 msgid "Matches: %d"
 msgstr "匹�：%d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:558
 msgid "Close the find bar"
 msgstr "关闭查找�"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:566
 msgid "Fin_d:"
 msgstr "查找(_D)："
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:578
 msgid "Clear the search"
 msgstr "清除�索"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "寻找该��出现的�一个�置"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:623
 msgid "Find the next occurrence of the phrase"
 msgstr "寻找该��出现的下一个�置"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:633
 msgid "Mat_ch case"
 msgstr "大�写匹�(_C)"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:661
 msgid "Reached bottom of page, continued from top"
 msgstr "到达页�底部，移到顶部继续"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:683
 msgid "Reached top of page, continued from bottom"
 msgstr "到达页�顶部，移到底部继续"
 
@@ -21393,9 +21636,8 @@ msgid "Deli_vered and opened"
 msgstr "已��和已打开(_V)"
 
 #: ../widgets/misc/e-send-options.ui.h:5
-#, fuzzy
 msgid "Delivery Options"
-msgstr "<b>��选项</b>"
+msgstr "��选项"
 
 #: ../widgets/misc/e-send-options.ui.h:6
 msgid "For Your Eyes Only"
@@ -21406,14 +21648,11 @@ msgid "Gene_ral Options"
 msgstr "常规选项(_R)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#, fuzzy
 msgid "Mail Receipt"
 msgstr ""
-"æ— \n"
 "阅读收�"
 
 #: ../widgets/misc/e-send-options.ui.h:14
-#, fuzzy
 msgid "Proprietary"
 msgstr "优先级"
 
@@ -21422,9 +21661,8 @@ msgid "R_eply requested"
 msgstr "请求回�(_E)"
 
 #: ../widgets/misc/e-send-options.ui.h:17
-#, fuzzy
 msgid "Return Notification"
-msgstr "<b>返回通知</b>"
+msgstr "返回通知"
 
 #: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
@@ -21435,9 +21673,8 @@ msgid "Standard"
 msgstr "标准"
 
 #: ../widgets/misc/e-send-options.ui.h:22
-#, fuzzy
 msgid "Status Tracking"
-msgstr "状�跟踪(_T)"
+msgstr "状�跟踪"
 
 #: ../widgets/misc/e-send-options.ui.h:23
 msgid "Top Secret"
@@ -21468,9 +21705,8 @@ msgid "_All information"
 msgstr "全部信�(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-#, fuzzy
 msgid "_Classification:"
-msgstr "分类(_C)"
+msgstr "分类(_C)："
 
 #: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
@@ -21516,14 +21752,12 @@ msgid "_Signature Name:"
 msgstr "签�(_S)："
 
 #: ../widgets/misc/e-signature-manager.c:294
-#, fuzzy
 msgid "Add Signature Script"
 msgstr "添加签�脚本"
 
 #: ../widgets/misc/e-signature-manager.c:359
-#, fuzzy
 msgid "Edit Signature Script"
-msgstr "编辑签�"
+msgstr "编辑签�脚本"
 
 #: ../widgets/misc/e-signature-manager.c:576
 msgid "Add _Script"
@@ -21540,14 +21774,12 @@ msgstr ""
 "用于显示。"
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
-#, fuzzy
 msgid "S_cript:"
-msgstr "脚本(_S)："
+msgstr "脚本(_C)："
 
 #: ../widgets/misc/e-signature-script-dialog.c:342
-#, fuzzy
 msgid "Script file must be executable."
-msgstr "脚本文件必须存在且�执行。"
+msgstr "脚本文件必须�执行。"
 
 #: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
@@ -21558,18 +21790,16 @@ msgid "_Copy Link Location"
 msgstr "�制链接�置(_C)"
 
 #: ../widgets/misc/e-web-view.c:350
-#, fuzzy
 msgid "Copy the link to the clipboard"
-msgstr "将选中文字�制到剪贴�"
+msgstr "将链接�制到剪贴�"
 
 #: ../widgets/misc/e-web-view.c:358
 msgid "_Open Link in Browser"
 msgstr "在�览器中打开链接(_O)"
 
 #: ../widgets/misc/e-web-view.c:360
-#, fuzzy
 msgid "Open the link in a web browser"
-msgstr "在�览器中打开链接(_O)"
+msgstr "在�览器中打开链接"
 
 #: ../widgets/misc/e-web-view.c:368
 msgid "_Copy Email Address"
@@ -21618,8 +21848,6 @@ msgstr "现在"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
-#, fuzzy
-#| msgid "None"
 msgctxt "table-date"
 msgid "None"
 msgstr "æ— "
@@ -21628,7 +21856,7 @@ msgstr "æ— "
 msgid "OK"
 msgstr "确定"
 
-#: ../widgets/table/e-cell-date-edit.c:862
+#: ../widgets/table/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "时间必须采用格�：%s"
@@ -21649,27 +21877,27 @@ msgstr "�焦列"
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1627
+#: ../widgets/table/e-cell-text.c:1631
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1634
+#: ../widgets/table/e-cell-text.c:1638
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1641
+#: ../widgets/table/e-cell-text.c:1645
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1648
+#: ../widgets/table/e-cell-text.c:1652
 msgid "Color Column"
 msgstr "给列�色"
 
-#: ../widgets/table/e-cell-text.c:1662
+#: ../widgets/table/e-cell-text.c:1666
 msgid "BG Color Column"
 msgstr "给列�背景色"
 
-#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
@@ -21709,7 +21937,7 @@ msgid "A_vailable Fields:"
 msgstr "�用域(_V)："
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Ascending"
 msgstr "��"
 
@@ -21722,7 +21950,7 @@ msgid "Clear _All"
 msgstr "全部清除(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "Descending"
 msgstr "��"
 
@@ -21810,7 +22038,7 @@ msgstr[0] "%s (%d 项)"
 #: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
+#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
 msgid "Alternating Row Colors"
 msgstr "交替行色"
 
@@ -21818,8 +22046,8 @@ msgstr "交替行色"
 #: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
-#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
+#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
 msgid "Horizontal Draw Grid"
 msgstr "水平绘制网格"
 
@@ -21827,8 +22055,8 @@ msgstr "水平绘制网格"
 #: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
-#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
+#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
 msgid "Vertical Draw Grid"
 msgstr "垂直绘制网格"
 
@@ -21836,8 +22064,8 @@ msgstr "垂直绘制网格"
 #: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
-#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
+#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
 msgid "Draw focus"
 msgstr "绘制焦点"
 
@@ -21845,7 +22073,7 @@ msgstr "绘制焦点"
 #: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
+#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
 msgid "Cursor mode"
 msgstr "光标模�"
 
@@ -21853,7 +22081,7 @@ msgstr "光标模�"
 #: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
+#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
 msgid "Selection model"
 msgstr "选择模型"
 
@@ -21861,9 +22089,9 @@ msgstr "选择模型"
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
-#: ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
+#: ../widgets/table/e-tree.c:3368
 msgid "Length Threshold"
 msgstr "长度阀值"
 
@@ -21871,9 +22099,9 @@ msgstr "长度阀值"
 #: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
-#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
-#: ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
+#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
+#: ../widgets/table/e-tree.c:3400
 msgid "Uniform row height"
 msgstr "统一行高"
 
@@ -21884,72 +22112,72 @@ msgstr "统一行高"
 msgid "Frozen"
 msgstr "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Customize Current View"
 msgstr "自定义当�视图"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "Sort _Ascending"
 msgstr "��排�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Sort _Descending"
 msgstr "��排�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "_Unsort"
 msgstr "未排�(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1517
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1520
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1524
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1527
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "A_lignment"
 msgstr "对�(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "B_est Fit"
 msgstr "最佳匹�(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Format Column_s..."
 msgstr "格�化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Custo_mize Current View..."
 msgstr "自定义当�视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "_Sort By"
 msgstr "排�方�(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1555
+#: ../widgets/table/e-table-header-item.c:1618
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
+#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
 msgid "Table header"
 msgstr "表头"
 
-#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
+#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
+#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
 msgid "Cursor row"
 msgstr "光标行"
 
@@ -21957,41 +22185,41 @@ msgstr "光标行"
 msgid "Sort Info"
 msgstr "排�信�"
 
-#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
-#: ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
+#: ../widgets/table/e-tree.c:3407
 msgid "Always search"
 msgstr "总是�索"
 
-#: ../widgets/table/e-table.c:3342
+#: ../widgets/table/e-table.c:3360
 msgid "Use click to add"
 msgstr "�击�添加"
 
-#: ../widgets/table/e-table.c:3356
+#: ../widgets/table/e-table.c:3374
 #, fuzzy
 msgid "Vertical Row Spacing"
 msgstr "标识器间�"
 
-#: ../widgets/table/e-table.c:3357
+#: ../widgets/table/e-table.c:3375
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"
 msgstr "ETree 表格适�器"
 
-#: ../widgets/table/e-tree.c:3382
+#: ../widgets/table/e-tree.c:3413
 msgid "Retro Look"
 msgstr "�箭外观"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3414
 msgid "Draw lines and +/- expanders."
 msgstr "绘制行和 +/- 扩展柄。"
 
-#: ../widgets/table/e-tree.c:3389
+#: ../widgets/table/e-tree.c:3420
 msgid "Expander Size"
 msgstr "扩展器大�"
 
-#: ../widgets/table/e-tree.c:3390
+#: ../widgets/table/e-tree.c:3421
 msgid "Size of the expander arrow"
 msgstr "扩展器箭头的大�"
 
@@ -22045,2026 +22273,119 @@ msgstr "表格�元格"
 msgid "click"
 msgstr "�击"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "排�"
 
-#: ../widgets/text/e-text.c:2474
+#: ../widgets/text/e-text.c:2486
 msgid "Select All"
 msgstr "全选"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2498
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
+#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
 msgid "Event Processor"
 msgstr "事件处�器"
 
-#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
 msgid "Text"
 msgstr "文字"
 
-#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
+#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
+#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
+#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
+#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
 msgid "Justification"
 msgstr "两端对�"
 
-#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
+#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
 msgid "Clip Width"
 msgstr "�剪宽度"
 
-#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
+#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
 msgid "Clip Height"
 msgstr "�剪高度"
 
-#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
+#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
 msgid "Clip"
 msgstr "�剪"
 
-#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
+#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
 msgid "Fill clip rectangle"
 msgstr "填充�剪矩形"
 
-#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
+#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
 msgid "X Offset"
 msgstr "水平�移"
 
-#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
+#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
 msgid "Y Offset"
 msgstr "垂直�移"
 
-#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
+#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
+#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
+#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
-#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
+#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
 msgid "Ellipsis"
 msgstr "椭圆"
 
-#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
+#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
 msgid "Line wrap"
 msgstr "�行"
 
-#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
+#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
 msgid "Break characters"
 msgstr "�行字符"
 
-#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Max lines"
 msgstr "最多行数"
 
-#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Draw borders"
 msgstr "绘制边框"
 
-#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Allow newlines"
 msgstr "�许新行"
 
-#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
 msgid "Draw button"
 msgstr "绘制按钮"
 
-#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
+#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
 msgid "Cursor position"
 msgstr "光标�置"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Handle Popup"
 msgstr "处�弹出"
-
-#~ msgid "Loading appointments at %s"
-#~ msgstr "装入�于 %s 的约会"
-
-#~ msgid "_Security"
-#~ msgstr "安全(_S)"
-
-#~ msgid "Copying `%s' to `%s'"
-#~ msgstr "把“%s��制到 %s"
-
-#~ msgid "Deleting selected memos..."
-#~ msgstr "删除选中的备忘..."
-
-#~ msgid "Deleting selected tasks..."
-#~ msgstr "删除选中的任务..."
-
-#~ msgid "Error loading address book."
-#~ msgstr "装入地�簿错误。"
-
-#~ msgid "Server Version"
-#~ msgstr "�务器版本"
-
-#~ msgid "Save Appointment"
-#~ msgstr "�存约会"
-
-#, fuzzy
-#~ msgid "Save Meeting"
-#~ msgstr "新会议"
-
-#~ msgid "Save Memo"
-#~ msgstr "�存备忘"
-
-#~ msgid "Save Task"
-#~ msgstr "�存任务"
-
-#, fuzzy
-#~ msgid "Show CC"
-#~ msgstr "显示(_W)："
-
-#, fuzzy
-#~ msgid "Show BCC"
-#~ msgstr "显示(_W)："
-
-#~ msgid "Directories can not be attached to Messages."
-#~ msgstr "无法将目录作为信件的附件。"
-
-#~ msgid ""
-#~ "To attach the contents of this directory, either attach the files in this "
-#~ "directory individually, or create an archive of the directory and attach "
-#~ "it."
-#~ msgstr ""
-#~ "�将此目录的内容作为附件，您需��一添加此目录中的文件，或者创建一个此目录"
-#~ "的归档文件，然�将此归档作为附件。"
-
-#~ msgid "Unfinished messages found"
-#~ msgstr "找到了未完�的信件"
-
-#~ msgid "Warning: Modified Message"
-#~ msgstr "警告：已修改的信件"
-
-#~ msgid "Overwrite file?"
-#~ msgstr "覆盖文件�？"
-
-#~ msgid "Select _All Text"
-#~ msgstr "选中所有文字(_A)"
-
-#~ msgid "Select all the text in a message"
-#~ msgstr "选中信件中的全部文本"
-
-#~ msgid "Show the \"Preview\" pane"
-#~ msgstr "显示“预览���"
-
-#~ msgid "Show the \"Preview\" pane."
-#~ msgstr "显示“预览���。"
-
-#~ msgid "Thread the message list."
-#~ msgstr "按线索编排信件列表。"
-
-#~ msgid "Thread the message-list"
-#~ msgstr "按线索编排信件列表"
-
-#~ msgid "Advanced search"
-#~ msgstr "高级�索"
-
-#~ msgid "Copy selected memo"
-#~ msgstr "�制选中的备忘"
-
-#~ msgid "Cut selected memo"
-#~ msgstr "剪切选中的备忘"
-
-#~ msgid "Copy selected tasks"
-#~ msgstr "�制选中的任务"
-
-#~ msgid "Cut selected tasks"
-#~ msgstr "剪切选中的任务"
-
-#~ msgid "Select _All Messages"
-#~ msgstr "选中全部信件(_A)"
-
-#~ msgid "Dummy window only"
-#~ msgstr "�对哑窗�"
-
-#~ msgid "Hide _Attachment Bar"
-#~ msgstr "��附件�(_A)"
-
-#~ msgid "Copy the selection to the clipboard"
-#~ msgstr "�制选择到剪贴�"
-
-#~ msgid "Add a column..."
-#~ msgstr "添加一列..."
-
-#~ msgid "Tree"
-#~ msgstr "æ ‘"
-
-#~ msgid "search bar"
-#~ msgstr "�索�"
-
-#~ msgid "evolution calendar search bar"
-#~ msgstr "Evolution 日历和�索�"
-
-#~ msgid "Combo Button"
-#~ msgstr "组�按钮"
-
-#~ msgid "Activate Default"
-#~ msgstr "激活默认"
-
-#~ msgid "Popup Menu"
-#~ msgstr "弹出��"
-
-#~ msgid "Toggle Attachment Bar"
-#~ msgstr "切�附件�"
-
-#~ msgid "activate"
-#~ msgstr "激活"
-
-#~ msgid "C_ontacts"
-#~ msgstr "�系人(_O)"
-
-#~ msgid "Configure autocomplete here"
-#~ msgstr "在此�置自动补全"
-
-#~ msgid "Evolution Address Book"
-#~ msgstr "Evolution 地�簿"
-
-#~ msgid "Evolution Address Book address popup"
-#~ msgstr "Evolution 地�簿地�弹出框"
-
-#~ msgid "Evolution Address Book address viewer"
-#~ msgstr "Evolution 地�簿地�查看器"
-
-#~ msgid "Evolution Address Book card viewer"
-#~ msgstr "Evolution 地�簿�片查看器"
-
-#~ msgid "Evolution Address Book component"
-#~ msgstr "Evolution 地�簿组件"
-
-#~ msgid "Evolution S/MIME Certificate Management Control"
-#~ msgstr "Evolution S/MIME �书管�控件"
-
-#~ msgid "Evolution folder settings configuration control"
-#~ msgstr "Evolution 文件夹�置控件"
-
-#~ msgid "Manage your S/MIME certificates here"
-#~ msgstr "在此管�您的 S/MIME �书"
-
-#~ msgid "Failed upgrading Address Book settings or folders."
-#~ msgstr "�级地�簿设置或文件夹失败。"
-
-#~ msgid "Base"
-#~ msgstr "基础"
-
-#~ msgid "Rename the \"%s\" folder to:"
-#~ msgstr "将“%s�文件夹�命�为："
-
-#~ msgid "Rename Folder"
-#~ msgstr "�命�文件夹"
-
-#~ msgid "Save As vCard..."
-#~ msgstr "�存为 vCard..."
-
-#~ msgid "Contact Source Selector"
-#~ msgstr "�系人�选择器"
-
-#~ msgid ""
-#~ "Position of the vertical pane, between the card and list views and the "
-#~ "preview pane, in pixels."
-#~ msgstr "�片和列表视图�预览��之间垂直��的�置，以�素计。"
-
-#~ msgid "<b>Authentication</b>"
-#~ msgstr "<b>身份验�</b>"
-
-#~ msgid "<b>Downloading</b>"
-#~ msgstr "<b>下载</b>"
-
-#~ msgid "<b>Searching</b>"
-#~ msgstr "<b>�索</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>类型：</b>"
-
-#~ msgid "Add Address Book"
-#~ msgstr "添加地�簿"
-
-#~ msgid "Basic"
-#~ msgstr "基本"
-
-#~ msgid "Distinguished name"
-#~ msgstr "识别性�称"
-
-#~ msgid "Email address"
-#~ msgstr "电�邮件地�"
-
-#~ msgid ""
-#~ "Evolution will use this email address to authenticate you with the server."
-#~ msgstr "Evolution 将使用此电�邮件地�在�务器上对您进行认�。"
-
-#~ msgid "Find Possible Search Bases"
-#~ msgstr "查找�能的�索基础"
-
-#~ msgid "Search filter"
-#~ msgstr "�索过滤器"
-
-#~ msgid ""
-#~ "The search base is the distinguished name (DN) of the entry where your "
-#~ "searches will begin. If you leave this blank, the search will begin at "
-#~ "the root of the directory tree."
-#~ msgstr ""
-#~ "�索基础是您�索开始项的�识别�称(DN)。如果您将此处留空，�索将从目录树的"
-#~ "根开始。"
-
-#~ msgid ""
-#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
-#~ "com\"."
-#~ msgstr "这是您的 LDAP �务器的完整�字。例如，“ldap.mycompany.com�。"
-
-#~ msgid ""
-#~ "This is the maximum number of entries to download. Setting this number to "
-#~ "be too large will slow down your address book."
-#~ msgstr "这是�下载�目的最大数�。将此数值设定得太大将导致地�簿�慢。"
-
-#~ msgid ""
-#~ "This is the name for this server that will appear in your Evolution "
-#~ "folder list. It is for display purposes only. "
-#~ msgstr "这是此�务器在 Evolution 文件夹列表中显示的�称。它�用于显示。"
-
-#~ msgid "Whenever Possible"
-#~ msgstr "�能时"
-
-#~ msgid "_Add Address Book"
-#~ msgstr "添加地�簿(_A)"
-
-#~ msgid "<b>Email</b>"
-#~ msgstr "<b>电�邮件</b>"
-
-#~ msgid "<b>Home</b>"
-#~ msgstr "<b>家庭</b>"
-
-#~ msgid "<b>Job</b>"
-#~ msgstr "<b>��</b>"
-
-#~ msgid "<b>Miscellaneous</b>"
-#~ msgstr "<b>�项</b>"
-
-#~ msgid "<b>Other</b>"
-#~ msgstr "<b>其它</b>"
-
-#~ msgid "<b>Telephone</b>"
-#~ msgstr "<b>电�</b>"
-
-#~ msgid "<b>Work</b>"
-#~ msgstr "<b>工作</b>"
-
-#~ msgid "MSN Messenger"
-#~ msgstr "MSN Messenger"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell GroupWise"
-
-#~ msgid "Novell Groupwise"
-#~ msgstr "Novell Groupwise"
-
-#~ msgid "_Notes:"
-#~ msgstr "注释(_N)："
-
-#~ msgid "United States"
-#~ msgstr "美国"
-
-#~ msgid "Afghanistan"
-#~ msgstr "阿富汗"
-
-#~ msgid "Albania"
-#~ msgstr "阿尔巴尼亚"
-
-#~ msgid "Algeria"
-#~ msgstr "阿尔�利亚"
-
-#~ msgid "American Samoa"
-#~ msgstr "美洲�摩亚"
-
-#~ msgid "Andorra"
-#~ msgstr "安�尔"
-
-#~ msgid "Angola"
-#~ msgstr "安哥拉"
-
-#~ msgid "Anguilla"
-#~ msgstr "安圭拉"
-
-#~ msgid "Antarctica"
-#~ msgstr "��洲"
-
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "安�瓜和巴布达"
-
-#~ msgid "Argentina"
-#~ msgstr "阿根廷"
-
-#~ msgid "Armenia"
-#~ msgstr "亚美尼亚"
-
-#~ msgid "Aruba"
-#~ msgstr "阿�巴岛"
-
-#~ msgid "Australia"
-#~ msgstr "澳大利亚"
-
-#~ msgid "Austria"
-#~ msgstr "奥地利"
-
-#~ msgid "Azerbaijan"
-#~ msgstr "阿塞拜疆"
-
-#~ msgid "Bahamas"
-#~ msgstr "巴哈马群岛"
-
-#~ msgid "Bahrain"
-#~ msgstr "å·´æž—å²›"
-
-#~ msgid "Bangladesh"
-#~ msgstr "孟加拉国"
-
-#~ msgid "Barbados"
-#~ msgstr "巴巴多斯岛"
-
-#~ msgid "Belarus"
-#~ msgstr "白俄罗斯"
-
-#~ msgid "Belgium"
-#~ msgstr "比利时"
-
-#~ msgid "Belize"
-#~ msgstr "伯利兹"
-
-#~ msgid "Benin"
-#~ msgstr "��"
-
-#~ msgid "Bermuda"
-#~ msgstr "百慕大群岛"
-
-#~ msgid "Bhutan"
-#~ msgstr "�丹"
-
-#~ msgid "Bolivia"
-#~ msgstr "玻利维亚"
-
-#~ msgid "Bosnia And Herzegowina"
-#~ msgstr "波斯尼亚和黑赛哥维纳"
-
-#~ msgid "Botswana"
-#~ msgstr "�茨瓦纳"
-
-#~ msgid "Bouvet Island"
-#~ msgstr "布维岛"
-
-#~ msgid "Brazil"
-#~ msgstr "巴西"
-
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "英属�度洋地区"
-
-#~ msgid "Brunei Darussalam"
-#~ msgstr "文莱德��兰"
-
-#~ msgid "Bulgaria"
-#~ msgstr "�加利亚"
-
-#~ msgid "Burkina Faso"
-#~ msgstr "布基纳法索"
-
-#~ msgid "Burundi"
-#~ msgstr "布隆迪"
-
-#~ msgid "Cambodia"
-#~ msgstr "柬埔寨"
-
-#~ msgid "Cameroon"
-#~ msgstr "喀麦隆"
-
-#~ msgid "Canada"
-#~ msgstr "加拿大"
-
-#~ msgid "Cape Verde"
-#~ msgstr "佛得角"
-
-#~ msgid "Cayman Islands"
-#~ msgstr "开曼群岛"
-
-#~ msgid "Central African Republic"
-#~ msgstr "中�共和国"
-
-#~ msgid "Chad"
-#~ msgstr "�得"
-
-#~ msgid "Chile"
-#~ msgstr "智利"
-
-#~ msgid "China"
-#~ msgstr "中国"
-
-#~ msgid "Christmas Island"
-#~ msgstr "圣诞岛"
-
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "科科斯群岛"
-
-#~ msgid "Colombia"
-#~ msgstr "哥伦比亚"
-
-#~ msgid "Comoros"
-#~ msgstr "科摩罗群岛"
-
-#~ msgid "Congo"
-#~ msgstr "刚果"
-
-#~ msgid "Congo, The Democratic Republic Of The"
-#~ msgstr "刚果人民民主共和国"
-
-#~ msgid "Cook Islands"
-#~ msgstr "库克群岛"
-
-#~ msgid "Costa Rica"
-#~ msgstr "哥斯达黎加"
-
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "科特迪瓦"
-
-#~ msgid "Croatia"
-#~ msgstr "克罗地亚"
-
-#~ msgid "Cuba"
-#~ msgstr "�巴"
-
-#~ msgid "Cyprus"
-#~ msgstr "塞浦路斯"
-
-#~ msgid "Czech Republic"
-#~ msgstr "�克共和国"
-
-#~ msgid "Denmark"
-#~ msgstr "丹麦"
-
-#~ msgid "Djibouti"
-#~ msgstr "�布�群岛"
-
-#~ msgid "Dominica"
-#~ msgstr "多米尼加"
-
-#~ msgid "Dominican Republic"
-#~ msgstr "多米尼加共和国"
-
-#~ msgid "Ecuador"
-#~ msgstr "厄瓜多尔"
-
-#~ msgid "Egypt"
-#~ msgstr "埃�"
-
-#~ msgid "El Salvador"
-#~ msgstr "�尔瓦多"
-
-#~ msgid "Equatorial Guinea"
-#~ msgstr "赤�几内亚"
-
-#~ msgid "Eritrea"
-#~ msgstr "厄立特里亚"
-
-#~ msgid "Estonia"
-#~ msgstr "爱沙尼亚"
-
-#~ msgid "Ethiopia"
-#~ msgstr "埃塞俄比亚"
-
-#~ msgid "Falkland Islands"
-#~ msgstr "�克兰群岛"
-
-#~ msgid "Faroe Islands"
-#~ msgstr "法罗群岛"
-
-#~ msgid "Fiji"
-#~ msgstr "�济"
-
-#~ msgid "Finland"
-#~ msgstr "芬兰"
-
-#~ msgid "France"
-#~ msgstr "法国"
-
-#~ msgid "French Guiana"
-#~ msgstr "法属圭亚那"
-
-#~ msgid "French Polynesia"
-#~ msgstr "法属波利尼西亚"
-
-#~ msgid "French Southern Territories"
-#~ msgstr "法属�部地区"
-
-#~ msgid "Gabon"
-#~ msgstr "加蓬"
-
-#~ msgid "Gambia"
-#~ msgstr "冈比亚"
-
-#~ msgid "Georgia"
-#~ msgstr "格��亚"
-
-#~ msgid "Germany"
-#~ msgstr "德国"
-
-#~ msgid "Ghana"
-#~ msgstr "加纳"
-
-#~ msgid "Gibraltar"
-#~ msgstr "直布罗陀"
-
-#~ msgid "Greece"
-#~ msgstr "希腊"
-
-#~ msgid "Greenland"
-#~ msgstr "格陵兰"
-
-#~ msgid "Grenada"
-#~ msgstr "格林纳达"
-
-#~ msgid "Guadeloupe"
-#~ msgstr "瓜德罗普岛"
-
-#~ msgid "Guam"
-#~ msgstr "关岛"
-
-#~ msgid "Guatemala"
-#~ msgstr "�地马拉"
-
-#~ msgid "Guernsey"
-#~ msgstr "格�西岛"
-
-#~ msgid "Guinea"
-#~ msgstr "几内亚"
-
-#~ msgid "Guinea-Bissau"
-#~ msgstr "几内亚比�"
-
-#~ msgid "Guyana"
-#~ msgstr "圭亚那"
-
-#~ msgid "Haiti"
-#~ msgstr "海地"
-
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "赫德和麦克�纳群岛"
-
-#~ msgid "Holy See"
-#~ msgstr "圣座"
-
-#~ msgid "Honduras"
-#~ msgstr "洪都拉斯"
-
-#~ msgid "Hong Kong"
-#~ msgstr "中国香港特别行政区"
-
-#~ msgid "Hungary"
-#~ msgstr "匈牙利"
-
-#~ msgid "Iceland"
-#~ msgstr "冰岛"
-
-#~ msgid "India"
-#~ msgstr "�度"
-
-#~ msgid "Indonesia"
-#~ msgstr "�度尼西亚"
-
-#~ msgid "Iran"
-#~ msgstr "伊朗"
-
-#~ msgid "Iraq"
-#~ msgstr "伊拉克"
-
-#~ msgid "Ireland"
-#~ msgstr "爱尔兰"
-
-#~ msgid "Isle of Man"
-#~ msgstr "Isle of Man"
-
-#~ msgid "Israel"
-#~ msgstr "以色列"
-
-#~ msgid "Italy"
-#~ msgstr "�大利"
-
-#~ msgid "Jamaica"
-#~ msgstr "牙买加"
-
-#~ msgid "Japan"
-#~ msgstr "日本"
-
-#~ msgid "Jersey"
-#~ msgstr "�尔西"
-
-#~ msgid "Jordan"
-#~ msgstr "约旦"
-
-#~ msgid "Kazakhstan"
-#~ msgstr "哈�克斯�"
-
-#~ msgid "Kenya"
-#~ msgstr "肯尼亚"
-
-#~ msgid "Kiribati"
-#~ msgstr "基里巴斯"
-
-#~ msgid "Korea, Democratic People's Republic Of"
-#~ msgstr "韩国人民民主共和国"
-
-#~ msgid "Korea, Republic Of"
-#~ msgstr "韩国"
-
-#~ msgid "Kuwait"
-#~ msgstr "科�特"
-
-#~ msgid "Kyrgyzstan"
-#~ msgstr "�尔�斯斯�"
-
-#~ msgid "Laos"
-#~ msgstr "��"
-
-#~ msgid "Latvia"
-#~ msgstr "拉脱维亚"
-
-#~ msgid "Lebanon"
-#~ msgstr "黎巴嫩"
-
-#~ msgid "Lesotho"
-#~ msgstr "莱索托"
-
-#~ msgid "Liberia"
-#~ msgstr "利比里亚"
-
-#~ msgid "Libya"
-#~ msgstr "利比亚"
-
-#~ msgid "Liechtenstein"
-#~ msgstr "列支敦士登"
-
-#~ msgid "Lithuania"
-#~ msgstr "立陶宛"
-
-#~ msgid "Luxembourg"
-#~ msgstr "�森堡"
-
-#~ msgid "Macao"
-#~ msgstr "中国澳门特别行政区"
-
-#~ msgid "Macedonia"
-#~ msgstr "马其顿"
-
-#~ msgid "Madagascar"
-#~ msgstr "马达加斯加"
-
-#~ msgid "Malawi"
-#~ msgstr "马拉维"
-
-#~ msgid "Malaysia"
-#~ msgstr "马�西亚"
-
-#~ msgid "Maldives"
-#~ msgstr "马尔代夫"
-
-#~ msgid "Mali"
-#~ msgstr "马里"
-
-#~ msgid "Malta"
-#~ msgstr "马耳他"
-
-#~ msgid "Marshall Islands"
-#~ msgstr "马�尔群岛"
-
-#~ msgid "Martinique"
-#~ msgstr "马�尼�岛"
-
-#~ msgid "Mauritania"
-#~ msgstr "毛里塔尼亚"
-
-#~ msgid "Mauritius"
-#~ msgstr "毛里求斯"
-
-#~ msgid "Mexico"
-#~ msgstr "墨西哥"
-
-#~ msgid "Micronesia"
-#~ msgstr "密克罗尼西亚"
-
-#~ msgid "Moldova, Republic Of"
-#~ msgstr "摩尔多瓦共和国"
-
-#~ msgid "Monaco"
-#~ msgstr "摩纳哥"
-
-#~ msgid "Mongolia"
-#~ msgstr "蒙�"
-
-#~ msgid "Montserrat"
-#~ msgstr "蒙特塞拉特群岛"
-
-#~ msgid "Morocco"
-#~ msgstr "摩洛哥"
-
-#~ msgid "Mozambique"
-#~ msgstr "莫桑比克"
-
-#~ msgid "Myanmar"
-#~ msgstr "缅甸"
-
-#~ msgid "Namibia"
-#~ msgstr "纳米比亚"
-
-#~ msgid "Nauru"
-#~ msgstr "瑙�"
-
-#~ msgid "Nepal"
-#~ msgstr "尼泊尔"
-
-#~ msgid "Netherlands"
-#~ msgstr "�兰"
-
-#~ msgid "Netherlands Antilles"
-#~ msgstr "�属安的列斯"
-
-#~ msgid "New Caledonia"
-#~ msgstr "新喀里多尼亚"
-
-#~ msgid "New Zealand"
-#~ msgstr "新西兰"
-
-#~ msgid "Nicaragua"
-#~ msgstr "尼加拉瓜"
-
-#~ msgid "Niger"
-#~ msgstr "尼日尔"
-
-#~ msgid "Nigeria"
-#~ msgstr "尼日利亚"
-
-#~ msgid "Niue"
-#~ msgstr "纽埃岛"
-
-#~ msgid "Norfolk Island"
-#~ msgstr "诺�克岛"
-
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "北马里亚那群岛"
-
-#~ msgid "Norway"
-#~ msgstr "挪�"
-
-#~ msgid "Oman"
-#~ msgstr "阿曼"
-
-#~ msgid "Pakistan"
-#~ msgstr "巴基斯�"
-
-#~ msgid "Palau"
-#~ msgstr "帕劳群岛"
-
-#~ msgid "Palestinian Territory"
-#~ msgstr "巴勒斯�地区"
-
-#~ msgid "Panama"
-#~ msgstr "巴拿马"
-
-#~ msgid "Papua New Guinea"
-#~ msgstr "巴布亚新几内亚"
-
-#~ msgid "Paraguay"
-#~ msgstr "巴拉圭"
-
-#~ msgid "Peru"
-#~ msgstr "秘�"
-
-#~ msgid "Philippines"
-#~ msgstr "�利宾"
-
-#~ msgid "Pitcairn"
-#~ msgstr "皮特克�岛"
-
-#~ msgid "Poland"
-#~ msgstr "波兰"
-
-#~ msgid "Portugal"
-#~ msgstr "葡�牙"
-
-#~ msgid "Puerto Rico"
-#~ msgstr "波多黎�"
-
-#~ msgid "Qatar"
-#~ msgstr "�塔尔"
-
-#~ msgid "Reunion"
-#~ msgstr "留尼汪"
-
-#~ msgid "Romania"
-#~ msgstr "罗马尼亚"
-
-#~ msgid "Russian Federation"
-#~ msgstr "俄罗斯�邦"
-
-#~ msgid "Rwanda"
-#~ msgstr "�旺达"
-
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "圣基德和�维斯"
-
-#~ msgid "Saint Lucia"
-#~ msgstr "圣�西亚岛"
-
-#~ msgid "Saint Vincent And The Grenadines"
-#~ msgstr "圣文森特和格林纳达"
-
-#~ msgid "Samoa"
-#~ msgstr "�摩亚"
-
-#~ msgid "San Marino"
-#~ msgstr "圣马力诺"
-
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "圣多美和普林西比"
-
-#~ msgid "Saudi Arabia"
-#~ msgstr "沙特阿拉伯"
-
-#~ msgid "Senegal"
-#~ msgstr "塞内加尔"
-
-#~ msgid "Serbia And Montenegro"
-#~ msgstr "塞尔维亚和黑山"
-
-#~ msgid "Sierra Leone"
-#~ msgstr "塞拉利昂"
-
-#~ msgid "Singapore"
-#~ msgstr "新加�"
-
-#~ msgid "Slovakia"
-#~ msgstr "斯洛�克"
-
-#~ msgid "Slovenia"
-#~ msgstr "斯洛文尼亚"
-
-#~ msgid "Solomon Islands"
-#~ msgstr "所罗门群岛"
-
-#~ msgid "Somalia"
-#~ msgstr "索马里"
-
-#~ msgid "South Africa"
-#~ msgstr "��"
-
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "�乔治亚和�三文治群岛"
-
-#~ msgid "Spain"
-#~ msgstr "西�牙"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "斯里兰�"
-
-#~ msgid "St. Helena"
-#~ msgstr "圣赫勒拿岛"
-
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "圣皮埃尔和麦克伦群岛"
-
-#~ msgid "Sudan"
-#~ msgstr "�丹"
-
-#~ msgid "Suriname"
-#~ msgstr "�里�"
-
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "斯瓦巴和尖棉群岛"
-
-#~ msgid "Swaziland"
-#~ msgstr "斯�士兰"
-
-#~ msgid "Sweden"
-#~ msgstr "ç‘žå…¸"
-
-#~ msgid "Switzerland"
-#~ msgstr "瑞士"
-
-#~ msgid "Syria"
-#~ msgstr "�利亚"
-
-#~ msgid "Taiwan"
-#~ msgstr "中国�湾"
-
-#~ msgid "Tajikistan"
-#~ msgstr "塔�克斯�"
-
-#~ msgid "Tanzania, United Republic Of"
-#~ msgstr "�桑尼亚�邦共和国"
-
-#~ msgid "Thailand"
-#~ msgstr "泰国"
-
-#~ msgid "Timor-Leste"
-#~ msgstr "东�汶"
-
-#~ msgid "Togo"
-#~ msgstr "多哥"
-
-#~ msgid "Tokelau"
-#~ msgstr "托克劳群岛"
-
-#~ msgid "Tonga"
-#~ msgstr "汤加"
-
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "特里尼达和多巴哥"
-
-#~ msgid "Tunisia"
-#~ msgstr "�尼斯"
-
-#~ msgid "Turkey"
-#~ msgstr "土耳其"
-
-#~ msgid "Turkmenistan"
-#~ msgstr "土库曼斯�"
-
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "特克斯和凯科斯群岛"
-
-#~ msgid "Tuvalu"
-#~ msgstr "图瓦�"
-
-#~ msgid "Uganda"
-#~ msgstr "乌干达"
-
-#~ msgid "Ukraine"
-#~ msgstr "乌克兰"
-
-#~ msgid "United Arab Emirates"
-#~ msgstr "阿拉伯��酋长国"
-
-#~ msgid "United Kingdom"
-#~ msgstr "英国"
-
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "美国�型外岛"
-
-#~ msgid "Uruguay"
-#~ msgstr "乌拉圭"
-
-#~ msgid "Uzbekistan"
-#~ msgstr "乌兹别克斯�"
-
-#~ msgid "Vanuatu"
-#~ msgstr "努瓦阿图"
-
-#~ msgid "Venezuela"
-#~ msgstr "委内瑞拉"
-
-#~ msgid "Viet Nam"
-#~ msgstr "越�"
-
-#~ msgid "Virgin Islands, British"
-#~ msgstr "英属处女群岛"
-
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "美属处女群岛"
-
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "瓦利斯和富图纳群岛"
-
-#~ msgid "Western Sahara"
-#~ msgstr "西撒哈拉"
-
-#~ msgid "Yemen"
-#~ msgstr "也门"
-
-#~ msgid "Zambia"
-#~ msgstr "赞比亚"
-
-#~ msgid "Zimbabwe"
-#~ msgstr "津巴布韦"
-
-#~ msgid "AOL Instant Messenger"
-#~ msgstr "AOL �时通讯程�"
-
-#~ msgid "Yahoo Messenger"
-#~ msgstr "雅虎通"
-
-#~ msgid "Gadu-Gadu Messenger"
-#~ msgstr "Gadu-Gadu �时通讯"
-
-#~ msgid "Service"
-#~ msgstr "�务"
-
-#~ msgid "Username"
-#~ msgstr "用户�"
-
-#~ msgid "Address _2:"
-#~ msgstr "地� _2："
-
-#~ msgid "Ci_ty:"
-#~ msgstr "城市(_T)："
-
-#~ msgid "Countr_y:"
-#~ msgstr "国家/地区(_Y)："
-
-#~ msgid "Full Address"
-#~ msgstr "完整地�"
-
-#~ msgid "_ZIP Code:"
-#~ msgstr "邮政编�(_Z)："
-
-#~ msgid "Add IM Account"
-#~ msgstr "添加�时通讯账户"
-
-#~ msgid "_Account name:"
-#~ msgstr "账户�(_A)："
-
-#~ msgid "_IM Service:"
-#~ msgstr "�时通讯�务(_I)："
-
-#~ msgid "<b>Members</b>"
-#~ msgstr "<b>�员</b>"
-
-#~ msgid "Name begins with"
-#~ msgstr "姓�以此开头"
-
-#~ msgid "_Open"
-#~ msgstr "打开(_O)"
-
-#~ msgid "_Print"
-#~ msgstr "打�(_P)"
-
-#~ msgid "Cop_y to Address Book..."
-#~ msgstr "�制到地�簿(_Y)..."
-
-#~ msgid "Mo_ve to Address Book..."
-#~ msgstr "移至地�簿(_V)..."
-
-#~ msgid "Cu_t"
-#~ msgstr "剪切(_T)"
-
-#~ msgid "_Copy"
-#~ msgstr "�制(_C)"
-
-#~ msgid "P_aste"
-#~ msgstr "粘贴(_A)"
-
-#~ msgid ""
-#~ "%s already exists\n"
-#~ "Do you want to overwrite it?"
-#~ msgstr ""
-#~ "%s 已�存在\n"
-#~ "您打算覆盖它�？"
-
-#~ msgid "Overwrite"
-#~ msgstr "覆盖"
-
-#~ msgid "contact"
-#~ msgid_plural "contacts"
-#~ msgstr[0] "�系人"
-
-#~ msgid "Querying Address Book..."
-#~ msgstr "正在查询地�簿..."
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
-
-#~ msgid "Blank forms at end:"
-#~ msgstr "结尾空白格�："
-
-#~ msgid "Body"
-#~ msgstr "邮件体"
-
-#~ msgid "Bottom:"
-#~ msgstr "底部："
-
-#~ msgid "Dimensions:"
-#~ msgstr "尺寸："
-
-#~ msgid "F_ont..."
-#~ msgstr "字体(_O)..."
-
-#~ msgid "Fonts"
-#~ msgstr "字体"
-
-#~ msgid "Footer:"
-#~ msgstr "页脚："
-
-#~ msgid "Header/Footer"
-#~ msgstr "页眉/页脚"
-
-#~ msgid "Headings"
-#~ msgstr "标题"
-
-#~ msgid "Headings for each letter"
-#~ msgstr "��信的标题"
-
-#~ msgid "Height:"
-#~ msgstr "高度："
-
-#~ msgid "Immediately follow each other"
-#~ msgstr "一个紧接一个"
-
-#~ msgid "Landscape"
-#~ msgstr "横�"
-
-#~ msgid "Left:"
-#~ msgstr "左："
-
-#~ msgid "Letter tabs on side"
-#~ msgstr "�边显示字�标签"
-
-#~ msgid "Margins"
-#~ msgstr "边界"
-
-#~ msgid "Number of columns:"
-#~ msgstr "列数："
-
-#~ msgid "Orientation"
-#~ msgstr "方�"
-
-#~ msgid "Page"
-#~ msgstr "页�"
-
-#~ msgid "Page Setup:"
-#~ msgstr "页�设置："
-
-#~ msgid "Paper"
-#~ msgstr "纸张"
-
-#~ msgid "Paper source:"
-#~ msgstr "纸张��："
-
-#~ msgid "Portrait"
-#~ msgstr "纵�"
-
-#~ msgid "Print using gray shading"
-#~ msgstr "用�度阴影打�"
-
-#~ msgid "Reverse on even pages"
-#~ msgstr "奇数页��"
-
-#~ msgid "Right:"
-#~ msgstr "�："
-
-#~ msgid "Sections:"
-#~ msgstr "节："
-
-#~ msgid "Size:"
-#~ msgstr "大�："
-
-#~ msgid "Start on a new page"
-#~ msgstr "从新页开始"
-
-#~ msgid "Style name:"
-#~ msgstr "样��："
-
-#~ msgid "Top:"
-#~ msgstr "顶部："
-
-#~ msgid "Width:"
-#~ msgstr "宽度："
-
-#~ msgid "_Font..."
-#~ msgstr "字体(_F)..."
-
-#~ msgid "Configure your timezone, Calendar and Task List here "
-#~ msgstr "在此�置您的时区�日历和任务列表 "
-
-#~ msgid "Evolution Calendar and Tasks"
-#~ msgstr "Evolution 日历和任务"
-
-#~ msgid "Evolution Calendar configuration control"
-#~ msgstr "Evolution 日历�置控件"
-
-#~ msgid "Evolution Calendar scheduling message viewer"
-#~ msgstr "Evolution 日历调度信件查看器"
-
-#~ msgid "Evolution Calendar/Task editor"
-#~ msgstr "Evolution 日历/任务新闻编辑器"
-
-#~ msgid "Evolution's Calendar component"
-#~ msgstr "Evolution 日历组件"
-
-#~ msgid "Evolution's Memos component"
-#~ msgstr "Evolution 备忘组件"
-
-#~ msgid "Evolution's Tasks component"
-#~ msgstr "Evolution 任务组件"
-
-#~ msgid "Memo_s"
-#~ msgstr "备忘(_S)"
-
-#~ msgid "_Calendars"
-#~ msgstr "日历(_C)"
-
-#~ msgid "Evolution Calendar alarm notification service"
-#~ msgstr "Evolution 日历�醒通知�务"
-
-#~ msgid "Could not initialize Bonobo"
-#~ msgstr "无法�始化 Bonobo"
-
-#~ msgid ""
-#~ "Could not create the alarm notify service factory, maybe it's already "
-#~ "running..."
-#~ msgstr "无法创建�醒�务车间，�能已��行了..."
-
-#~ msgid ""
-#~ "Position of the vertical pane, between the task list and the task preview "
-#~ "pane, in pixels."
-#~ msgstr "任务列表和任务预览��间垂直��的�置，以�素计。"
-
-#~ msgid "Whether to use daylight savings time while displaying events."
-#~ msgstr "在显示事件时使用是��时制时间。"
-
-#~ msgid "daylight savings time"
-#~ msgstr "�时制时间"
-
-#~ msgid "Category is"
-#~ msgstr "类别为"
-
-#~ msgid "Comment contains"
-#~ msgstr "注释�有"
-
-#~ msgid "Location contains"
-#~ msgstr "�置�有"
-
-#~ msgid "_Make available for offline use"
-#~ msgstr "标为�脱机使用(_M)"
-
-#~ msgid "_Do not make available for offline use"
-#~ msgstr "�标为�脱机使用(_D)"
-
-#~ msgid "Failed upgrading calendars."
-#~ msgstr "�级日历失败。"
-
-#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
-#~ msgstr "无法打开日历“%s��创建事件和会议"
-
-#~ msgid "There is no calendar available for creating events and meetings"
-#~ msgstr "没有�创建事件和会议的日历"
-
-#~ msgid "New appointment"
-#~ msgstr "新建约会"
-
-#~ msgid "New meeting"
-#~ msgstr "新建会议"
-
-#~ msgid "New all day appointment"
-#~ msgstr "新建全天约会"
-
-#~ msgid "Error while opening the calendar"
-#~ msgstr "打开日历时出错"
-
-#~ msgid "Method not supported when opening the calendar"
-#~ msgstr "打开日历的方法�支�"
-
-#~ msgid "Permission denied to open the calendar"
-#~ msgstr "没有��打开日历"
-
-#~ msgid "<b>Alarm</b>"
-#~ msgstr "<b>�醒</b>"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>选项</b>"
-
-#~ msgid "Attach file(s)"
-#~ msgstr "添加附件"
-
-#~ msgid ""
-#~ "60 minutes\n"
-#~ "30 minutes\n"
-#~ "15 minutes\n"
-#~ "10 minutes\n"
-#~ "05 minutes"
-#~ msgstr ""
-#~ "60 分钟\n"
-#~ "30 分钟\n"
-#~ "15 分钟\n"
-#~ "10 分钟\n"
-#~ "5 分钟"
-
-#~ msgid "<span weight=\"bold\">Alerts</span>"
-#~ msgstr "<span weight=\"bold\">警告</span>"
-
-#~ msgid "<span weight=\"bold\">General</span>"
-#~ msgstr "<span weight=\"bold\">常规</span>"
-
-#~ msgid "<span weight=\"bold\">Task List</span>"
-#~ msgstr "<span weight=\"bold\">任务列表</span>"
-
-#~ msgid "<span weight=\"bold\">Time</span>"
-#~ msgstr "<span weight=\"bold\">时间</span>"
-
-#~ msgid "<span weight=\"bold\">Work Week</span>"
-#~ msgstr "<span weight=\"bold\">工作日</span>"
-
-#~ msgid "Adjust for daylight sa_ving time"
-#~ msgstr "调整�时制时间(_V)"
-
-#~ msgid ""
-#~ "Minutes\n"
-#~ "Hours\n"
-#~ "Days"
-#~ msgstr ""
-#~ "分钟\n"
-#~ "�时\n"
-#~ "天"
-
-#~ msgid ""
-#~ "Monday\n"
-#~ "Tuesday\n"
-#~ "Wednesday\n"
-#~ "Thursday\n"
-#~ "Friday\n"
-#~ "Saturday\n"
-#~ "Sunday"
-#~ msgstr ""
-#~ "星期一\n"
-#~ "星期二\n"
-#~ "星期三\n"
-#~ "星期四\n"
-#~ "星期五\n"
-#~ "星期六\n"
-#~ "星期日"
-
-#~ msgid "Attached message - %s"
-#~ msgstr "附加的信件 - %s"
-
-#~ msgid "Cancel _Drag"
-#~ msgstr "�消拖曳(_D)"
-
-#~ msgid "<b>%d</b> Attachment"
-#~ msgid_plural "<b>%d</b> Attachments"
-#~ msgstr[0] "<b>%d</b> 个附件"
-
-#~ msgid "Show Attachments"
-#~ msgstr "显示附件"
-
-#~ msgid "Press space key to toggle attachment bar"
-#~ msgstr "按空格键�切�附件�"
-
-#~ msgid "_Add "
-#~ msgstr "添加(_A)"
-
-#~ msgid "<b>Att_endees</b>"
-#~ msgstr "<b>与会者(_E)</b>"
-
-#~ msgid "C_hange Organizer"
-#~ msgstr "更改组织者(_H)"
-
-#~ msgid "Co_ntacts..."
-#~ msgstr "�系人(_N)..."
-
-#~ msgid "<b>Preview</b>"
-#~ msgstr "<b>预览</b>"
-
-#~ msgid "<b>Recurrence</b>"
-#~ msgstr "<b>�现</b>"
-
-#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
-#~ msgstr "<span weight=\"bold\">�项</span>"
-
-#~ msgid "<span weight=\"bold\">Status</span>"
-#~ msgstr "<span weight=\"bold\">状�</span>"
-
-#~ msgid "Save As..."
-#~ msgstr "�存为..."
-
-#~ msgid "untitled_image.%s"
-#~ msgstr "无标题图�.%s"
-
-#~ msgid "_Save As..."
-#~ msgstr "�存为(_S)..."
-
-#~ msgid "_Save Selected"
-#~ msgstr "�存选中(_S)"
-
-#~ msgid "P_rint..."
-#~ msgstr "打�(_R)..."
-
-#~ msgid "C_ut"
-#~ msgstr "剪切(_U)"
-
-#~ msgid "_Paste"
-#~ msgstr "粘贴(_P)"
-
-#~ msgid "_Mark Selected Tasks as Complete"
-#~ msgstr "把任务标记为完�(_M)"
-
-#~ msgid "_Mark Selected Tasks as Incomplete"
-#~ msgstr "把任务标记为未完�(_M)"
-
-#~ msgid "_Delete Selected Tasks"
-#~ msgstr "删除选中任务(_D)"
-
-#~ msgid "Select T_oday"
-#~ msgstr "选择今天(_O)"
-
-#~ msgid "_Select Date..."
-#~ msgstr "选择日期(_S)..."
-
-#~ msgid "Pri_nt..."
-#~ msgstr "打�(_N)..."
-
-#~ msgid "_Delete Selected Memos"
-#~ msgstr "删除选中备忘(_D)"
-
-#~ msgid "Completing tasks..."
-#~ msgstr "正在完�任务..."
-
-#~ msgid "_Custom View"
-#~ msgstr "自定义视图(_C)"
-
-#~ msgid "_Save Custom View"
-#~ msgstr "�存自定义视图(_S)"
-
-#~ msgid "_Define Views..."
-#~ msgstr "定义视图(_D)..."
-
-#~ msgid "Loading tasks at %s"
-#~ msgstr "装入�于 %s 的任务"
-
-#~ msgid "Loading memos at %s"
-#~ msgstr "装入�于 %s 的备忘"
-
-#~ msgid "Failed upgrading memos."
-#~ msgstr "�级备忘失败。"
-
-#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
-#~ msgstr "无法打开备忘列表“%s��创建事件和会议"
-
-#~ msgid "There is no calendar available for creating memos"
-#~ msgstr "没有�创建备忘的日历"
-
-#~ msgid "New shared memo"
-#~ msgstr "新建共享备忘"
-
-#~ msgctxt "New"
-#~ msgid "Memo li_st"
-#~ msgstr "备忘列表(_S)"
-
-#~ msgid "Failed upgrading tasks."
-#~ msgstr "�级任务失败。"
-
-#~ msgid "Unable to open the task list '%s' for creating events and meetings"
-#~ msgstr "无法打开任务列表“%s��创建事件和会议"
-
-#~ msgid "There is no calendar available for creating tasks"
-#~ msgstr "没有�创建任务的日历"
-
-#~ msgid "New task"
-#~ msgstr "新建任务"
-
-#~ msgid "New assigned task"
-#~ msgstr "新建分�的任务"
-
-#~ msgctxt "New"
-#~ msgid "Tas_k list"
-#~ msgstr "任务列表(_K)"
-
-#~ msgid "Could not open autosave file"
-#~ msgstr "无法打开自动�存文件"
-
-#~ msgid "_Post-To Field"
-#~ msgstr "投递到域(_P)"
-
-#~ msgid "Toggles whether the Post-To field is displayed"
-#~ msgstr "是�显示投递到域"
-
-#~ msgid "_Subject Field"
-#~ msgstr "主题域(_C)"
-
-#~ msgid "Toggles whether the Subject field is displayed"
-#~ msgstr "切�是�显示主题域"
-
-#~ msgid "_To Field"
-#~ msgstr "收件人域(_T)"
-
-#~ msgid "Toggles whether the To field is displayed"
-#~ msgstr "是�显示寄给域"
-
-#~ msgid ""
-#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
-#~ "accounts."
-#~ msgstr "��选项�适用于 Novell GroupWise 和 Microsoft Exchange 账户。"
-
-#~ msgid "Send options not available."
-#~ msgstr "��选项��用。"
-
-#~ msgid "Evolution Information"
-#~ msgstr "Evolution 信�"
-
-#~ msgid "Evolution Query"
-#~ msgstr "Evolution 查询"
-
-#~ msgid "Component"
-#~ msgstr "组件"
-
-#~ msgid "Label name cannot be empty."
-#~ msgstr "标签�称�能为空。"
-
-#~ msgid ""
-#~ "A label having the same tag already exists on the server. Please rename "
-#~ "your label."
-#~ msgstr "�务器上已存在��的标签。请�命�您的标签。"
-
-#~ msgid "Test"
-#~ msgstr "测试"
-
-#~ msgid "<b>_Filter Rules</b>"
-#~ msgstr "<b>过滤规则(_F)</b>"
-
-#~ msgid "Rule name"
-#~ msgstr "规则�"
-
-#~ msgid ""
-#~ "Configure mail preferences, including security and message display, here"
-#~ msgstr "在此�置邮件首选项，包括安全和信件显示"
-
-#~ msgid "Configure spell-checking, signatures, and the message composer here"
-#~ msgstr "在此�置拼写检查�签�和信件编写器"
-
-#~ msgid "Configure your email accounts here"
-#~ msgstr "在这里�置您的电�邮件账户"
-
-#~ msgid "Configure your network connection settings here"
-#~ msgstr "在这里�置您的网络连接设置"
-
-#~ msgid "Evolution Mail"
-#~ msgstr "Evolution 邮件"
-
-#~ msgid "Evolution Mail accounts configuration control"
-#~ msgstr "Evolution 邮件账户�置控制"
-
-#~ msgid "Evolution Mail component"
-#~ msgstr "Evolution 邮件组件"
-
-#~ msgid "Evolution Mail composer"
-#~ msgstr "Evolution 邮件撰写器"
-
-#~ msgid "Evolution Mail composer configuration control"
-#~ msgstr "Evolution 邮件撰写控件"
-
-#~ msgid "Evolution Mail preferences control"
-#~ msgstr "Evolution 邮件首选项控件"
-
-#~ msgid "Evolution Network configuration control"
-#~ msgstr "Evolution 网络�置控件"
-
-#~ msgid "[Default]"
-#~ msgstr "[默认]"
-
-#~ msgid "Signature(s)"
-#~ msgstr "签�"
-
-#~ msgid "Account Search"
-#~ msgstr "账户�索"
-
-#~ msgid "All Account Search"
-#~ msgstr "全部账户�索"
-
-#~ msgid "_Copy to Folder"
-#~ msgstr "�制到文件夹(_C)"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "移至文件夹(_M)"
-
-#~ msgid "Open in _New Window"
-#~ msgstr "在新窗�中打开(_N)"
-
-#~ msgid "_Move..."
-#~ msgstr "移动(_M)..."
-
-#~ msgid "_Unread Search Folder"
-#~ msgstr "未读�索文件夹(_U)"
-
-#~ msgid "U_ndelete"
-#~ msgstr "�消删除(_N)"
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "已完�标志(_G)"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "清除标志(_E)"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "根�信件创建规则(_T)"
-
-#~ msgid "Search Folder based on _Subject"
-#~ msgstr "基于主题的�索文件夹(_S)"
-
-#~ msgid "Search Folder based on Se_nder"
-#~ msgstr "基于�件人的�索文件夹(_N)"
-
-#~ msgid "Search Folder based on _Recipients"
-#~ msgstr "基于收件人的�索文件夹(_R)"
-
-#~ msgid "Filter based on Sub_ject"
-#~ msgstr "基于主题过滤(_J)"
-
-#~ msgid "Filter based on Sen_der"
-#~ msgstr "基于�件人过滤(_D)"
-
-#~ msgid "Filter based on Re_cipients"
-#~ msgstr "基于收件人过滤(_C)"
-
-#~ msgid "Filter based on _Mailing List"
-#~ msgstr "基于邮件列表过滤(_M)"
-
-#~ msgid "Retrieving Message..."
-#~ msgstr "正在收�信件..."
-
-#~ msgid "C_all To..."
-#~ msgstr "呼�到(_A)..."
-
-#~ msgid "Completed on %B %d, %Y, %l:%M %p"
-#~ msgstr "%Y年%m月%d日%A，%p%l:%M完�"
-
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "到 %m月%d日%A，%p%l:%M"
-
-#~ msgid "_Fit to Width"
-#~ msgstr "适�宽度(_F)"
-
-#~ msgid "_Save Selected..."
-#~ msgstr "�存所选(_S)..."
-
-#~ msgid "%d at_tachment"
-#~ msgid_plural "%d at_tachments"
-#~ msgstr[0] "%d 个附件(_T)"
-
-#~ msgid "S_ave"
-#~ msgstr "�存(_A)"
-
-#~ msgid "No Attachment"
-#~ msgstr "无附件"
-
-#~ msgid " (%a, %R %Z)"
-#~ msgstr " (%A，%R %Z)"
-
-#~ msgid " (%R %Z)"
-#~ msgstr " (%R %Z)"
-
-#~ msgid "Tag"
-#~ msgstr "标签"
-
-#~ msgid "_Reply to sender"
-#~ msgstr "回��件人(_R)"
-
-#~ msgid "message"
-#~ msgstr "信件"
-
-#~ msgid "Add address"
-#~ msgstr "添加地�"
-
-#~ msgid "Default height of the message window."
-#~ msgstr "信件窗�的默认高度。"
-
-#~ msgid "Default width of the message window."
-#~ msgstr "信件窗�的默认宽度。"
-
-#~ msgid ""
-#~ "Enable side bar search feature so that you can start interactive "
-#~ "searching by typing in the text. Use is that you can easily find a folder "
-#~ "in that side bar by just typing the folder name and the selection jumps "
-#~ "automatically to that folder."
-#~ msgstr ""
-#~ "�用侧边��索特性，以便�以在输入文本的�时进行交互��索。这么�的作用在"
-#~ "于您�以更加轻�地在侧边�中找到文件夹，�需输入文件夹�称，然�选中范围就"
-#~ "会自动跳转到该文件夹。"
-
-#~ msgid ""
-#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
-#~ "vertically."
-#~ msgstr "如果开�了“预览���，则以并列方�显示，而�是垂直方�显示。"
-
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr "�用/�用在进入离线模��的是�需�离线�步的��的�示。"
-
-#~ msgid "Message Window default height"
-#~ msgstr "信件窗�默认高度"
-
-#~ msgid "Message Window default width"
-#~ msgstr "信件窗�默认宽度"
-
-#~ msgid "Prompt to check if the user wants to go offline immediately"
-#~ msgstr "用户想立�离线时�示检查"
-
-#~ msgid "Use side-by-side or wide layout"
-#~ msgstr "使用并排还是宽�布局"
-
-#~ msgid "View/Bcc menu item is checked"
-#~ msgstr "选中了查看/Bcc ��项"
-
-#~ msgid "View/Bcc menu item is checked."
-#~ msgstr "选中了查看/Bcc ��项。"
-
-#~ msgid "View/Cc menu item is checked"
-#~ msgstr "选中了查看/Cc ��项"
-
-#~ msgid "View/Cc menu item is checked."
-#~ msgstr "选中了查看/Cc ��项。"
-
-#~ msgid "View/From menu item is checked"
-#~ msgstr "选中了查看/From ��项"
-
-#~ msgid "View/From menu item is checked."
-#~ msgstr "选中了查看/From ��项。"
-
-#~ msgid "View/PostTo menu item is checked"
-#~ msgstr "选中了查看/PostTo ��项"
-
-#~ msgid "View/PostTo menu item is checked."
-#~ msgstr "选中了查看/PostTo ��项。"
-
-#~ msgid "View/ReplyTo menu item is checked"
-#~ msgstr "选中了查看/ReplyTo ��项"
-
-#~ msgid "View/ReplyTo menu item is checked."
-#~ msgstr "选中了查看/ReplyTo ��项。"
-
-#~ msgid "New Mail Message"
-#~ msgstr "新建信件"
-
-#~ msgid "New Mail Folder"
-#~ msgstr "新建邮件文件夹"
-
-#~ msgid "Failed upgrading Mail settings or folders."
-#~ msgstr "�级邮件设置或文件夹失败。"
-
-#~ msgid " Ch_eck for Supported Types "
-#~ msgstr "检查支�的类型(_E)"
-
-#~ msgid "<b>Sig_natures</b>"
-#~ msgstr "<b>签�(_N)</b>"
-
-#~ msgid "<b>_Languages</b>"
-#~ msgstr "<b>语言(_L)</b>"
-
-#~ msgid "<span weight=\"bold\">Account Information</span>"
-#~ msgstr "<span weight=\"bold\">账户信�</span>"
-
-#~ msgid "<span weight=\"bold\">Authentication</span>"
-#~ msgstr "<span weight=\"bold\">身份验�</span>"
-
-#~ msgid "<span weight=\"bold\">Composing Messages</span>"
-#~ msgstr "<span weight=\"bold\">撰写信件</span>"
-
-#~ msgid "<span weight=\"bold\">Configuration</span>"
-#~ msgstr "<span weight=\"bold\">�置</span>"
-
-#~ msgid "<span weight=\"bold\">Default Behavior</span>"
-#~ msgstr "<span weight=\"bold\">默认行为</span>"
-
-#~ msgid "<span weight=\"bold\">Delete Mail</span>"
-#~ msgstr "<span weight=\"bold\">删除邮件</span>"
-
-#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-#~ msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
-
-#~ msgid "<span weight=\"bold\">Labels</span>"
-#~ msgstr "<span weight=\"bold\">标签</span>"
-
-#~ msgid "<span weight=\"bold\">Loading Images</span>"
-#~ msgstr "<span weight=\"bold\">装入图�</span>"
-
-#~ msgid "<span weight=\"bold\">Message Display</span>"
-#~ msgstr "<span weight=\"bold\">信件显示</span>"
-
-#~ msgid "<span weight=\"bold\">Message Fonts</span>"
-#~ msgstr "<span weight=\"bold\">信件字体</span>"
-
-#~ msgid "<span weight=\"bold\">Message Receipts</span>"
-#~ msgstr "<span weight=\"bold\">信件收�</span>"
-
-#~ msgid "<span weight=\"bold\">Optional Information</span>"
-#~ msgstr "<span weight=\"bold\">�选信�</span>"
-
-#~ msgid "<span weight=\"bold\">Options</span>"
-#~ msgstr "<span weight=\"bold\">选项</span>"
-
-#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
-#~ msgstr "<span weight=\"bold\">打�字体</span>"
-
-#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
-#~ msgstr "<span weight=\"bold\">代��务器状�</span>"
-
-#~ msgid "<span weight=\"bold\">Required Information</span>"
-#~ msgstr "<span weight=\"bold\">请求的信�</span>"
-
-#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#~ msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
-
-#~ msgid "<span weight=\"bold\">Security</span>"
-#~ msgstr "<span weight=\"bold\">安全</span>"
-
-#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-#~ msgstr "<span weight=\"bold\">已��和�稿信件</span>"
-
-#~ msgid "<span weight=\"bold\">Server Configuration</span>"
-#~ msgstr "<span weight=\"bold\">�务器�置</span>"
-
-#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
-#~ msgstr "<span weight=\"bold\">认�类型(_A)</span>"
-
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "波罗的语(ISO-8859-13)"
-
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "波罗的语(ISO-8859-4)"
-
-#~ msgid "Ch_eck for Supported Types "
-#~ msgstr "检查支�的类型(_E)"
-
-#~ msgid "Email Accounts"
-#~ msgstr "电�邮件"
-
-#~ msgid "Message Composer"
-#~ msgstr "信件撰写器"
-
-#~ msgid "S_OCKS Host:"
-#~ msgstr "SOCKS 主机(_O)："
-
-#~ msgid "Signatures Table"
-#~ msgstr "签�表"
-
-#~ msgid "_Automatic proxy configuration URL:"
-#~ msgstr "自动代��务器�置 URL(_A)："
-
-#~ msgid "<b>Search Folder Sources</b>"
-#~ msgstr "<b>�索文件夹��</b>"
-
-#~ msgid "<span weight=\"bold\">Digital Signature</span>"
-#~ msgstr "<span weight=\"bold\">数字签�</span>"
-
-#~ msgid "<span weight=\"bold\">Encryption</span>"
-#~ msgstr "<span weight=\"bold\">加密</span>"
-
-#~ msgid "Case _sensitive"
-#~ msgstr "区分大�写(_S)"
-
-#~ msgid "F_ind:"
-#~ msgstr "查找(_I)："
-
-#~ msgid "Find in Message"
-#~ msgstr "在信件中查找"
-
-#~ msgid "None Selected"
-#~ msgstr "没有选中"
-
-#~ msgid "Delete \"{0}\"?"
-#~ msgstr "删除“{0}��？"
-
-#~ msgid "Delete account?"
-#~ msgstr "删除账户�？"
-
-#~ msgid "Delete messages in Search Folder?"
-#~ msgstr "删除�索文件夹中的信件�？"
-
-#~ msgid "Discard changes?"
-#~ msgstr "丢弃更改�？"
-
-#~ msgid "Mark all messages as read"
-#~ msgstr "把所有信件标记为已读"
-
-#~ msgid "Querying server"
-#~ msgstr "查询�务器"
-
-#~ msgid "Subject or Recipients contains"
-#~ msgstr "主题或接收者�有"
-
-#~ msgid "Provides core functionality for local address books."
-#~ msgstr "�供本地地�簿的核心功能。"
-
-#~ msgid ""
-#~ "Looks for clues in a message for mention of attachments and warns if the "
-#~ "attachment is missing"
-#~ msgstr "在信件中�索��附件的线索并在无附件时警告"
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 3f024c4c99..0b54250498 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -37,15 +37,9 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
 #else
 void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
 {
-	GdkAtom wm_win, mob_atom;
-	Atom dummy_t;
-	unsigned long dummy_l;
-	gint dummy_i;
-	GdkScreen *screen;
-	GdkDisplay *display;
 	Window *wm_window_v = NULL;
 	guchar *moblin_string = NULL;
-	GModule *module;
+	GModule *module = NULL;
 	/*
 	 * Wow - this is unpleasant, but it is hard to link directly
 	 * to the X libraries, and we have to use XGetWindowProperty
@@ -60,46 +54,56 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
 
 	*is_meego = *small_screen = FALSE;
 
-	if (!gdk_display_get_default ())
-		return;
-
-	wm_win = gdk_atom_intern ("_NET_SUPPORTING_WM_CHECK", TRUE);
-	mob_atom = gdk_atom_intern ("_MOBLIN", TRUE);
-	if (!wm_win || !mob_atom)
-		return;
-
-	module = g_module_open (NULL, 0);
-	if (!module)
-		return;
-	g_module_symbol (module, "XFree", (gpointer) &fns.XFree);
-	g_module_symbol (module, "XGetWindowProperty",
-						  (gpointer) &fns.XGetWindowProperty);
-	if (!fns.XFree || !fns.XGetWindowProperty) {
-		fprintf (stderr, "defective X server\n");
-		goto exit;
-	}
+	moblin_string = (guchar *)g_getenv ("EVO_MEEGO");
+	if (!moblin_string) {
+		GdkScreen *screen;
+		GdkDisplay *display;
+		GdkAtom wm_win, mob_atom;
+		Atom dummy_t;
+		unsigned long dummy_l;
+		gint dummy_i;
+
+		if (!gdk_display_get_default ())
+			return;
+
+		wm_win = gdk_atom_intern ("_NET_SUPPORTING_WM_CHECK", TRUE);
+		mob_atom = gdk_atom_intern ("_MOBLIN", TRUE);
+		if (!wm_win || !mob_atom)
+			return;
+
+		module = g_module_open (NULL, 0);
+		if (!module)
+			return;
+		g_module_symbol (module, "XFree", (gpointer) &fns.XFree);
+		g_module_symbol (module, "XGetWindowProperty",
+				 (gpointer) &fns.XGetWindowProperty);
+		if (!fns.XFree || !fns.XGetWindowProperty) {
+			fprintf (stderr, "defective X server\n");
+			goto exit;
+		}
 
-	display = gdk_display_get_default ();
-	screen = gdk_display_get_default_screen (gdk_display_get_default());
+		display = gdk_display_get_default ();
+		screen = gdk_display_get_default_screen (gdk_display_get_default());
 
-	gdk_error_trap_push ();
+		gdk_error_trap_push ();
 
-	/* get the window manager's supporting window */
-	fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
-				GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
-				gdk_x11_atom_to_xatom_for_display (display, wm_win),
-				0, 1, False, XA_WINDOW, &dummy_t, &dummy_i,
-				&dummy_l, &dummy_l, (guchar **)(&wm_window_v));
+		/* get the window manager's supporting window */
+		fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
+					GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
+					gdk_x11_atom_to_xatom_for_display (display, wm_win),
+					0, 1, False, XA_WINDOW, &dummy_t, &dummy_i,
+					&dummy_l, &dummy_l, (guchar **)(&wm_window_v));
 
-	/* get the '_Moblin' setting */
-	if (wm_window_v && (*wm_window_v != None))
-		fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v,
-					gdk_x11_atom_to_xatom_for_display (display, mob_atom),
-					0, 8192, False, XA_STRING,
-					&dummy_t, &dummy_i, &dummy_l, &dummy_l,
-					&moblin_string);
+		/* get the '_Moblin' setting */
+		if (wm_window_v && (*wm_window_v != None))
+			fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v,
+						gdk_x11_atom_to_xatom_for_display (display, mob_atom),
+						0, 8192, False, XA_STRING,
+						&dummy_t, &dummy_i, &dummy_l, &dummy_l,
+						&moblin_string);
 
-	gdk_error_trap_pop ();
+		gdk_error_trap_pop ();
+	}
 
 	if (moblin_string) {
 		gint i;
@@ -123,14 +127,15 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
 			g_strfreev (pair);
 		}
 		g_strfreev (props);
-		fns.XFree (moblin_string);
+		if (fns.XFree)
+			fns.XFree (moblin_string);
 	}
 
  exit:
 	if (wm_window_v)
-	      fns.XFree (wm_window_v);
-
-	g_module_close (module);
+		fns.XFree (wm_window_v);
+	if (module)
+		g_module_close (module);
 }
 #endif
 
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 4bc9c480cb..9fbb0bbca0 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -348,3 +348,59 @@ e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview)
 
 	return g_strv_length (uris);
 }
+
+/**
+ * e_shell_hide_widgets_for_express_mode:
+ * @shell: an #EShell
+ * @builder: a #GtkBuilder
+ * @widget_name: NULL-terminated list of strings
+ *
+ * If Evolution is running in Express mode (i.e. if the specified @shell is
+ * in Express mode), then this function will hide a list of widgets, based
+ * on their specified names.  The list of names must be NULL-terminated,
+ * and each element of that list must be the name of a widget present in
+ * @builder.  Those widgets will then get hidden.
+ *
+ * This can be used to simplify preference dialogs and such in an easy
+ * fashion, for use in Express mode.
+ *
+ * If Evolution is not running in Express mode, this function does nothing.
+ */
+void
+e_shell_hide_widgets_for_express_mode (EShell *shell,
+                                       GtkBuilder *builder,
+                                       const gchar *widget_name,
+                                       ...)
+{
+	va_list args;
+	const gchar *name;
+
+	g_return_if_fail (E_IS_SHELL (shell));
+	g_return_if_fail (GTK_IS_BUILDER (builder));
+	g_return_if_fail (widget_name != NULL);
+
+	if (!e_shell_get_express_mode (shell))
+		return;
+
+	va_start (args, widget_name);
+
+	name = va_arg (args, const gchar *);
+	while (name) {
+		GObject *object;
+
+		object = gtk_builder_get_object (builder, name);
+		if (!GTK_IS_WIDGET (object)) {
+			g_error (
+				"Object '%s' was not found in the builder "
+				"file, or it is not a GtkWidget", name);
+			g_assert_not_reached ();
+		}
+
+		gtk_widget_hide (GTK_WIDGET (object));
+
+		name = va_arg (args, const gchar *);
+	}
+
+	va_end (args);
+}
+
diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h
index 428d49a836..1b7202a5c5 100644
--- a/shell/e-shell-utils.h
+++ b/shell/e-shell-utils.h
@@ -50,6 +50,11 @@ guint		e_shell_utils_import_uris	(EShell *shell,
 						 gchar **uris,
 						 gboolean preview);
 
+void		e_shell_hide_widgets_for_express_mode (EShell *shell,
+						       GtkBuilder *builder,
+						       const gchar *widget_name,
+						       ...) G_GNUC_NULL_TERMINATED;
+
 G_END_DECLS
 
 #endif /* E_SHELL_UTILS_H */
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a8ece91adf..5d1c44ecc8 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -659,6 +659,28 @@ shell_view_construct_searchbar (EShellView *shell_view)
 
 	gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, -1);
 
+	if (e_shell_get_small_screen_mode (shell)) {
+		GtkWidget *image;
+		GtkWidget *container;
+		GtkAction *action;
+		GtkToolItem *item;
+
+		action = e_shell_window_get_action (
+			shell_window, "close-window");
+		image = gtk_image_new_from_icon_name (
+			"window-close-hover", GTK_ICON_SIZE_DIALOG);
+		item = gtk_tool_button_new (
+			image, gtk_action_get_label (action));
+		gtk_widget_set_name (GTK_WIDGET (item), "MeeGoCloseButton");
+		gtk_activatable_set_related_action (
+			GTK_ACTIVATABLE (item), action);
+		container = e_shell_window_get_menu_bar_box (shell_window);
+		gtk_box_pack_start (
+			GTK_BOX (container),
+			GTK_WIDGET (item), FALSE, FALSE, 0);
+		gtk_widget_show_all (GTK_WIDGET (item));
+	}
+
 	return widget;
 }
 
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 0f94dd08ec..606f125f33 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -930,10 +930,17 @@ action_preferences_cb (GtkAction *action,
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
 	shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
 
-	if (shell_backend_class->preferences_page != NULL)
-		e_preferences_window_show_page (
-			E_PREFERENCES_WINDOW (preferences_window),
-			shell_backend_class->preferences_page);
+	if (shell_backend_class->preferences_page != NULL) {
+		if (e_shell_get_express_mode (shell)) {
+			e_preferences_window_filter_page (
+				E_PREFERENCES_WINDOW (preferences_window),
+				shell_backend_class->preferences_page);
+		} else {
+			e_preferences_window_show_page (
+				E_PREFERENCES_WINDOW (preferences_window),
+				shell_backend_class->preferences_page);
+		}
+	}
 }
 
 /**
@@ -1450,6 +1457,20 @@ static GtkActionEntry shell_entries[] = {
 	  N_("Close this window"),
 	  G_CALLBACK (action_close_cb) },
 
+	{ "close-window-menu",
+	  GTK_STOCK_CLOSE,
+	  NULL,
+	  "<Control>w",
+	  N_("Close this window"),
+	  G_CALLBACK (action_close_cb) },
+
+	{ "close-window",
+	  GTK_STOCK_CLOSE,
+	  N_("_Close Window"),
+	  "<Control>w",
+	  N_("Close this window"),
+	  G_CALLBACK (action_close_cb) },
+
 	{ "contents",
 	  GTK_STOCK_HELP,
 	  N_("_Contents"),
@@ -2081,9 +2102,11 @@ e_shell_window_create_new_menu (EShellWindow *shell_window)
 
 	/* Add menu separators. */
 
-	separator = gtk_separator_menu_item_new ();
-	new_item_actions = g_list_prepend (new_item_actions, separator);
-	gtk_widget_show (GTK_WIDGET (separator));
+	if (new_item_actions != NULL) {
+		separator = gtk_separator_menu_item_new ();
+		new_item_actions = g_list_prepend (new_item_actions, separator);
+		gtk_widget_show (GTK_WIDGET (separator));
+	}
 
 	if (new_source_actions != NULL) {
 		separator = gtk_separator_menu_item_new ();
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index a2b8ccec40..6e47132bc1 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -432,7 +432,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 
 	object = G_OBJECT (shell_window);
 	key = "/apps/evolution/shell/view_defaults/component_id";
-	gconf_bridge_bind_property (bridge, key, object, "active-view");
+	g_object_set (object, "active-view",
+		      gconf_client_get_string (e_shell_get_gconf_client (shell), key, NULL),
+		      NULL);
 
 	object = G_OBJECT (priv->content_pane);
 	key = "/apps/evolution/shell/view_defaults/folder_bar/width";
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 6050ce135d..02a688503e 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -93,6 +93,7 @@ struct _EShellWindowPrivate {
 	GtkWidget *status_notebook;
 
 	/* Miscellaneous */
+	GtkWidget *menubar_box;
 
 	/* Shell signal handlers. */
 	GArray *signal_handler_ids;
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index dfa3616642..9838f9c730 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -324,9 +324,15 @@ shell_window_finalize (GObject *object)
 static void
 shell_window_constructed (GObject *object)
 {
-	e_shell_window_private_constructed (E_SHELL_WINDOW (object));
+	EShellWindow *shell_window = E_SHELL_WINDOW (object);
+
+	e_shell_window_private_constructed (shell_window);
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
+
+	if (e_shell_get_meego_mode (shell_window->priv->shell) &&
+	    e_shell_get_small_screen_mode (shell_window->priv->shell))
+		gtk_window_set_decorated (GTK_WINDOW (object), FALSE);
 }
 
 static GtkWidget *
@@ -338,6 +344,23 @@ shell_window_construct_menubar (EShellWindow *shell_window)
 		shell_window, "/main-menu");
 	gtk_widget_show (main_menu);
 
+	if (e_shell_get_small_screen_mode (shell_window->priv->shell)) {
+		GtkWidget *parent, *child;
+
+		parent = gtk_widget_get_parent (main_menu);
+		g_object_ref (parent);
+		gtk_container_remove ((GtkContainer *)parent, main_menu);
+		child = gtk_hbox_new (FALSE, 0);
+		gtk_box_pack_start ((GtkBox *)child, main_menu, TRUE, TRUE, 0);
+		gtk_widget_show (child);
+		gtk_container_add ((GtkContainer *)parent, child);
+		shell_window->priv->menubar_box = child;
+
+		e_mutual_binding_new (main_menu, "visible",
+				child, "visible");
+		main_menu = child;
+	}
+
 	g_signal_connect (
 		shell_window, "notify::active-view",
 		G_CALLBACK (shell_window_menubar_update_new_menu), NULL);
@@ -345,6 +368,12 @@ shell_window_construct_menubar (EShellWindow *shell_window)
 	return main_menu;
 }
 
+GtkWidget *
+e_shell_window_get_menu_bar_box (EShellWindow *shell_window)
+{
+	return shell_window->priv->menubar_box;
+}
+
 static GtkWidget *
 shell_window_construct_toolbar (EShellWindow *shell_window)
 {
@@ -365,6 +394,9 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
 	toolbar = e_shell_window_get_managed_widget (
 		shell_window, "/main-toolbar");
 
+	if (e_shell_get_meego_mode (shell_window->priv->shell))
+		 gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
+
 	/* XXX Having this separator in the UI definition doesn't work
 	 *     because GtkUIManager is unaware of the "New" button, so
 	 *     it makes the separator invisible.  One possibility is to
@@ -399,6 +431,15 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
 		shell_window, "/search-toolbar");
 	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
 	gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0);
+	if (e_shell_get_meego_mode (shell_window->priv->shell))
+		 gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
+
+	toolbar = e_shell_window_get_managed_widget (
+		shell_window, "/close-toolbar");
+	gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
+	gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0);
+	if (e_shell_get_meego_mode (shell_window->priv->shell))
+		 gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar");
 
 	return box;
 }
@@ -605,9 +646,23 @@ shell_window_create_shell_view (EShellWindow *shell_window,
 }
 
 static void
+shell_window_realize (GtkWidget *widget)
+{
+	EShellWindow *shell_window;
+
+	shell_window = E_SHELL_WINDOW (widget);
+	e_shell_adapt_window_size (shell_window->priv->shell,
+				   GTK_WINDOW (widget));
+
+	/* Chain up to parent's dispose() method. */
+	GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget);
+}
+
+static void
 e_shell_window_class_init (EShellWindowClass *class)
 {
 	GObjectClass *object_class;
+	GtkWidgetClass *widget_class;
 
 	g_type_class_add_private (class, sizeof (EShellWindowPrivate));
 
@@ -618,6 +673,9 @@ e_shell_window_class_init (EShellWindowClass *class)
 	object_class->finalize = shell_window_finalize;
 	object_class->constructed = shell_window_constructed;
 
+	widget_class = GTK_WIDGET_CLASS (class);
+	widget_class->realize = shell_window_realize;
+
 	class->construct_menubar = shell_window_construct_menubar;
 	class->construct_toolbar = shell_window_construct_toolbar;
 	class->construct_sidebar = shell_window_construct_sidebar;
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index 58401b2dba..9baa3cf8e9 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -146,6 +146,7 @@ void		e_shell_window_register_new_source_actions
 						 const gchar *backend_name,
 						 GtkActionEntry *entries,
 						 guint n_entries);
+GtkWidget *	e_shell_window_get_menu_bar_box (EShellWindow *shell_window);
 
 G_END_DECLS
 
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ab7d683bed..60bbe30526 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -62,17 +62,23 @@ struct _EShellPrivate {
 	gchar *geometry;
 	gchar *module_directory;
 
+	gchar *startup_view;
+
 	guint auto_reconnect	: 1;
 	guint network_available	: 1;
 	guint online		: 1;
 	guint quit_cancelled	: 1;
 	guint safe_mode		: 1;
 	guint express_mode	: 1;
+	guint meego_mode	: 1;
+	guint small_screen_mode	: 1;
 };
 
 enum {
 	PROP_0,
 	PROP_EXPRESS_MODE,
+	PROP_MEEGO_MODE,
+	PROP_SMALL_SCREEN_MODE,
 	PROP_GEOMETRY,
 	PROP_MODULE_DIRECTORY,
 	PROP_NETWORK_AVAILABLE,
@@ -471,6 +477,18 @@ shell_set_express_mode (EShell *shell,
 }
 
 static void
+shell_set_meego_mode (EShell *shell, gboolean is_meego)
+{
+	shell->priv->meego_mode = is_meego;
+}
+
+static void
+shell_set_small_screen_mode (EShell *shell, gboolean small_screen)
+{
+	shell->priv->small_screen_mode = small_screen;
+}
+
+static void
 shell_set_geometry (EShell *shell,
                     const gchar *geometry)
 {
@@ -501,6 +519,18 @@ shell_set_property (GObject *object,
 				g_value_get_boolean (value));
 			return;
 
+		case PROP_MEEGO_MODE:
+			shell_set_meego_mode (
+				E_SHELL (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_SMALL_SCREEN_MODE:
+			shell_set_small_screen_mode (
+				E_SHELL (object),
+				g_value_get_boolean (value));
+			return;
+
 		case PROP_GEOMETRY:
 			shell_set_geometry (
 				E_SHELL (object),
@@ -542,6 +572,18 @@ shell_get_property (GObject *object,
 				E_SHELL (object)));
 			return;
 
+		case PROP_MEEGO_MODE:
+			g_value_set_boolean (
+				value, e_shell_get_meego_mode (
+				E_SHELL (object)));
+			return;
+
+		case PROP_SMALL_SCREEN_MODE:
+			g_value_set_boolean (
+				value, e_shell_get_small_screen_mode (
+				E_SHELL (object)));
+			return;
+
 		case PROP_MODULE_DIRECTORY:
 			g_value_set_string (
 				value, e_shell_get_module_directory (
@@ -577,6 +619,11 @@ shell_dispose (GObject *object)
 
 	priv = E_SHELL_GET_PRIVATE (object);
 
+	if (priv->startup_view != NULL) {
+		g_free (priv->startup_view);
+		priv->startup_view = NULL;
+	}
+
 	if (priv->settings != NULL) {
 		g_object_unref (priv->settings);
 		priv->settings = NULL;
@@ -789,6 +836,40 @@ e_shell_class_init (EShellClass *class)
 			G_PARAM_CONSTRUCT_ONLY));
 
 	/**
+	 * EShell:meego
+	 *
+	 * Are we running under meego - if so, adapt ourselves
+	 * to fit in well with their theming.
+	 **/
+	g_object_class_install_property (
+		object_class,
+		PROP_MEEGO_MODE,
+		g_param_spec_boolean (
+			"meego-mode",
+			"Meego Mode",
+			"Whether meego mode is enabled",
+			FALSE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+
+	/**
+	 * EShell:small-screen
+	 *
+	 * Are we running with a small (1024x600) screen - if so, start
+	 * throwing the babies overboard to fit onto that screen size.
+	 **/
+	g_object_class_install_property (
+		object_class,
+		PROP_SMALL_SCREEN_MODE,
+		g_param_spec_boolean (
+			"small-screen-mode",
+			"Small Screen Mode",
+			"Whether we run on a rather small screen",
+			FALSE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+
+	/**
 	 * EShell:geometry
 	 *
 	 * User-specified initial window geometry string to apply
@@ -1079,6 +1160,8 @@ e_shell_init (EShell *shell)
 	shell->priv->backends_by_scheme = backends_by_scheme;
 	shell->priv->safe_mode = e_file_lock_exists ();
 
+	shell->priv->startup_view = NULL;
+
 	g_object_ref_sink (shell->priv->preferences_window);
 
 	/* Add our icon directory to the theme's search path
@@ -1580,6 +1663,38 @@ e_shell_get_express_mode (EShell *shell)
 }
 
 /**
+ * e_shell_get_meego_mode:
+ * @shell: an #EShell
+ *
+ * Returns %TRUE if Evolution is in MeeGo mode.
+ *
+ * Returns: %TRUE if Evolution is in MeeGo mode
+ **/
+gboolean
+e_shell_get_meego_mode (EShell *shell)
+{
+	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
+
+	return shell->priv->meego_mode;
+}
+
+/**
+ * e_shell_get_small_screen_mode:
+ * @shell: an #EShell
+ *
+ * Returns %TRUE if Evolution is in small (netbook) screen mode.
+ *
+ * Returns: %TRUE if Evolution is in small screen mode
+ **/
+gboolean
+e_shell_get_small_screen_mode (EShell *shell)
+{
+	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
+
+	return shell->priv->small_screen_mode;
+}
+
+/**
  * e_shell_get_module_directory:
  * @shell: an #EShell
  *
@@ -1797,3 +1912,49 @@ e_shell_cancel_quit (EShell *shell)
 
 	g_signal_stop_emission (shell, signals[QUIT_REQUESTED], 0);
 }
+
+/**
+ * e_shell_adapt_window_size:
+ * @shell: an #EShell
+ * @window: a #GtkWindow to adapt to full-screen
+ *
+ * This is used to adapt to window's size to be optimal for
+ * the platform. The shell settings are used to determine if
+ * a window should be set to full screen etc.
+ *
+ * This method is best called when the widget is realized on
+ * a given screen.
+ **/
+void
+e_shell_adapt_window_size (EShell    *shell,
+			   GtkWindow *window)
+{
+	gint monitor;
+	GdkScreen *scr;
+	GdkRectangle rect;
+
+	if (!e_shell_get_meego_mode (shell) ||
+	    !e_shell_get_small_screen_mode (shell))
+		return;
+
+	scr = gdk_screen_get_default ();
+	monitor = gdk_screen_get_monitor_at_window (scr, GTK_WIDGET (window)->window);
+	gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+
+	gtk_window_set_default_size (window, rect.width, rect.height);
+	gtk_window_set_decorated (window, FALSE);
+	gtk_window_maximize (window);
+}
+
+void
+e_shell_set_startup_view (EShell *shell,
+			  const gchar *view)
+{
+	shell->priv->startup_view = g_strdup(view);
+}
+
+const gchar *
+e_shell_get_startup_view (EShell *shell)
+{
+	return shell->priv->startup_view;
+}
diff --git a/shell/e-shell.h b/shell/e-shell.h
index adc0ffd126..f1d76b9ea6 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -108,7 +108,9 @@ GList *		e_shell_get_watched_windows	(EShell *shell);
 GtkWindow *     e_shell_get_active_window	(EShell *shell);
 void		e_shell_send_receive		(EShell *shell,
 						 GtkWindow *parent);
+gboolean	e_shell_get_meego_mode		(EShell *shell);
 gboolean	e_shell_get_express_mode	(EShell *shell);
+gboolean	e_shell_get_small_screen_mode	(EShell *shell);
 const gchar *	e_shell_get_module_directory	(EShell *shell);
 gboolean	e_shell_get_network_available	(EShell *shell);
 void		e_shell_set_network_available	(EShell *shell,
@@ -123,6 +125,12 @@ void		e_shell_event			(EShell *shell,
 gboolean	e_shell_quit			(EShell *shell);
 void		e_shell_cancel_quit		(EShell *shell);
 
+void		e_shell_adapt_window_size	(EShell    *shell,
+						 GtkWindow *window);
+void		e_shell_set_startup_view	(EShell *shell,
+						 const gchar *view);
+const gchar *	e_shell_get_startup_view	(EShell *shell);
+
 G_END_DECLS
 
 #endif /* E_SHELL_H */
diff --git a/shell/main.c b/shell/main.c
index f42f0647cf..4824cfcf8c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -49,6 +49,7 @@
 
 #include "e-shell.h"
 #include "e-shell-migrate.h"
+#include "e-shell-meego.h"
 #include "es-event.h"
 
 #include "e-util/e-dialog-utils.h"
@@ -362,6 +363,7 @@ create_default_shell (void)
 	gboolean online = TRUE;
 	const gchar *key;
 	GError *error = NULL;
+	gboolean is_meego = FALSE, small_screen = FALSE;
 
 	client = gconf_client_get_default ();
 
@@ -396,6 +398,9 @@ create_default_shell (void)
 	if (!express_mode)
 		express_mode = gconf_client_get_bool (client, key, &error);
 
+	if (express_mode)
+		e_shell_detect_meego (&is_meego, &small_screen);
+
 	if (error != NULL) {
 		g_warning ("%s", error->message);
 		g_clear_error (&error);
@@ -406,7 +411,9 @@ create_default_shell (void)
 		"name", "org.gnome.Evolution",
 		"geometry", geometry,
 		"module-directory", EVOLUTION_MODULEDIR,
+		"meego-mode", is_meego,
 		"express-mode", express_mode,
+		"small-screen-mode", small_screen,
 		"online", online,
 		NULL);
 
@@ -585,6 +592,11 @@ main (gint argc, gchar **argv)
 		e_plugin_load_plugins ();
 	}
 
+	if (requested_view)
+		e_shell_set_startup_view(shell, requested_view);
+	else if (express_mode)
+		e_shell_set_startup_view(shell, "mail");
+
 	/* Attempt migration -after- loading all modules and plugins,
 	 * as both shell backends and certain plugins hook into this. */
 	e_shell_migrate_attempt (shell);
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f38fa2e7d3..8bd41d4bb1 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -56,10 +56,15 @@
     <toolitem action='calendar-view-list'/>
 #endif
 #if EXPRESS
+    <separator/>
+    <toolitem action='preferences'/>
+#endif
+  </toolbar>
+  <toolbar name='close-toolbar'>
+#if EXPRESS
     <separator expand="true"/>
     <toolitem action='quit-calendar'/>
 #endif
-
   </toolbar>
   <popup name='calendar-popup'>
     <menuitem action='calendar-new'/>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ad0b401676..53cb8845d3 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -82,7 +82,7 @@
           <menuitem action="mail-mark-unimportant"/>
           <separator/>
           <menuitem action="mail-mark-junk"/>
-          <menuitem action="mail-mark-notjunk"/>
+          <menuitem action="mail-mark-not-junk"/>
           <separator/>
           <menuitem action="mail-flag-for-followup"/>
           <menuitem action="mail-flag-clear"/>
@@ -127,7 +127,7 @@
 #endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
-      <toolitem action='mail-mark-notjunk'/>
+      <toolitem action='mail-mark-not-junk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 7c4db78b85..cc1b9b5fd8 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -108,7 +108,7 @@
     <menuitem action='mail-popup-mark-important'/>
     <menuitem action='mail-popup-mark-unimportant'/>
     <menuitem action='mail-popup-mark-junk'/>
-    <menuitem action='mail-popup-mark-notjunk'/>
+    <menuitem action='mail-popup-mark-not-junk'/>
     <menuitem action='mail-popup-flag-for-followup'/>
     <menuitem action="mail-popup-flag-clear"/>
     <menuitem action="mail-popup-flag-completed"/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 5e249daa2e..c051668290 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -94,4 +94,5 @@
     <placeholder name='toolbar-actions'/>
   </toolbar>
   <toolbar name='search-toolbar'/>
+  <toolbar name='close-toolbar'/>
 </ui>
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 43c7fb87a9..7d34a29bfe 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -40,6 +40,7 @@ enum {
 struct _EAccountComboBoxPrivate {
 	EAccountList *account_list;
 	GHashTable *index;
+	gint num_displayed_accounts;
 };
 
 static gpointer parent_class;
@@ -149,6 +150,8 @@ account_combo_box_refresh_cb (EAccountList *account_list,
 	GList *list = NULL;
 	GList *iter;
 
+	combo_box->priv->num_displayed_accounts = 0;
+
 	store = gtk_list_store_new (2, G_TYPE_STRING, E_TYPE_ACCOUNT);
 	model = GTK_TREE_MODEL (store);
 	index = combo_box->priv->index;
@@ -181,6 +184,7 @@ account_combo_box_refresh_cb (EAccountList *account_list,
 		gchar *string;
 
 		account = iter->data;
+		combo_box->priv->num_displayed_accounts++;
 
 		/* Show the account name for duplicate email addresses. */
 		if (account_combo_box_has_dupes (list, account->id->address))
@@ -513,3 +517,21 @@ e_account_combo_box_set_active_name (EAccountComboBox *combo_box,
 
 	return e_account_combo_box_set_active (combo_box, account);
 }
+
+/**
+ * e_account_combo_box_count_displayed_accounts:
+ * @combo_box: an #EAccountComboBox
+ *
+ * Counts the number of accounts that are displayed in the @combo_box.  This may not
+ * be the actual number of accounts that are configured, as some of those accounts
+ * may be disabled by the user.
+ *
+ * Return value: number of active and valid accounts as shown in the @combo_box.
+ */
+gint
+e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box)
+{
+	g_return_val_if_fail (E_IS_ACCOUNT_COMBO_BOX (combo_box), -1);
+
+	return combo_box->priv->num_displayed_accounts;
+}
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 3c442f1a29..b624c9b17e 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -78,6 +78,8 @@ gboolean	e_account_combo_box_set_active_name
 						(EAccountComboBox *combo_box,
 						 const gchar *account_name);
 
+gint		e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box);
+
 G_END_DECLS
 
 #endif /* E_ACCOUNT_COMBO_BOX_H */
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 27caa80e80..6b38b682f2 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -33,11 +33,17 @@
 
 struct _EPreferencesWindowPrivate {
 	GtkWidget *icon_view;
+	GtkWidget *scroll;
 	GtkWidget *notebook;
 	GHashTable *index;
+
+	GtkListStore *store;
+	GtkTreeModelFilter *filter;
+	const gchar *filter_view;
 };
 
 enum {
+	COLUMN_ID,	/* G_TYPE_STRING */
 	COLUMN_TEXT,	/* G_TYPE_STRING */
 	COLUMN_PIXBUF,	/* GDK_TYPE_PIXBUF */
 	COLUMN_PAGE,	/* G_TYPE_INT */
@@ -102,7 +108,7 @@ preferences_window_selection_changed_cb (EPreferencesWindow *window)
 	if (list == NULL)
 		return;
 
-	model = gtk_icon_view_get_model (icon_view);
+	model = GTK_TREE_MODEL (window->priv->store);
 	gtk_tree_model_get_iter (model, &iter, list->data);
 	gtk_tree_model_get (model, &iter, COLUMN_PAGE, &page, -1);
 
@@ -190,6 +196,40 @@ preferences_window_class_init (EPreferencesWindowClass *class)
 	widget_class->show = preferences_window_show;
 }
 
+static gboolean
+filter_view (GtkTreeModel *model,
+              GtkTreeIter  *iter,
+              gpointer      data)
+{
+	EPreferencesWindow *window = (EPreferencesWindow *)data;
+	gchar *str;
+	gboolean visible = FALSE;
+
+	if (!window->priv->filter_view)
+		return TRUE;
+
+	gtk_tree_model_get (model, iter, COLUMN_ID, &str, -1);
+	if (strncmp(window->priv->filter_view, "mail", 4) == 0) {
+		/* Show everything except calendar */
+		if (str && (strncmp (str, "cal", 3) == 0))
+			visible = FALSE;
+		else
+			visible = TRUE;
+	} else if (strncmp(window->priv->filter_view, "cal", 3) == 0) {
+		/* Show only calendar and nothing else */
+		if (str && (strncmp (str, "cal", 3) != 0))
+			visible = FALSE;
+		else
+			visible = TRUE;
+
+	} else  /* In any other case, show everything */
+		visible = TRUE;
+
+	g_free (str);
+
+	return visible;
+}
+
 static void
 preferences_window_init (EPreferencesWindow *window)
 {
@@ -209,11 +249,19 @@ preferences_window_init (EPreferencesWindow *window)
 
 	window->priv = E_PREFERENCES_WINDOW_GET_PRIVATE (window);
 	window->priv->index = index;
+	window->priv->filter_view = NULL;
 
 	store = gtk_list_store_new (
-		4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT);
+		5, G_TYPE_STRING, G_TYPE_STRING,
+		GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT);
 	gtk_tree_sortable_set_sort_column_id (
 		GTK_TREE_SORTABLE (store), COLUMN_SORT, GTK_SORT_ASCENDING);
+	window->priv->store = store;
+
+	window->priv->filter = (GtkTreeModelFilter *)
+		gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+	gtk_tree_model_filter_set_visible_func (
+		window->priv->filter, filter_view, window, NULL);
 
 	title = _("Evolution Preferences");
 	gtk_window_set_title (GTK_WINDOW (window), title);
@@ -243,11 +291,12 @@ preferences_window_init (EPreferencesWindow *window)
 	gtk_scrolled_window_set_shadow_type (
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
 	gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
+	window->priv->scroll = widget;
 	gtk_widget_show (widget);
 
 	container = widget;
 
-	widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
+	widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (window->priv->filter));
 	gtk_icon_view_set_columns (GTK_ICON_VIEW (widget), 1);
 	gtk_icon_view_set_text_column (GTK_ICON_VIEW (widget), COLUMN_TEXT);
 	gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (widget), COLUMN_PIXBUF);
@@ -359,13 +408,14 @@ e_preferences_window_add_page (EPreferencesWindow *window,
 	notebook = GTK_NOTEBOOK (window->priv->notebook);
 
 	page = gtk_notebook_get_n_pages (notebook);
-	model = gtk_icon_view_get_model (icon_view);
+	model = GTK_TREE_MODEL (window->priv->store);
 	pixbuf = preferences_window_load_pixbuf (icon_name);
 
 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 
 	gtk_list_store_set (
 		GTK_LIST_STORE (model), &iter,
+		COLUMN_ID, page_name,
 		COLUMN_TEXT, caption, COLUMN_PIXBUF, pixbuf,
 		COLUMN_PAGE, page, COLUMN_SORT, sort_order, -1);
 
@@ -405,3 +455,35 @@ e_preferences_window_show_page (EPreferencesWindow *window,
 	gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
 	gtk_tree_path_free (path);
 }
+
+void
+e_preferences_window_filter_page (EPreferencesWindow *window,
+                                  const gchar *page_name)
+{
+	GtkTreeRowReference *reference;
+	GtkIconView *icon_view;
+	GtkTreePath *path;
+
+	g_return_if_fail (E_IS_PREFERENCES_WINDOW (window));
+	g_return_if_fail (page_name != NULL);
+
+	icon_view = GTK_ICON_VIEW (window->priv->icon_view);
+	reference = g_hash_table_lookup (window->priv->index, page_name);
+	g_return_if_fail (reference != NULL);
+
+	path = gtk_tree_row_reference_get_path (reference);
+	gtk_icon_view_select_path (icon_view, path);
+	gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
+	gtk_tree_path_free (path);
+
+	window->priv->filter_view = page_name;
+	gtk_tree_model_filter_refilter (window->priv->filter);
+
+	/* XXX: We need a better solution to hide the icon view when
+	 * there is just one entry */
+	if (strncmp(page_name, "cal", 3) == 0) {
+		gtk_widget_hide (window->priv->scroll);
+	} else
+		gtk_widget_show (window->priv->scroll);
+}
+
diff --git a/widgets/misc/e-preferences-window.h b/widgets/misc/e-preferences-window.h
index 4944a89e58..00b51b85e1 100644
--- a/widgets/misc/e-preferences-window.h
+++ b/widgets/misc/e-preferences-window.h
@@ -68,6 +68,8 @@ void		e_preferences_window_add_page	(EPreferencesWindow *window,
 						 gint sort_order);
 void		e_preferences_window_show_page	(EPreferencesWindow *window,
 						 const gchar *page_name);
+void		e_preferences_window_filter_page(EPreferencesWindow *window,
+						 const gchar *page_name);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 71eb1acd34..8e1878869e 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -895,6 +895,16 @@ web_view_load_string (EWebView *web_view,
 }
 
 static void
+web_view_load_string (EWebView *web_view,
+                      const gchar *string)
+{
+	if (string != NULL && *string != '\0')
+		gtk_html_load_from_string (GTK_HTML (web_view), string, -1);
+	else
+		e_web_view_clear (web_view);
+}
+
+static void
 web_view_copy_clipboard (EWebView *web_view)
 {
 	gtk_html_command (GTK_HTML (web_view), "copy");